diff options
| author | Bruno Haible <bruno@clisp.org> | 2005-05-02 10:28:53 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:12:32 +0200 |
| commit | f5753f6ba2f7f85469901d6b6685cb82a7cc9606 (patch) | |
| tree | 27b2073dc10235d2da3f46fe0faa2178997800a5 /autoconf-lib-link | |
| parent | 5da97ec23198338e5a1f035df020ba13694ee354 (diff) | |
| download | gettext-f5753f6ba2f7f85469901d6b6685cb82a7cc9606.tar.gz | |
Upgrade to libtool-1.5.16.
Diffstat (limited to 'autoconf-lib-link')
| -rw-r--r-- | autoconf-lib-link/ChangeLog | 4 | ||||
| -rwxr-xr-x | autoconf-lib-link/config.rpath | 38 |
2 files changed, 30 insertions, 12 deletions
diff --git a/autoconf-lib-link/ChangeLog b/autoconf-lib-link/ChangeLog index eb3db910f..abcf8b784 100644 --- a/autoconf-lib-link/ChangeLog +++ b/autoconf-lib-link/ChangeLog @@ -1,3 +1,7 @@ +2005-05-01 Bruno Haible <bruno@clisp.org> + + * config.rpath: Upgrade to libtool-1.5.16. + 2005-04-11 Bruno Haible <bruno@clisp.org> * gettext-0.14.4 released. diff --git a/autoconf-lib-link/config.rpath b/autoconf-lib-link/config.rpath index 3f1bef34a..b13fac404 100755 --- a/autoconf-lib-link/config.rpath +++ b/autoconf-lib-link/config.rpath @@ -35,7 +35,17 @@ host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -cc_basename=`echo "$CC" | sed -e 's%^.*/%%'` +# Code taken from libtool.m4's _LT_CC_BASENAME. + +for cc_temp in $CC""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. @@ -127,6 +137,12 @@ esac ld_shlibs=yes if test "$with_gnu_ld" = yes; then + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + # Unlike libtool, we use -rpath here, not --rpath, since the documented + # option of GNU ld is called -rpath, not --rpath. + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' case "$host_os" in aix3* | aix4* | aix5*) # On AIX/PPC, the GNU linker is very broken @@ -162,6 +178,13 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no fi ;; + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; netbsd*) ;; solaris* | sysv5*) @@ -176,13 +199,6 @@ if test "$with_gnu_ld" = yes; then sunos4*) hardcode_direct=yes ;; - linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : @@ -191,10 +207,8 @@ if test "$with_gnu_ld" = yes; then fi ;; esac - if test "$ld_shlibs" = yes; then - # Unlike libtool, we use -rpath here, not --rpath, since the documented - # option of GNU ld is called -rpath, not --rpath. - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + if test "$ld_shlibs" = no; then + hardcode_libdir_flag_spec= fi else case "$host_os" in |