Fix library detection flags (bad define put into the ldflags)

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

diff --git a/make/utilities.pm b/make/utilities.pm
index fac0cb3561c36dcf31152a11dd05a9215f9d330b..c5ba8e5e580d51b17959aca4e37afd625b6385e2 100644 (file)
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -1,7 +1,8 @@
 package make::utilities;
 use Exporter 'import';
 use POSIX;
-@EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs translate_functions);
+use Getopt::Long;
+@EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs translate_functions promptstring);
 
 # Parse the output of a *_config program,
 # such as pcre_config, take out the -L
@@ -11,6 +12,37 @@ use POSIX;
 
 my %already_added = ();
 
+sub promptstring($$$$$)
+{
+       my ($prompt, $configitem, $default, $package, $commandlineswitch) = @_;
+       my $var;
+       if (!$main::interactive)
+       {
+               undef $opt_commandlineswitch;
+               GetOptions ("$commandlineswitch=s" => \$opt_commandlineswitch);
+               if (defined $opt_commandlineswitch)
+               {
+                       print "\033[1;32m$opt_commandlineswitch\033[0m\n";
+                       $var = $opt_commandlineswitch;
+               }
+               else
+               {
+                       die "Could not detect $package! Please specify the $prompt via the command line option \033[1;32m--$commandlineswitch=\"/path/to/file\"\033[0m";
+               }
+       }
+       else
+       {
+               print "\nPlease enter the $prompt?\n";
+               print "[\033[1;32m$default\033[0m] -> ";
+               chomp($var = <STDIN>);
+       }
+       if ($var eq "")
+       {
+               $var = $default;
+       }
+       $main::config{$configitem} = $var;
+}
+
 sub make_rpath($;$)
 {
        my ($executable, $module) = @_;
@@ -45,22 +77,38 @@ sub extend_pkg_path()
 sub pkgconfig_get_include_dirs($$$;$)
 {
        my ($packagename, $headername, $defaults, $module) = @_;
+
+       my $key = "default_includedir_$packagename";
+       if (exists $main::config{$key})
+       {
+               print "Locating include directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... ";
+               $ret = $main::config{$key};
+               print "\033[1;32m$ret\033[0m (cached)\n";
+               return $ret;
+       }
+
        extend_pkg_path();
 
        print "Locating include directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... ";
 
+       $v = `pkg-config --modversion $packagename 2>/dev/null`;
        $ret = `pkg-config --cflags $packagename 2>/dev/null`;
-       if ((!defined $ret) || ($ret eq ""))
+
+       if ((!defined $v) || ($v eq ""))
        {
                $foo = `locate "$headername" | head -n 1`;
                $foo =~ /(.+)\Q$headername\E/;
-               if (defined $1)
+               $find = $1;
+               chomp($find);
+               if ((defined $find) && ($find ne "") && ($find ne $packagename))
                {
+                       print "(\033[1;32mFound via search\033[0m) ";
                        $foo = "-I$1";
                }
                else
                {
-                       $foo = "";
+                       $foo = " ";
+                       undef $v;
                }
                $ret = "$foo";
        }
@@ -69,36 +117,73 @@ sub pkgconfig_get_include_dirs($$$;$)
                $ret = "$foo " . $defaults;
        }
        chomp($ret);
-       if (($ret eq " ") || (!defined $ret))
+       if ((($ret eq " ") || (!defined $ret)) && ((!defined $v) || ($v eq "")))
        {
-               print "\033[1;32mUsing defaults\033[0m\n";
+               my $key = "default_includedir_$packagename";
+               if (exists $main::config{$key})
+               {
+                       $ret = $main::config{$key};
+               }
+               else
+               {
+                       $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\"";
+                       $main::config{$key} =~ s/^\s+//g;
+                       $ret = $main::config{$key};
+                       return $ret;
+               }
        }
        else
        {
-               print "\033[1;32m$ret\033[0m\n";
+               chomp($v);
+               my $key = "default_includedir_$packagename";
+               $packagename =~ tr/a-z/A-Z/;
+               $main::config{$key} = "$ret -DVERSION_$packagename=\"$v\"";
+               $main::config{$key} =~ s/^\s+//g;
+               $ret = $main::config{$key};
+               print "\033[1;32m$ret\033[0m (version $v)\n";
        }
+       $ret =~ s/^\s+//g;
        return $ret;
 }
 
 sub pkgconfig_get_lib_dirs($$$;$)
 {
        my ($packagename, $libname, $defaults, $module) = @_;
+
+       my $key = "default_libdir_$packagename";
+       if (exists $main::config{$key})
+       {
+               print "Locating library directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... ";
+               $ret = $main::config{$key};
+               print "\033[1;32m$ret\033[0m (cached)\n";
+               return $ret;
+       }
+
        extend_pkg_path();
 
        print "Locating library directory for package \033[1;32m$packagename\033[0m for module \033[1;32m$module\033[0m... ";
 
+       $v = `pkg-config --modversion $packagename 2>/dev/null`;
        $ret = `pkg-config --libs $packagename 2>/dev/null`;
-       if ((!defined $ret) || ($ret eq ""))
+
+       if ((!defined $v) || ($v eq ""))
        {
                $foo = `locate "$libname" | head -n 1`;
                $foo =~ /(.+)\Q$libname\E/;
-               if (defined $1)
+               $find = $1;
+               chomp($find);
+               if ((defined $find) && ($find ne "") && ($find ne $packagename))
                {
+                       print "(\033[1;32mFound via search\033[0m) ";
                        $foo = "-L$1";
                }
                else
                {
-                       $foo = "";
+                       $foo = " ";
+                       undef $v;
                }
                $ret = "$foo";
        }
@@ -108,14 +193,33 @@ sub pkgconfig_get_lib_dirs($$$;$)
                $ret = "$foo " . $defaults;
        }
        chomp($ret);
