summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorspecial <special@e03df62e-2008-0410-955e-edbf42e46eb7>2006-11-21 22:05:53 +0000
committerspecial <special@e03df62e-2008-0410-955e-edbf42e46eb7>2006-11-21 22:05:53 +0000
commit425337dbe02c0c79e8221fb22138940d4e497902 (patch)
treeb185b962971396521050c3d057c90d460d7f31d5 /src
parent55b4bfe5e75838d9701f22af012a0028e7f77279 (diff)
Fixed gnutls_rpath.pl to do rpath for all paths, not just gnutls - this fixes an issue with systems that want to use libgcrypt or libgpg-error in nonstandard locations
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5781 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/gnutls_rpath.pl6
-rw-r--r--src/modules/extra/gnutls_rpath.pl4
-rw-r--r--src/modules/extra/m_ssl_gnutls.cpp2
3 files changed, 5 insertions, 7 deletions
diff --git a/src/gnutls_rpath.pl b/src/gnutls_rpath.pl
deleted file mode 100644
index f47445581..000000000
--- a/src/gnutls_rpath.pl
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/perl
-$data = `libgnutls-config --libs`;
-$data =~ /-L(\S+)\s/;
-$libpath = $1;
-print "-Wl,--rpath -Wl,$libpath";
-
diff --git a/src/modules/extra/gnutls_rpath.pl b/src/modules/extra/gnutls_rpath.pl
new file mode 100644
index 000000000..3371d5c8a
--- /dev/null
+++ b/src/modules/extra/gnutls_rpath.pl
@@ -0,0 +1,4 @@
+#!/usr/bin/perl
+$data = `libgnutls-config --libs`;
+$data =~ s/-L(\S+)\s/-Wl,--rpath -Wl,$1 -L$1 /g;
+print "$data";
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index ad14da755..1921f78f1 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -18,7 +18,7 @@
/* $ModDesc: Provides SSL support for clients */
/* $CompileFlags: `libgnutls-config --cflags` */
-/* $LinkerFlags: `libgnutls-config --libs` `perl ../gnutls_rpath.pl` */
+/* $LinkerFlags: `perl extra/gnutls_rpath.pl` */