Skip to content

Commit c9a4619

Browse files
committed
Update from gnulib.
1 parent 37ffec7 commit c9a4619

File tree

2 files changed

+37
-35
lines changed

2 files changed

+37
-35
lines changed

build-aux/config.libpath

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Output a system dependent set of variables, describing how to set the
33
# run time search path of shared libraries in an executable at run time.
44
#
5-
# Copyright 1996-2005 Free Software Foundation, Inc.
5+
# Copyright 1996-2007 Free Software Foundation, Inc.
66
# Taken from GNU libtool, 2003
77
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
88
#
@@ -67,9 +67,6 @@ case $host_os in
6767
dgux*)
6868
shlibpath_var=LD_LIBRARY_PATH
6969
;;
70-
kfreebsd*-gnu)
71-
shlibpath_var=LD_LIBRARY_PATH
72-
;;
7370
freebsd1*)
7471
;;
7572
freebsd* | dragonfly*)
@@ -84,7 +81,7 @@ case $host_os in
8481
*) shlibpath_var=SHLIB_PATH ;;
8582
esac
8683
;;
87-
interix3*)
84+
interix[3-9]*)
8885
shlibpath_var=LD_LIBRARY_PATH
8986
;;
9087
irix5* | irix6* | nonstopux*)
@@ -105,10 +102,7 @@ case $host_os in
105102
;;
106103
linux*oldld* | linux*aout* | linux*coff*)
107104
;;
108-
linux*)
109-
shlibpath_var=LD_LIBRARY_PATH
110-
;;
111-
knetbsd*-gnu)
105+
linux* | k*bsd*-gnu)
112106
shlibpath_var=LD_LIBRARY_PATH
113107
;;
114108
netbsd*)
@@ -129,6 +123,8 @@ case $host_os in
129123
osf3* | osf4* | osf5*)
130124
shlibpath_var=LD_LIBRARY_PATH
131125
;;
126+
rdos*)
127+
;;
132128
solaris*)
133129
shlibpath_var=LD_LIBRARY_PATH
134130
;;

build-aux/config.rpath

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Output a system dependent set of variables, describing how to set the
33
# run time search path of shared libraries in an executable.
44
#
5-
# Copyright 1996-2006 Free Software Foundation, Inc.
5+
# Copyright 1996-2007 Free Software Foundation, Inc.
66
# Taken from GNU libtool, 2001
77
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
88
#
@@ -64,7 +64,7 @@ else
6464
;;
6565
esac
6666
;;
67-
mingw* | pw32* | os2*)
67+
mingw* | cygwin* | pw32* | os2*)
6868
;;
6969
hpux9* | hpux10* | hpux11*)
7070
wl='-Wl,'
@@ -74,7 +74,7 @@ else
7474
;;
7575
newsos6)
7676
;;
77-
linux*)
77+
linux* | k*bsd*-gnu)
7878
case $cc_basename in
7979
icc* | ecc*)
8080
wl='-Wl,'
@@ -100,19 +100,22 @@ else
100100
osf3* | osf4* | osf5*)
101101
wl='-Wl,'
102102
;;
103-
sco3.2v5*)
103+
rdos*)
104104
;;
105105
solaris*)
106106
wl='-Wl,'
107107
;;
108108
sunos4*)
109109
wl='-Qoption ld '
110110
;;
111-
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
111+
sysv4 | sysv4.2uw2* | sysv4.3*)
112112
wl='-Wl,'
113113
;;
114114
sysv4*MP*)
115115
;;
116+
sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
117+
wl='-Wl,'
118+
;;
116119
unicos*)
117120
wl='-Wl,'
118121
;;
@@ -189,11 +192,11 @@ if test "$with_gnu_ld" = yes; then
189192
ld_shlibs=no
190193
fi
191194
;;
192-
interix3*)
195+
interix[3-9]*)
193196
hardcode_direct=no
194197
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
195198
;;
196-
linux*)
199+
gnu* | linux* | k*bsd*-gnu)
197200
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
198201
:
199202
else
@@ -280,7 +283,7 @@ else
280283
strings "$collect2name" | grep resolve_lib_name >/dev/null
281284
then
282285
# We have reworked collect2
283-
hardcode_direct=yes
286+
:
284287
else
285288
# We have old collect2
286289
hardcode_direct=unsupported
@@ -359,7 +362,7 @@ else
359362
hardcode_direct=yes
360363
hardcode_minus_L=yes
361364
;;
362-
freebsd* | kfreebsd*-gnu | dragonfly*)
365+
freebsd* | dragonfly*)
363366
hardcode_libdir_flag_spec='-R$libdir'
364367
hardcode_direct=yes
365368
;;
@@ -412,18 +415,22 @@ else
412415
hardcode_libdir_separator=:
413416
;;
414417
openbsd*)
415-
hardcode_direct=yes
416-
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
417-
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
418+
if test -f /usr/libexec/ld.so; then
419+
hardcode_direct=yes
420+
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
421+
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
422+
else
423+
case "$host_os" in
424+
openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
425+
hardcode_libdir_flag_spec='-R$libdir'
426+
;;
427+
*)
428+
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
429+
;;
430+
esac
431+
fi
418432
else
419-
case "$host_os" in
420-
openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
421-
hardcode_libdir_flag_spec='-R$libdir'
422-
;;
423-
*)
424-
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
425-
;;
426-
esac
433+
ld_shlibs=no
427434
fi
428435
;;
429436
os2*)
@@ -471,7 +478,7 @@ else
471478
ld_shlibs=yes
472479
fi
473480
;;
474-
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
481+
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
475482
;;
476483
sysv5* | sco3.2v5* | sco5v6*)
477484
hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
@@ -523,9 +530,6 @@ case "$host_os" in
523530
;;
524531
freebsd1*)
525532
;;
526-
kfreebsd*-gnu)
527-
library_names_spec='$libname$shrext'
528-
;;
529533
freebsd* | dragonfly*)
530534
case "$host_os" in
531535
freebsd[123]*)
@@ -551,7 +555,7 @@ case "$host_os" in
551555
esac
552556
library_names_spec='$libname$shrext'
553557
;;
554-
interix3*)
558+
interix[3-9]*)
555559
library_names_spec='$libname$shrext'
556560
;;
557561
irix5* | irix6* | nonstopux*)
@@ -572,7 +576,7 @@ case "$host_os" in
572576
;;
573577
linux*oldld* | linux*aout* | linux*coff*)
574578
;;
575-
linux*)
579+
linux* | k*bsd*-gnu)
576580
library_names_spec='$libname$shrext'
577581
;;
578582
knetbsd*-gnu)
@@ -598,6 +602,8 @@ case "$host_os" in
598602
osf3* | osf4* | osf5*)
599603
library_names_spec='$libname$shrext'
600604
;;
605+
rdos*)
606+
;;
601607
solaris*)
602608
library_names_spec='$libname$shrext'
603609
;;

0 commit comments

Comments
 (0)