Rename D to INSPIRCD_DEBUG.

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

diff --git a/make/utilities.pm b/make/utilities.pm
index dc286da5ed5e2029c0bdf56a41955870c954013a..f2d645f3312cdd37bce35f601108fbb52474dddc 100644 (file)
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -32,6 +32,7 @@ use warnings FATAL => qw(all);
 use Exporter 'import';
 use Fcntl;
 use File::Path;
+use File::Temp;
 use Getopt::Long;
 use POSIX;
 
@@ -90,24 +91,10 @@ sub make_rpath($;$)
        return $output;
 }
 
-sub extend_pkg_path()
-{
-       if (!exists $ENV{PKG_CONFIG_PATH})
-       {
-               $ENV{PKG_CONFIG_PATH} = "/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/libdata/pkgconfig:/usr/X11R6/libdata/pkgconfig";
-       }
-       else
-       {
-               $ENV{PKG_CONFIG_PATH} .= ":/usr/local/lib/pkgconfig:/usr/local/libdata/pkgconfig:/usr/X11R6/libdata/pkgconfig";
-       }
-}
-
 sub pkgconfig_get_include_dirs($$$;$)
 {
        my ($packagename, $headername, $defaults, $module) = @_;
 
-       extend_pkg_path();
-
        print "Locating include directory for package \e[1;32m$packagename\e[0m for module \e[1;32m$module\e[0m... ";
 
        my $v = `pkg-config --modversion $packagename 2>/dev/null`;
@@ -180,8 +167,6 @@ sub pkgconfig_check_version($$;$)
 {
        my ($packagename, $version, $module) = @_;
 
-       extend_pkg_path();
-
        print "Checking version of package \e[1;32m$packagename\e[0m is >= \e[1;32m$version\e[0m... ";
 
        my $v = `pkg-config --modversion $packagename 2>/dev/null`;
@@ -213,8 +198,6 @@ sub pkgconfig_get_lib_dirs($$$;$)
 {
        my ($packagename, $libname, $defaults, $module) = @_;
 
-       extend_pkg_path();
-
        print "Locating library directory for package \e[1;32m$packagename\e[0m for module \e[1;32m$module\e[0m... ";
 
        my $v = `pkg-config --modversion $packagename 2>/dev/null`;
@@ -363,7 +346,7 @@ sub translate_functions($$)
                        my $tmpfile;
                        do
                        {
-                               $tmpfile = tmpnam();
+                               $tmpfile = File::Temp::tmpnam();
                        } until sysopen(TF, $tmpfile, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW, 0700);
                        print "(Created and executed \e[1;32m$tmpfile\e[0m)\n";
                        print TF $1;