Write out the permchannels database on a timer, not on every mode change

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

diff --git a/make/utilities.pm b/make/utilities.pm
index 8b74b7e84d97bf4d1417a8f28cd0d24669f45aae..ca769465feee40a13556a9f2c67bfb8e624682ba 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-2010 InspIRCd Development Team
+# See: http://wiki.inspircd.org/Credits
 #
 # This program is free but copyrighted software; see
 #      the file COPYING for details.
@@ -116,9 +116,9 @@ sub pkgconfig_get_include_dirs($$$;$)
        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))
                {
@@ -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;
@@ -358,6 +365,27 @@ sub translate_functions($$)
 
                        $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";
@@ -426,6 +454,10 @@ sub translate_functions($$)
                my $err = $@;
                #$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