r19091: merge from samba3:

remove some -Wl,-rpath combinations with /usr/lib

metze
(This used to be commit 66c6aab37ea24ae3f867b34f3b8039921fa2f718)

diff --git a/source4/aclocal.m4 b/source4/aclocal.m4
index df29bf1995c954c250b69be777e502b841a91615..57a66439a17af64ed02d84b8ba54e90bd58c243c 100644 (file)
--- a/source4/aclocal.m4
+++ b/source4/aclocal.m4
@@ -22,13 +22,32 @@ AC_DEFUN(CFLAGS_REMOVE_USR_INCLUDE,[
   $1=[$]ac_new_flags
 ])
     
-dnl Removes -L/usr/lib/? from given variable
+dnl Removes '-L/usr/lib[/]', '-Wl,-rpath,/usr/lib[/]'
+dnl and '-Wl,-rpath -Wl,/usr/lib[/]' from given variable
 AC_DEFUN(LIB_REMOVE_USR_LIB,[
   ac_new_flags=""
+  l=""
   for i in [$]$1; do
-    case [$]i in
-    -L/usr/lib|-L/usr/lib/) ;;
-    *) ac_new_flags="[$]ac_new_flags [$]i" ;;
+    case [$]l[$]i in
+    -L/usr/lib) ;;
+    -L/usr/lib/) ;;
+    -Wl,-rpath,/usr/lib) ;;
+    -Wl,-rpath,/usr/lib/) ;;
+    -Wl,-rpath) l=[$]i;;
+    -Wl,-rpath-Wl,/usr/lib) l="";;
+    -Wl,-rpath-Wl,/usr/lib/) l="";;
+    *)
+       s=" "
+        if test x"[$]ac_new_flags" = x""; then
+            s="";
+       fi
+        if test x"[$]l" = x""; then
+            ac_new_flags="[$]ac_new_flags[$]s[$]i";
+        else
+            ac_new_flags="[$]ac_new_flags[$]s[$]l [$]i";
+        fi
+        l=""
+        ;;
     esac
   done
   $1=[$]ac_new_flags