X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fopenssl_config.pl;h=61d8f29021004bc7abaac6c0d9d0652e7c0475ab;hb=59bd18f2a0b43b71ee32124add9d40d1d3a54919;hp=303b6e4ed2dbca75762258901e92a2279d2b4d53;hpb=1ef5c4e58164e0403f30c5ca0c9d7b99ce557106;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/openssl_config.pl b/src/modules/extra/openssl_config.pl
index 303b6e4ed..61d8f2902 100644
--- a/src/modules/extra/openssl_config.pl
+++ b/src/modules/extra/openssl_config.pl
@@ -1,21 +1,48 @@
 #!/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 ""))
+	$ret = `pkg-config --cflags openssl 2>/dev/null`;
+	if ((!defined $ret) || ($ret eq ""))
 	{
-		$ret = "";
+		$foo = `locate "/openssl/ssl.h" | head -n 1`;
+		$foo =~ /(.+)\/openssl\/ssl\.h/;
+		if (defined $1)
+		{
+			$foo = "-I$1";
+		}
+		else
+		{
+			$foo = "";
+		}
+		$ret = "$foo\n";
 	}
 }
 else
 {
-	$ret = `pkg-config --libs openssl`;
-	if ((undef $ret) || ($ret eq ""))
+	$ret = `pkg-config --libs openssl 2>/dev/null`;
+	if ((!defined $ret) || ($ret eq ""))
 	{
-		$ret = "-lssl -lcrypto -ldl";
+		$foo = `locate "/libssl.so" | head -n 1`;
+		$foo =~ /(.+)\/libssl\.so/;
+		if (defined $1)
+		{
+			$foo = "-L$1";
+		}
+		else
+		{
+			$foo = "";
+		}
+		$ret = "$foo -lssl -lcrypto\n";
 	}
 }
-print "$ret\n";
+print "$ret";