diff options
| author | Bruno Haible <bruno@clisp.org> | 2002-04-09 13:09:18 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:07:52 +0200 |
| commit | 07c07c00bdb6c95509d43590a5a2c7cb7c7e6583 (patch) | |
| tree | 2cd31f75823d0df0c48dc64ac5f96ada460c8552 /m4 | |
| parent | 88ad18dbf547e9e4d03450206ee4ed792d06e3e1 (diff) | |
| download | external_gettext-07c07c00bdb6c95509d43590a5a2c7cb7c7e6583.zip external_gettext-07c07c00bdb6c95509d43590a5a2c7cb7c7e6583.tar.gz external_gettext-07c07c00bdb6c95509d43590a5a2c7cb7c7e6583.tar.bz2 | |
Fix a portability problem.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 5 | ||||
| -rw-r--r-- | m4/lib-link.m4 | 29 |
2 files changed, 33 insertions, 1 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index a4ee0c5..61ac893 100644 --- 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 a16aa44..09f7f17 100644 --- 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//'` |