From 4bd6bbfebcc830db5a77ac340c4689b025bf4bfd Mon Sep 17 00:00:00 2001
From: brain
Date: Sat, 3 Nov 2007 18:09:26 +0000
Subject: Add --disable-rpath. Probably wont backport this for the time being

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8475 e03df62e-2008-0410-955e-edbf42e46eb7
---
 make/configure.pm | 2 ++
 make/utilities.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'make')

diff --git a/make/configure.pm b/make/configure.pm
index 9e9503c16..d244a49d5 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -238,6 +238,8 @@ InspIRCd 1.0.x, are also allowed.
 
   --disable-interactive        Sets no options intself, but
                                will disable any interactive prompting.
+  --disable-rpath              Disable runtime paths. DO NOT USE UNLESS
+                               YOU KNOW WHAT YOU ARE DOING!
   --update                     Update makefiles and dependencies
   --modupdate                  Detect new modules and write makefiles
   --svnupdate {--rebuild}      Update working copy via subversion
diff --git a/make/utilities.pm b/make/utilities.pm
index 792fd035b..c3909c1e4 100644
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -71,7 +71,7 @@ sub make_rpath($;$)
 			print "Adding extra library path to \033[1;32m$module\033[0m ... \033[1;32m$libpath\033[0m\n";
 			$already_added{$libpath} = 1;
 		}
-		$output .= "-Wl,--rpath -Wl,$libpath -L$libpath ";
+		$output .= "-Wl,--rpath -Wl,$libpath -L$libpath " unless defined $main::opt_disablerpath;
 		$data =~ s/-L(\S+)//;
 	}
 	return $output;
-- 
cgit v1.3.1-10-gc9f91