]> git.netwichtig.de Git - user/henk/code/inspircd.git/commitdiff
Fix $config{HAS_OPENSSL} winding up undefined and crashing configure if openssl isn...
authoraquanight <aquanight@e03df62e-2008-0410-955e-edbf42e46eb7>
Sat, 2 Feb 2008 18:02:47 +0000 (18:02 +0000)
committeraquanight <aquanight@e03df62e-2008-0410-955e-edbf42e46eb7>
Sat, 2 Feb 2008 18:02:47 +0000 (18:02 +0000)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8789 e03df62e-2008-0410-955e-edbf42e46eb7

configure

index 09efb51f35da5b095c1c1c9f3b0c2f1468e6a6e0..1b28e30a1f982e29f13d11c54b669195f3a7faa1 100755 (executable)
--- a/configure
+++ b/configure
@@ -380,8 +380,11 @@ if (defined $opt_away)
        $config{MAX_AWAY} = $opt_away;
 }
 
-$config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/;
-$config{HAS_OPENSSL} = $1;
+if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/) {
+       $config{HAS_OPENSSL} = $1;
+} else {
+       $config{HAS_OPENSSL} = "";
+}
 
 if ($config{GCCVER} eq "") {
        print $config{CC} . " was not found! You require g++ (the GNU C++ compiler, part of GCC) to build InspIRCd!\n";
@@ -643,7 +646,7 @@ $config{HAS_EPOLL} = $has_epoll;
 $config{HAS_KQUEUE} = $has_kqueue; 
 
 printf "Checking for libgnutls... ";
-if (($config{HAS_GNUTLS}) || ($config{HAS_GNUTLS} eq "y")) {
+if (defined($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS}) || ($config{HAS_GNUTLS} eq "y"))) {
        print "yes\n";
        $config{HAS_GNUTLS} = "y";
 } else {
@@ -652,7 +655,7 @@ if (($config{HAS_GNUTLS}) || ($config{HAS_GNUTLS} eq "y")) {
 }
 
 printf "Checking for openssl... ";
-if (($config{HAS_OPENSSL}) || ($config{HAS_OPENSSL} eq "y")) {
+if (defined($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL}) || ($config{HAS_OPENSSL} eq "y"))) {
        print "yes\n";
        $config{HAS_OPENSSL} = "y";
 } else {