summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2009-03-11 15:32:49 +0100
committerMichael Adam <obnox@samba.org>2009-03-17 16:11:14 +0100
commit066cbb5835feae90e2ce4172e3c58bf50a2b004b (patch)
treef50125acbfa1e65b28eacb2fa2feb1a180ccbadd
parentda06a345cc290ca29234bc231fc9174d2780cf4f (diff)
downloadsamba-066cbb5835feae90e2ce4172e3c58bf50a2b004b.tar.gz
samba-066cbb5835feae90e2ce4172e3c58bf50a2b004b.tar.bz2
samba-066cbb5835feae90e2ce4172e3c58bf50a2b004b.zip
clean up lib64 linking paths the same way as lib
Signed-off-by: Michael Adam <obnox@samba.org>
-rw-r--r--source3/m4/aclocal.m410
-rw-r--r--source4/aclocal.m410
2 files changed, 16 insertions, 4 deletions
diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index aae729c825..dff4970b2c 100644
--- a/source3/m4/aclocal.m4
+++ b/source3/m4/aclocal.m4
@@ -386,11 +386,17 @@ AC_DEFUN(LIB_REMOVE_USR_LIB,[
case [$]l[$]i in
-L/usr/lib) ;;
-L/usr/lib/) ;;
- -Wl,-rpath,/usr/lib) ;;
- -Wl,-rpath,/usr/lib/) ;;
+ -L/usr/lib64) ;;
+ -L/usr/lib64/) ;;
+ -Wl,-rpath,/usr/lib) l="";;
+ -Wl,-rpath,/usr/lib/) l="";;
+ -Wl,-rpath,/usr/lib64) l="";;
+ -Wl,-rpath,/usr/lib64/) l="";;
-Wl,-rpath) l=[$]i;;
-Wl,-rpath-Wl,/usr/lib) l="";;
-Wl,-rpath-Wl,/usr/lib/) l="";;
+ -Wl,-rpath-Wl,/usr/lib64) l="";;
+ -Wl,-rpath-Wl,/usr/lib64/) l="";;
*)
s=" "
if test x"[$]ac_new_flags" = x""; then
diff --git a/source4/aclocal.m4 b/source4/aclocal.m4
index 240a994f9d..8ad8f47cd6 100644
--- a/source4/aclocal.m4
+++ b/source4/aclocal.m4
@@ -31,11 +31,17 @@ AC_DEFUN(LIB_REMOVE_USR_LIB,[
case [$]l[$]i in
-L/usr/lib) ;;
-L/usr/lib/) ;;
- -Wl,-rpath,/usr/lib) ;;
- -Wl,-rpath,/usr/lib/) ;;
+ -L/usr/lib64) ;;
+ -L/usr/lib64/) ;;
+ -Wl,-rpath,/usr/lib) l="";;
+ -Wl,-rpath,/usr/lib/) l="";;
+ -Wl,-rpath,/usr/lib64) l="";;
+ -Wl,-rpath,/usr/lib64/) l="";;
-Wl,-rpath) l=[$]i;;
-Wl,-rpath-Wl,/usr/lib) l="";;
-Wl,-rpath-Wl,/usr/lib/) l="";;
+ -Wl,-rpath-Wl,/usr/lib64) l="";;
+ -Wl,-rpath-Wl,/usr/lib64/) l="";;
*)
s=" "
if test x"[$]ac_new_flags" = x""; then