Fix off by one in ping timeout.

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

diff --git a/make/utilities.pm b/make/utilities.pm
index 48713fe9e9936bc7035ca718047c28296ebbe577..7db557d1125a86d2b39dcecd285c28a7a84f52a0 100644 (file)
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -36,19 +36,44 @@ use File::Spec::Functions qw(rel2abs);
 use Getopt::Long;
 use POSIX;
 
-our @EXPORT = qw(module_installed prompt_bool prompt_dir prompt_string get_cpu_count make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring);
+our @EXPORT = qw(get_version module_installed prompt_bool prompt_dir prompt_string get_cpu_count make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring);
 
-# Parse the output of a *_config program,
-# such as pcre_config, take out the -L
-# directive and return an rpath for it.
+my %already_added = ();
+my %version = ();
 
-# \e[1;32msrc/Makefile\e[0m
+sub get_version {
+       return %version if %version;
 
-my %already_added = ();
-my $if_skip_lines = 0;
+       # Attempt to retrieve version information from src/version.sh
+       chomp(my $vf = `sh src/version.sh 2>/dev/null`);
+       if ($vf =~ /^InspIRCd-([0-9]+)\.([0-9]+)\.([0-9]+)(?:\+(\w+))?$/) {
+               %version = ( MAJOR => $1, MINOR => $2, PATCH => $3, LABEL => $4 );
+       }
 
-sub module_installed($)
-{
+       # Attempt to retrieve missing version information from Git
+       chomp(my $gr = `git describe --tags 2>/dev/null`);
+       if ($gr =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\d+-(\w+))?$/) {
+               $version{MAJOR} = $1 unless defined $version{MAJOR};
+               $version{MINOR} = $2 unless defined $version{MINOR};
+               $version{PATCH} = $3 unless defined $version{PATCH};
+               $version{LABEL} = $4 if defined $4;
+       }
+
+       # The user is using a stable release which does not have
+       # a label attached.
+       $version{LABEL} = 'release' unless defined $version{LABEL};
+
+       # If any of these fields are missing then the user has deleted the
+       # version file and is not running from Git. Fill in the fields with
+       # dummy data so we don't get into trouble with undef values later.
+       $version{MAJOR} = '0' unless defined $version{MAJOR};
+       $version{MINOR} = '0' unless defined $version{MINOR};
+       $version{PATCH} = '0' unless defined $version{PATCH};
+
+       return %version;
+}
+
+sub module_installed($) {
        my $module = shift;
        eval("use $module;");
        return !$@;
@@ -137,6 +162,7 @@ sub promptstring($$$$$)
 sub make_rpath($;$)
 {
        my ($executable, $module) = @_;
+       return "" if defined $ENV{DISABLE_RPATH};
        chomp(my $data = `$executable`);
        my $output = "";
        while ($data =~ /-L(\S+)/)
@@ -144,10 +170,10 @@ sub make_rpath($;$)
                my $libpath = $1;
                if (!exists $already_added{$libpath})
                {
-                       print "Adding extra library path to \e[1;32m$module\e[0m ... \e[1;32m$libpath\e[0m\n";
+                       print "Adding runtime library path to \e[1;32m$module\e[0m ... \e[1;32m$libpath\e[0m\n";
                        $already_added{$libpath} = 1;
                }
-               $output .= "-Wl,--rpath -Wl,$libpath -L$libpath " unless defined $main::opt_disablerpath;
+               $output .= "-Wl,-rpath -Wl,$libpath -L$libpath ";
                $data =~ s/-L(\S+)//;
        }
        return $output;
@@ -179,7 +205,8 @@ sub pkgconfig_get_include_dirs($$$;$)
        if ((!defined $v) || ($v eq ""))
        {
                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 $locbin = $^O eq 'solaris' ? 'slocate' : 'locate';
+               $foo = `$locbin "$headername" 2>/dev/null | head -n 1`;
                my $find = $foo =~ /(.+)\Q$headername\E/ ? $1 : '';
                chomp($find);
                if ((defined $find) && ($find ne "") && ($find ne $packagename))
@@ -285,7 +312,8 @@ sub pkgconfig_get_lib_dirs($$$;$)
        my $foo = "";
        if ((!defined $v) || ($v eq ""))
        {
-               $foo = `locate "$libname" | head -n 1`;
+               my $locbin = $^O eq 'solaris' ? 'slocate' : 'locate';
+               $foo = `$locbin "$libname" | head -n 1`;
                $foo =~ /(.+)\Q$libname\E/;
                my $find = $1;
                chomp($find);
@@ -431,6 +459,7 @@ sub translate_functions($$)
                        close TF;
                        my $replace = `perl $tmpfile`;
                        chomp($replace);
+                       unlink($tmpfile);
                        $line =~ s/eval\("(.+?)"\)/$replace/;
                }
                while ($line =~ /pkgconflibs\("(.+?)","(.+?)","(.+?)"\)/)
@@ -465,7 +494,6 @@ sub translate_functions($$)
                while ($line =~ /rpath\("(.+?)"\)/)
                {
                        my $replace = make_rpath($1,$module);
-                       $replace = "" if ($^O =~ /darwin/i);
                        $line =~ s/rpath\("(.+?)"\)/$replace/;
                }
        };
@@ -477,7 +505,7 @@ sub translate_functions($$)
                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";
+               print "gnutls-bin as well as libgnutls-dev and libgnutls.\n";
                exit;
        }
        else