r19088: filter out -Wl,-rpath combinations with /usr/lib too

metze
(This used to be commit 52ffc8b12c53d4a65e31385108b34a20f1c74326)

diff --git a/source3/aclocal.m4 b/source3/aclocal.m4
index 185bae0f4402abe08a8ed362a88d64bbb41b91f7..5d9a9e054b16b5509e1099c91c71b54d5e75edbe 100644 (file)
--- a/source3/aclocal.m4
+++ b/source3/aclocal.m4
@@ -263,14 +263,33 @@ AC_DEFUN(CFLAGS_REMOVE_USR_INCLUDE,[
   done
   $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