Modified m_cloaking to not use need_positive (instead, cast to an unsigned int)....

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

diff --git a/configure b/configure
index 3074c8e28061acd063e22ed624c20c08b7ef174a..d65b9850c1b36b6c10d026e0793a7fffd9d2f6ff 100755 (executable)
--- a/configure
+++ b/configure
@@ -484,14 +484,14 @@ if ($has_epoll) {
                                if ($line =~ /GNU C Library .* version (.*?) /)
                                {
                                        $libcv = $1;
-                                       $libcv =~  /([0-9\.\-])+/;
+                                       $libcv =~  /(\d+\.\d+)/;
                                        $libcv = $1;
                                }
                                elsif ($line =~ /Compiled on a Linux (.*?\..*?)\.* system/)
                                {
                                        $kernelv = $1;
                                        # Fix for some retarded libc builds, strip off >> and << etc.
-                                       $kernelv =~ /([0-9\.\-])+/;
+                                       $kernelv =~ /(\d+\.\d+)/;
                                        $kernelv = $1;
                                }
                        }
@@ -549,6 +549,36 @@ if (($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL} >= 0.8) || ($config{HAS_OPE
        $config{HAS_OPENSSL} = "n";
 }
 
+printf "Checking if you are running an ancient, unsupported OS... ";
+if ($config{OSNAME} =~ /FreeBSD/i)
+{
+       $version = `uname -r`;
+       if ($version =~ /^4\./)
+       {
+               $foundit = `ls -l /usr/local/lib/libgnugetopt* | wc -l`;
+               if ($foundit > 0)
+               {
+                       # ICKY ICKY ICK, FREEBSD 4.x! GET AN UPGRADE!
+                       $config{CRAQ} = "-L/usr/local/lib -lgnugetopt -DHAVE_DECL_GETOPT=1";
+                       print "yes\n";
+               }
+               else
+               {
+                       print "\n\nERROR: You require libgnugetopt (from ports or packages) to build InspIRCd on FreeBSD 4.11.\n";
+               }
+       }
+       else
+       {
+               $config{CRAQ} = " ";
+               print "no ($version)\n";
+       }
+}
+else
+{
+       $config{CRAQ} = " ";
+       print "no ($config{OSNAME})\n";
+}
+
 ################################################################################
 #                        BEGIN INTERACTIVE PART                              #
 ################################################################################
@@ -1312,16 +1342,7 @@ sub write_dynamic_makefile {
                $se = "socketengine_ports";
        }
 
-       if ($config{OSNAME} =~ /freebsd/i)
-       {
-               print "Ick, you are running FreeBSD 4.x. Enabling workaround. Get an upgrade.\n";
-               $version = `uname -r`;
-               if ($version =~ /^4\./)
-               {
-                       # ICKY ICKY ICK, FREEBSD 4.x! GET AN UPGRADE!
-                       $freebsd4libs = "-L/usr/local/lib -lgnugetopt -DHAVE_DECL_GETOPT=1";
-               }
-       }
+       $freebsd4libs = $config{CRAQ};
 
        open(FH,">src/Makefile") or die("Could not write src/Makefile");
        print FH <<EOM;