Properly name the windows service error constants and put proper descriptions in...

[user/henk/code/inspircd.git] / configure

diff --git a/configure b/configure
index 272698f962d0fc012fe93bd8a1d4f62013eea10d..b2b404ff1740d9683230b13813d03042b028dd55 100755 (executable)
--- a/configure
+++ b/configure
@@ -70,7 +70,7 @@ our $uninstall_list = "";
 
 # This is a list of all files in the core. Each cpp file is mapped to a shared object file,
 # whos file extension is omitted (these can vary from system to system). Auto detected by
-# scanning the src/*.cpp files for files containing /* $Core: */ identifiers.
+# scanning the src/*.cpp files for files containing /* $Core */ identifiers.
 
 our %filelist = ();
 
@@ -667,8 +667,13 @@ $config{HAS_KQUEUE} = $has_kqueue;
 
 printf "Checking for libgnutls... ";
 if (defined($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS}) || ($config{HAS_GNUTLS} eq "y"))) {
-       print "yes\n";
-       $config{HAS_GNUTLS} = "y";
+       if (defined($gnutls_ver) && ($gnutls_ver ne "")) {
+               print "yes\n";
+               $config{HAS_GNUTLS} = "y";
+       } else {
+               print "no\n";
+               $config{HAS_GNUTLS} = "n";
+       }
 } else {
        print "no\n";
        $config{HAS_GNUTLS} = "n";
@@ -676,8 +681,13 @@ if (defined($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS}) || ($config{HAS_GNUTL
 
 printf "Checking for openssl... ";
 if (defined($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL}) || ($config{HAS_OPENSSL} eq "y"))) {
-       print "yes\n";
-       $config{HAS_OPENSSL} = "y";
+       if (defined($openssl_ver) && ($openssl_ver ne "")) {
+               print "yes\n";
+               $config{HAS_OPENSSL} = "y";
+       } else {
+               print "no\n";
+               $config{HAS_OPENSSL} = "n";
+       }
 } else {
        print "no\n";
        $config{HAS_OPENSSL} = "n";
@@ -1159,6 +1169,7 @@ sub writefiles {
 #define OPTIMISATION $config{OPTIMITEMP}
 #define LIBRARYDIR "$config{LIBRARY_DIR}"
 #define SYSTEM "$incos"
+#define ENTRYPOINT int main(int argc, char** argv)
 
 EOF
 print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n";
@@ -1540,7 +1551,7 @@ sub write_dynamic_makefile
                                while (defined(my $line = <CPP>))
                                {
                                        chomp($line);
-                                       if ($line =~ /\/\* \$Core: (\w+) \*\//i)
+                                       if ($line =~ /\/\* \$Core \*\//i)
                                        {
                                                my $sname = $name;
                                                $sname =~ s/\.cpp$/.o/;
@@ -1728,7 +1739,7 @@ ITEM
        # now print the command file details.
        foreach my $cmd (@cmdlist) {
                print FH <<ITEM;
-cmd_$cmd.so: cmd_$cmd.cpp ../../include/base.h ../../include/modules.h ../../include/inspircd.h ../../include/channels.h ../../include/users.h ../../include/globals.h ../../include/inspircd_config.h ../../include/commands/cmd_$cmd.h
+cmd_$cmd.so: cmd_$cmd.cpp ../../include/base.h ../../include/modules.h ../../include/inspircd.h ../../include/channels.h ../../include/users.h ../../include/inspircd_config.h ../../include/commands/cmd_$cmd.h
        \@../../make/run-cc.pl \$(CC) -pipe -I../../include \$(FLAGS) -export-dynamic $SHARED -o cmd_$cmd.so cmd_$cmd.cpp
 
 ITEM