X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=e1e8156b8495077f7edaf1609f118c9b1ab5e3ed;hb=6a35f96eb272821d42f0757e2654d84bd5b2c05a;hp=841f56b7de3089eb139719c152ab194260af599a;hpb=7b78e73fdbd38c0aa1f711d95a3026652a05ca8b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 841f56b7d..e1e8156b8 100755
--- a/configure
+++ b/configure
@@ -111,7 +111,7 @@ if ($arg eq "-modupdate") {
     getosflags();
     $has_epoll = $config{HAS_EPOLL};
     $has_kqueue = $config{HAS_KQUEUE};
-    if ($config{STATIC_LINK} == "yes") {
+    if ($config{STATIC_LINK} eq "yes") {
       write_static_modules_makefile();
     } else {
       write_dynamic_modules_makefile();
@@ -201,7 +201,7 @@ if ($has_epoll) {
 print "yes\n" if $has_epoll == 1;
 print "no\n" if $has_epoll == 0;
 
-if (($config{OSNAME} =~ /CYGWIN/) || ($config{OSNAME} == "CYG-STATIC")) {
+if (($config{OSNAME} =~ /CYGWIN/) || ($config{OSNAME} eq "CYG-STATIC")) {
 	$config{HAS_STRLCPY} = "true";
 }
 
@@ -323,10 +323,14 @@ if (($config{HAS_GNUTLS} eq "y") && ($config{HAS_OPENSSL} eq "y")) {
 
 if ($config{HAS_GNUTLS} eq "y") {
 	yesno(USE_GNUTLS, "Would you like to enable SSL Support?");
-	print "\nUsing GnuTLS SSL module.\n";
+	if ($config{USE_GNUTLS} eq "y") {
+		print "\nUsing GnuTLS SSL module.\n";
+	}
 } elsif ($config{HAS_OPENSSL} eq "y") {
 	yesno(USE_OPENSSL, "Would you like to enable SSL Support?");
-	print "\nUsing OpenSSL SSL module.\nYou will get better performance if you move to GnuTLS in the future.\n";
+	if ($config{USE_OPENSSL} eq "y") {
+		print "\nUsing OpenSSL SSL module.\nYou will get better performance if you move to GnuTLS in the future.\n";
+	}
 }
 
 print "\nThe following questions will ask you for various figures relating\n";
@@ -591,7 +595,7 @@ print "\033[0mMax kick length:\033[1;32m\t\t$config{MAX_KICK}\n";
 print "\033[0mMax name length:\033[1;32m\t\t$config{MAX_GECOS}\n";
 print "\033[0mMax away length:\033[1;32m\t\t$config{MAX_AWAY}\n";
 print "\033[0mGCC Version Found:\033[1;32m\t\t$config{GCCVER}.$config{GCC34}\n";
-print "\033[0mOptimatizaton Flag:\033[1;32m\t\t$config{OPTIMISATI}\033[0m\n";
+print "\033[0mOptimization Flag:\033[1;32m\t\t$config{OPTIMISATI}\033[0m\n";
 print "\033[0mCompiler program:\033[1;32m\t\t$config{CC}\033[0m\n";
 print "\033[0mStatic modules:\033[1;32m\t\t\t$config{STATIC_LINK}\033[0m\n";
 print "\033[0mMultithread DNS:\033[1;32m\t\t$config{THREADED_DNS}\033[0m\n";
@@ -599,7 +603,7 @@ print "\033[0mGnuTLS Support:\033[1;32m\t\t\t$config{USE_GNUTLS}\033[0m\n";
 print "\033[0mOpenSSL Support:\033[1;32m\t\t$config{USE_OPENSSL}\033[0m\n\n";
 
 if ($config{USE_GNUTLS} eq "y") {
-	system("cp src/modules/extra/m_ssl_gnutls.cpp src/modules/m_ssl_gnutls.cpp");
+	system("ln -s src/modules/extra/m_ssl_gnutls.cpp src/modules/m_ssl_gnutls.cpp");
 	getmodules();
 	$failed = 0;
 	open(TMP, "<$config{CONFIG_DIR}/key.pem") or $failed = 1;
@@ -625,7 +629,7 @@ if ($config{USE_GNUTLS} eq "y") {
 		print "SSL Certificates found, skipping.\n\n"
 	}	
 } elsif ($config{USE_OPENSSL} eq "y") {
-	system("cp src/modules/extra/m_ssl_openssl.cpp src/modules/m_ssl_openssl.cpp");
+	system("ln -s src/modules/extra/m_ssl_openssl.cpp src/modules/m_ssl_openssl.cpp");
 	getmodules();
 	$failed = 0;
 	open(TMP, "<$config{CONFIG_DIR}/key.pem") or $failed = 1;
@@ -653,6 +657,7 @@ if (($config{USE_GNUTLS} eq "n") && ($config{USE_OPENSSL} eq "n")) {
 	print "Skipping SSL Certificate generation, SSL support is not available.\n\n";
 }
 
+getosflags();
 makecache();
 writefiles();
 
@@ -763,7 +768,7 @@ sub dir_check {
 sub getosflags {
   if ($config{OSNAME} =~ /BSD$/) {
     $config{LDLIBS} = "-Ldl -lstdc++";
-    $config{FLAGS}  = "-fPIC -frtti $OPTIMISATI -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+    $config{FLAGS}  = "-fPIC -frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
     $config{MAKEPROG} = "gmake";
     if ($config{OSNAME} eq "OpenBSD") {
 	chomp($foo = `eg++ -dumpversion | cut -c 1`);
@@ -778,15 +783,15 @@ sub getosflags {
     }
   } else {
     $config{LDLIBS} = "-ldl -lstdc++";
-    $config{FLAGS}  = "-fPIC -frtti $OPTIMISATI -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+    $config{FLAGS}  = "-fPIC -frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
     $config{MAKEPROG} = "make";
     if ($config{OSNAME} =~ /CYGWIN/) {
-       $config{FLAGS}  = "-frtti $OPTIMISATI -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+       $config{FLAGS}  = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
        $config{LDLIBS} = "";
        $config{MAKEPROG} = "/usr/bin/make";
        $config{MAKEORDER} = "ircd mods config bininst";
-    } elsif ($config{OSNAME} == "CYG-STATIC") {
-       $config{FLAGS} = "-frtti $OPTIMISATI -Wall -Woverloaded-virtual $config{OPTIMISATI}";
+    } elsif ($config{OSNAME} eq "CYG-STATIC") {
+       $config{FLAGS} = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
        $config{LDLIBS} = "";
        $config{MAKEPROG} = "/usr/bin/make";
        $config{MAKEORDER} = "mods ircd config bininst";
@@ -873,7 +878,7 @@ EOF
     print FILEHANDLE "#define IS_CYGWIN\n";
     print FILEHANDLE "#ifndef FD_SETSIZE\n#define FD_SETSIZE	1024\n#endif\n";
   }
-  if ($config{OSNAME} == "CYG-STATIC") {
+  if ($config{OSNAME} eq "CYG-STATIC") {
     print FILEHANDLE "#ifndef FD_SETSIZE\n#define FD_SETSIZE    1024\n#endif\n";
   }