-       if (($ret eq " ") || (!defined $ret))
+       if ((($ret eq " ") || (!defined $ret)) && ((!defined $v) || ($v eq "")))
        {
-               print "\033[1;32mUsing defaults\033[0m\n";
+               my $key = "default_libdir_$packagename";
+               if (exists $main::config{$key})
+               {
+                       $ret = $main::config{$key};
+               }
+               else
+               {
+                       $libname =~ s/^\///;
+                       promptstring("path to the directory containing $libname", $key, "/usr/lib",$packagename,"$packagename-libs");
+                       $main::config{$key} = "-L$main::config{$key}" . " $defaults";
+                       $main::config{$key} =~ s/^\s+//g;
+                       $ret = $main::config{$key};
+                       return $ret;
+               }
        }
        else
        {
-               print "\033[1;32m$ret\033[0m\n";
+               chomp($v);
+               print "\033[1;32m$ret\033[0m (version $v)\n";
+               my $key = "default_libdir_$packagename";
+               $main::config{$key} = $ret;
+               $main::config{$key} =~ s/^\s+//g;
+               $ret =~ s/^\s+//g;
        }
+       $ret =~ s/^\s+//g;
        return $ret;
 }
 
@@ -123,9 +227,10 @@ sub pkgconfig_get_lib_dirs($$$;$)
 # to functions within these modules at configure time.
 sub translate_functions($$)
 {
+       my ($line,$module) = @_;
+
        eval
        {
-               my ($line,$module) = @_;
                $module =~ /modules*\/(.+?)$/;
                $module = $1;
 
@@ -152,7 +257,7 @@ sub translate_functions($$)
                        do
                        {
                                $tmpfile = tmpnam();
-                       } until sysopen(TF, $tmpfile, O_RDWR|O_CREAT|O_EXCL, 0700);
+                       } until sysopen(TF, $tmpfile, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW, 0700);
                        print "(Created and executed \033[1;32m$tmpfile\033[0m)\n";
                        print TF $1;
                        close TF;
@@ -185,13 +290,18 @@ sub translate_functions($$)
                        my $replace = make_rpath($1,$module);
                        $line =~ s/rpath\("(.+?)"\)/$replace/;
                }
-               return $line;
        };
        if ($@)
        {
-               print "\n\nConfiguration failed. The following error occured:\n\n$@\n";
+               $err = $@;
+               $err =~ s/at .+? line \d+.*//g;
+               print "\n\nConfiguration failed. The following error occured:\n\n$err\n";
                exit;
        }
+       else
+       {
+               return $line;
+       }
 }
 
 1;