Fix a portability problem.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index a4ee0c5782374bf1d8b789125b8f327bc92a50bb..61ac893ac523d41b01b3b0c6e4545a0aff2a2715 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,5 +1,10 @@
 2002-04-08  Bruno Haible  <bruno@clisp.org>
 
+       * lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Handle -R options that appear
+       in $dependency_libs, for example on HP-UX 10.20 and OSF/1.
+       Reported by Albert Chin-A-Young <china@thewrittenword.com>
+       and Nelson H. F. Beebe <beebe@math.utah.edu>.
+
        * javacomp.m4 (gt_JAVACOMP): Test whether "gcj -C" really works, to
        protect against systems where libgcj.jar is missing or misinstalled.
 

diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index a16aa4460549d17704e10863738a543341bb026a..09f7f172235b369ba68d9f119631568ff2272a8d 100644 (file)
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,4 +1,4 @@
-# lib-link.m4 serial 1 (gettext-0.11)
+# lib-link.m4 serial 2 (gettext-0.11.2)
 dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -434,6 +434,33 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                       fi
                     fi
                     ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    dnl Potentially add DIR to rpathdirs.
+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
+                    haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $dir"
+                    fi
+                    dnl Potentially add DIR to ltrpathdirs.
+                    dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                    haveit=
+                    for x in $ltrpathdirs; do
+                      if test "X$x" = "X$dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      ltrpathdirs="$ltrpathdirs $dir"
+                    fi
+                    ;;
                   -l*)
                     dnl Handle this in the next round.
                     names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`