change vc70.pdb to vc90.pdb.. just cosmetic..

[user/henk/code/inspircd.git] / make / utilities.pm

diff --git a/make/utilities.pm b/make/utilities.pm
index 8b8241e048b8f1d3d4d38f9b7a84c10caeb6eade..ad7a32f8fbeaec29dcc0b1028a267f587e60896b 100644 (file)
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -2,8 +2,8 @@
 #       | Inspire Internet Relay Chat Daemon |
 #       +------------------------------------+
 #
-#  InspIRCd: (C) 2002-2007 InspIRCd Development Team
-# See: http://www.inspircd.org/wiki/index.php/Credits
+#  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+# See: http://wiki.inspircd.org/Credits
 #
 # This program is free but copyrighted software; see
 #      the file COPYING for details.
@@ -114,12 +114,11 @@ sub pkgconfig_get_include_dirs($$$;$)
        my $v = `pkg-config --modversion $packagename 2>/dev/null`;
        my $ret = `pkg-config --cflags $packagename 2>/dev/null`;
        my $foo = "";
-
        if ((!defined $v) || ($v eq ""))
        {
-               $foo = `locate "$headername" | head -n 1`;
-               $foo =~ /(.+)\Q$headername\E/;
-               my $find = $1;
+               print "\e[31mCould not find $packagename via pkg-config\e[m (\e[1;32mplease install pkg-config\e[m)\n";
+               $foo = `locate "$headername" 2>/dev/null | head -n 1`;
+               my $find = $foo =~ /(.+)\Q$headername\E/ ? $1 : '';
                chomp($find);
                if ((defined $find) && ($find ne "") && ($find ne $packagename))
                {
@@ -150,7 +149,14 @@ sub pkgconfig_get_include_dirs($$$;$)
                        $headername =~ s/^\///;
                        promptstring("path to the directory containing $headername", $key, "/usr/include",$packagename,"$packagename-includes");
                        $packagename =~ tr/a-z/A-Z/;
-                       $main::config{$key} = "-I$main::config{$key}" . " $defaults -DVERSION_$packagename=\"$v\"";
+                       if (defined $v)
+                       {
+                               $main::config{$key} = "-I$main::config{$key}" . " $defaults -DVERSION_$packagename=\"$v\"";
+                       }
+                       else
+                       {
+                               $main::config{$key} = "-I$main::config{$key}" . " $defaults -DVERSION_$packagename=\"0.0\"";
+                       }
                        $main::config{$key} =~ s/^\s+//g;
                        $ret = $main::config{$key};
                        return $ret;
@@ -322,59 +328,64 @@ sub translate_functions($$)
                        die "Developers should no longer use backticks in configuration macros. Please use exec() and eval() macros instead. Offending line: $line (In module: $module)";
                }
 
-               if ($line =~ /\$EndIf/)
-               {
-                       if ($if_skip_lines == 1)
-                       {
-                               $if_skip_lines = 0;
-                               return;
-                       }
-                       else
-                       {
-                               die "\$EndIf found when not in \$If/\$IfUname in $module";
-                       }
-               }
-
-               if ($line =~ /\$Else/)
+               if ($line =~ /ifuname\(\!"(\w+)"\)/)
                {
-                       if ($if_skip_lines == 0)
-                       {
-                               $if_skip_lines = 1;
-                       }
-                       else
+                       my $uname = $1;
+                       if ($uname eq $^O)
                        {
-                               $if_skip_lines = 0;
+                               $line = "";
+                               return "";
                        }
-                       return;
-               }
 
-               if ($if_skip_lines == 1)
-               {
-                       return;
+                       $line =~ s/ifuname\(\!"(.+?)"\)//;
                }
 
-               if ($line =~ /\$IfUname\s+(\w+)/)
+               if ($line =~ /ifuname\("(\w+)"\)/)
                {
                        my $uname = $1;
                        if ($uname ne $^O)
                        {
-                               $if_skip_lines = 1;
-                               return;
+                               $line = "";
+                               return "";
                        }
+
+                       $line =~ s/ifuname\("(.+?)"\)//;
                }
 
-               if ($line =~ /\$If:\s+(\w+)/)
+               if ($line =~ /if\("(\w+)"\)/)
                {
                        if (defined $main::config{$1})
                        {
                                if (($main::config{$1} !~ /y/i) and ($main::config{$1} ne "1"))
                                {
-                                       $if_skip_lines = 1;
-                                       return;
+                                       $line = "";
+                                       return "";
                                }
                        }
+
+                       $line =~ s/if\("(.+?)"\)//;
                }
+               if ($line =~ /if\(\!"(\w+)"\)/)
+               {
+                       if (!exists $main::config{$1})
+                       {
+                               $line = "";
+                               return "";
+                       }
+                       else
+                       {
+                               if (defined $1)
+                               {
+                                       if (exists ($main::config{$1}) and (($main::config{$1} =~ /y/i) or ($main::config{$1} eq "1")))
+                                       {
+                                               $line = "";
+                                               return "";
+                                       }
+                               }
+                       }
 
+                       $line =~ s/if\(\!"(.+?)"\)//;
+               }
                while ($line =~ /exec\("(.+?)"\)/)
                {
                        print "Executing program for module \e[1;32m$module\e[0m ... \e[1;32m$1\e[0m\n";
@@ -441,8 +452,12 @@ sub translate_functions($$)
        if ($@)
        {
                my $err = $@;
-               $err =~ s/at .+? line \d+.*//g;
+               #$err =~ s/at .+? line \d+.*//g;
                print "\n\nConfiguration failed. The following error occured:\n\n$err\n";
+               print "\nMake sure you have pkg-config installed\n";
+               print "\nIn the case of gnutls configuration errors on debian,\n";
+               print "Ubuntu, etc, you should ensure that you have installed\n";
+               print "gnutls-bin as well as gnutls-dev and gnutls.\n";
                exit;
        }
        else