Snomask stacking: not yet working (crashes), and not quite finished

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

diff --git a/make/utilities.pm b/make/utilities.pm
index c5ba8e5e580d51b17959aca4e37afd625b6385e2..c3909c1e4019d1e1b0cc8e4def3225918d35026c 100644 (file)
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -1,8 +1,23 @@
+#       +------------------------------------+
+#       | Inspire Internet Relay Chat Daemon |
+#       +------------------------------------+
+#
+#  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+# See: http://www.inspircd.org/wiki/index.php/Credits
+#
+# This program is free but copyrighted software; see
+#      the file COPYING for details.
+#
+# ---------------------------------------------------
+
 package make::utilities;
+
+require 5.8.0;
+
 use Exporter 'import';
 use POSIX;
 use Getopt::Long;
-@EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs translate_functions promptstring);
+@EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring vcheck);
 
 # Parse the output of a *_config program,
 # such as pcre_config, take out the -L
@@ -56,7 +71,7 @@ sub make_rpath($;$)
                        print "Adding extra library path to \033[1;32m$module\033[0m ... \033[1;32m$libpath\033[0m\n";
                        $already_added{$libpath} = 1;
                }
-               $output .= "-Wl,--rpath -Wl,$libpath -L$libpath ";
+               $output .= "-Wl,--rpath -Wl,$libpath -L$libpath " unless defined $main::opt_disablerpath;
                $data =~ s/-L(\S+)//;
        }
        return $output;
@@ -149,6 +164,62 @@ sub pkgconfig_get_include_dirs($$$;$)
        return $ret;
 }
 
+sub vcheck($$)
+{
+       my ($version1, $version2) = @_;
+       $version1 =~ s/\-r(\d+)/\.\1/g; # minor revs/patchlevels
+       $version2 =~ s/\-r(\d+)/\.\1/g;
+       $version1 =~ s/p(\d+)/\.\1/g;
+       $version2 =~ s/p(\d+)/\.\1/g;
+       $version1 =~ s/\-//g;
+       $version2 =~ s/\-//g;
+       $version1 =~ s/a-z//g;
+       $version2 =~ s/a-z//g;
+       my @v1 = split('\.', $version1);
+       my @v2 = split('\.', $version2);
+       for ($curr = 0; $curr < scalar(@v1); $curr++)
+       {
+               if ($v1[$curr] < $v2[$curr])
+               {
+                       return 0;
+               }
+       }
+       return 1;
+}
+
+sub pkgconfig_check_version($$;$)
+{
+       my ($packagename, $version, $module) = @_;
+
+       extend_pkg_path();
+
+       print "Checking version of package \033[1;32m$packagename\033[0m is >= \033[1;32m$version\033[0m... ";
+
+       $v = `pkg-config --modversion $packagename 2>/dev/null`;
+       if (defined $v)
+       {
+               chomp($v);
+       }
+       if ((defined $v) && ($v ne ""))
+       {
+               if (vcheck($v,$version) == 1)
+               {
+                       print "\033[1;32mYes (version $v)\033[0m\n";
+                       return 1;
+               }
+               else
+               {
+                       print "\033[1;32mNo (version $v)\033[0m\n";
+                       return 0;
+               }
+       }
+       # If we didnt find it, we  cant definitively say its too old.
+       # Return ok, and let pkgconflibs() or pkgconfincludes() pick up
+       # the missing library later on.
+       print "\033[1;32mNo (not found)\033[0m\n";
+       return 1;
+}
+
 sub pkgconfig_get_lib_dirs($$$;$)
 {
        my ($packagename, $libname, $defaults, $module) = @_;
@@ -250,6 +321,10 @@ sub translate_functions($$)
                        chomp($replace);
                        $line =~ s/exec\("(.+?)"\)/$replace/;
                }
+               while ($line =~ /execruntime\("(.+?)"\)/)
+               {
+                       $line =~ s/execruntime\("(.+?)"\)/`\1`/;
+               }
                while ($line =~ /eval\("(.+?)"\)/)
                {
                        print "Evaluating perl code for module \033[1;32m$module\033[0m ... ";
@@ -270,6 +345,15 @@ sub translate_functions($$)
                        my $replace = pkgconfig_get_lib_dirs($1, $2, $3, $module);
                        $line =~ s/pkgconflibs\("(.+?)","(.+?)","(.+?)"\)/$replace/;
                }
+               while ($line =~ /pkgconfversion\("(.+?)","(.+?)"\)/)
+               {
+                       if (pkgconfig_check_version($1, $2, $module) != 1)
+                       {
+                               die "Version of package $1 is too old. Please upgrade it to version \033[1;32m$2\033[0m or greater and try again.";
+                       }
+                       # This doesnt actually get replaced with anything
+                       $line =~ s/pkgconfversion\("(.+?)","(.+?)"\)//;
+               }
                while ($line =~ /pkgconflibs\("(.+?)","(.+?)",""\)/)
                {
                        my $replace = pkgconfig_get_lib_dirs($1, $2, "", $module);
@@ -288,6 +372,7 @@ sub translate_functions($$)
                while ($line =~ /rpath\("(.+?)"\)/)
                {
                        my $replace = make_rpath($1,$module);
+                       $replace = "" if ($^O =~ /darwin/i);
                        $line =~ s/rpath\("(.+?)"\)/$replace/;
                }
        };