Fixed the order of fields in openssl certificate generation; this would make really...

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

diff --git a/make/utilities.pm b/make/utilities.pm
index 807da8c9d70b6f560a8f18920736454e941fd351..c00a541b337e33755b19a8ccb18af9cd74a9a1ff 100644 (file)
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -1,8 +1,17 @@
+#
+# Copyright 2002-2007 The ChatSpike Development Team
+# <brain@chatspike.net>
+# <Craig@chatspike.net>
+#
+# Licensed under GPL, please see the COPYING file
+# for more information
+#
+
 package make::utilities;
 use Exporter 'import';
 use POSIX;
 use Getopt::Long;
-@EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version 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
@@ -160,8 +169,8 @@ sub vcheck($$)
        $version2 =~ s/\-//g;
        $version1 =~ s/a-z//g;
        $version2 =~ s/a-z//g;
-       my @v1 = split('.', $version1);
-       my @v2 = split('.', $version2);
+       my @v1 = split('\.', $version1);
+       my @v2 = split('\.', $version2);
        for ($curr = 0; $curr < scalar(@v1); $curr++)
        {
                if ($v1[$curr] < $v2[$curr])
@@ -198,8 +207,11 @@ sub pkgconfig_check_version($$;$)
                        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 0;
+       return 1;
 }
 
 sub pkgconfig_get_lib_dirs($$$;$)
@@ -350,6 +362,7 @@ sub translate_functions($$)
                while ($line =~ /rpath\("(.+?)"\)/)
                {
                        my $replace = make_rpath($1,$module);
+                       $replace = "" if ($^O =~ /darwin/i);
                        $line =~ s/rpath\("(.+?)"\)/$replace/;
                }
        };