summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-11-03 18:09:26 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-11-03 18:09:26 +0000
commit4bd6bbfebcc830db5a77ac340c4689b025bf4bfd (patch)
treef0b0f18f2bd2d9f6598897f270decc60a640222e /configure
parent335a65f4188377a6d6a218fc225802ebbe1ec408 (diff)
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
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure15
1 files changed, 12 insertions, 3 deletions
diff --git a/configure b/configure
index 517014d91..16af52d0e 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,
@@ -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}))