Allow accountname to be changed without an explicit unset

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

diff --git a/make/utilities.pm b/make/utilities.pm
index 812e8a1ae8e4ec2ab22c82879e3218672a0f46c4..d3716f60e1219b6ae889b87fe042bf1a72ed411f 100644 (file)
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -2,7 +2,7 @@
 #       | Inspire Internet Relay Chat Daemon |
 #       +------------------------------------+
 #
-#  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+#  InspIRCd: (C) 2002-2009 InspIRCd Development Team
 # See: http://www.inspircd.org/wiki/index.php/Credits
 #
 # This program is free but copyrighted software; see
@@ -149,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;
@@ -360,17 +367,20 @@ sub translate_functions($$)
                }
                if ($line =~ /if\(\!"(\w+)"\)/)
                {
-                       if (!defined $main::config{$1})
+                       if (!exists $main::config{$1})
                        {
                                $line = "";
                                return "";
                        }
                        else
                        {
-                               if (($main::config{$1} =~ /y/i) and ($main::config{$1} eq "1"))
+                               if (defined $1)
                                {
-                                       $line = "";
-                                       return "";
+                                       if (exists ($main::config{$1}) and (($main::config{$1} =~ /y/i) or ($main::config{$1} eq "1")))
+                                       {
+                                               $line = "";
+                                               return "";
+                                       }
                                }
                        }
 
@@ -444,6 +454,9 @@ sub translate_functions($$)
                my $err = $@;
                #$err =~ s/at .+? line \d+.*//g;
                print "\n\nConfiguration failed. The following error occured:\n\n$err\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