X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=a13f59c8135372c9a246135c0b989e4ff5ca4353;hb=a3b4110d511951d92fbe9bcdf87aa51e2cd0a1ba;hp=517014d911031fb3a71ffdc456f823aa4e2c874c;hpb=34df2c0d94f45d3b0070e28cb9e21914a33f0bdf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 517014d91..a13f59c81 100755
--- a/configure
+++ b/configure
@@ -98,6 +98,7 @@ GetOptions (
 	'disable-ports' => \$opt_noports,
 	'disable-epoll' => \$opt_noepoll,
 	'disable-kqueue' => \$opt_nokqueue,
+	'disable-rpath' => \$opt_disablerpath,
 	'enable-ipv6' => \$opt_ipv6,
 	'enable-remote-ipv6' => \$opt_ipv6links,
 	'disable-remote-ipv6' => \$opt_noipv6links,
@@ -593,7 +594,7 @@ $config{HAS_EPOLL} = $has_epoll;
 $config{HAS_KQUEUE} = $has_kqueue; 
 
 printf "Checking for libgnutls... ";
-if (($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS} >= 1.2) || ($config{HAS_GNUTLS} eq "y"))) {
+if (($config{HAS_GNUTLS}) || ($config{HAS_GNUTLS} eq "y")) {
 	print "yes\n";
 	$config{HAS_GNUTLS} = "y";
 } else {
@@ -602,7 +603,7 @@ if (($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS} >= 1.2) || ($config{HAS_GNUTL
 }
 
 printf "Checking for openssl... ";
-if (($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL} >= 0.8) || ($config{HAS_OPENSSL} eq "y"))) {
+if (($config{HAS_OPENSSL}) || ($config{HAS_OPENSSL} eq "y")) {
 	print "yes\n";
 	$config{HAS_OPENSSL} = "y";
 } else {
@@ -1010,7 +1011,7 @@ sub getosflags {
 	$config{LDLIBS} = "-lstdc++";
 	$config{FLAGS}  = "-fPIC -Wall -pedantic $config{OPTIMISATI}";
 	$config{DEVELOPER} = "-fPIC -Wall -pedantic -g";
-	$SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared";
+	$SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared" unless defined $opt_disablerpath;
 	$config{MAKEPROG} = "make";
 
 	if ($config{OSNAME} =~ /darwin/i) {
@@ -1555,7 +1556,8 @@ sub write_dynamic_makefile
 	else
 	{
 		$libraryext = "so";
-		$othercrap = "	\$(CC) -pipe -I../include -Wl,--rpath -Wl,$config{LIBRARY_DIR} \$(FLAGS) $freebsd4libs -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) ";
+		$RPATH = "-Wl,--rpath -Wl,$config{LIBRARY_DIR}" unless defined $opt_disablerpath;
+		$othercrap = "	\$(CC) -pipe -I../include $RPATH \$(FLAGS) $freebsd4libs -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) ";
 	}
 
 	foreach my $cpp (sort keys %filelist)
@@ -1605,7 +1607,14 @@ EOM
 		}
 		else
 		{
-			$libcrap = "-Wl,--rpath -Wl," . $config{LIBRARY_DIR} . " -shared";
+			if (defined $opt_disablerpath)
+			{
+				$libcrap = " -shared";
+			}
+			else
+			{
+				$libcrap = "-Wl,--rpath -Wl," . $config{LIBRARY_DIR} . " -shared";
+			}
 		}
 		$deps = calcdeps("src/$cpp");
 		if (exists($extrasources{$cpp}))