diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-03-20 13:22:08 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-03-20 13:22:08 +1100 |
| commit | 27c6eca04c4c1bb40ff36f3a08748e2f45770aa8 (patch) | |
| tree | f87d3e6ca4958e9b9102ca8ee5fb3e5f0917570e /source4/aclocal.m4 | |
| parent | 1f25b71d199a072f5ee1bdd8786e5c1c157f5888 (diff) | |
| parent | 5fe2b28f45289dc5578cdd536600f0d30a14d820 (diff) | |
| download | samba-27c6eca04c4c1bb40ff36f3a08748e2f45770aa8.tar.gz samba-27c6eca04c4c1bb40ff36f3a08748e2f45770aa8.tar.bz2 samba-27c6eca04c4c1bb40ff36f3a08748e2f45770aa8.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
Diffstat (limited to 'source4/aclocal.m4')
| -rw-r--r-- | source4/aclocal.m4 | 10 |
1 files changed, 8 insertions, 2 deletions
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 |