diff options
author | Colin Watson <cjwatson@debian.org> | 2008-12-03 10:39:33 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2008-12-03 10:39:33 +0000 |
commit | 5035d4d472f238cfc785debc05b8c949ec6ac9be (patch) | |
tree | f7bd0cd2b3805812180a3bd0f1375eb43b03863f /tools | |
parent | 5e8f0e5162a6e9509276c688cbbc4ad5a51dc059 (diff) |
* gnulib: Import the gettext module. The practical effect of this is
to get the intl directory included while compiling files in
gnulib/lib.
* autogen.sh: Prefer gnulib'\''s version of tools/config.rpath over
gettext'\''s.
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/config.rpath | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/config.rpath b/tools/config.rpath index c547c688..35f959b8 100755 --- a/tools/config.rpath +++ b/tools/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2007 Free Software Foundation, Inc. +# Copyright 1996-2008 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # @@ -158,7 +158,7 @@ if test "$with_gnu_ld" = yes; then # option of GNU ld is called -rpath, not --rpath. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' case "$host_os" in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no @@ -254,7 +254,7 @@ else hardcode_direct=unsupported fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -264,7 +264,7 @@ else # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -505,7 +505,7 @@ case "$host_os" in aix3*) library_names_spec='$libname.a' ;; - aix4* | aix5*) + aix[4-9]*) library_names_spec='$libname$shrext' ;; amigaos*) |