summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-11-24 19:08:52 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-11-24 19:08:52 +0000
commitf9181e78805d46d32747735e38a2e0d597f80d6b (patch)
treeff3b716ce6100fdc271611d0bc76f62c3fe74b56
parent1ef5c4e58164e0403f30c5ca0c9d7b99ce557106 (diff)
More fixes
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5793 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/modules/extra/openssl_config.pl11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/modules/extra/openssl_config.pl b/src/modules/extra/openssl_config.pl
index 303b6e4ed..79fdf832f 100644
--- a/src/modules/extra/openssl_config.pl
+++ b/src/modules/extra/openssl_config.pl
@@ -1,8 +1,15 @@
#!/usr/bin/perl
-$ENV{PKG_CONFIG_PATH} = "/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/libdata/pkgconfig:/usr/X11R6/libdata/pkgconfig";
+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";
+}
-if ($ARGV[1] eq "compile")
+if ($ARGV[0] eq "compile")
{
$ret = `pkg-config --cflags openssl`;
if ((undef $ret) || ($ret eq ""))