summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2002-07-18 20:44:25 +0000
committerJim Meyering <jim@meyering.net>2002-07-18 20:44:25 +0000
commitd4439bcbf474d396f1aac4351c0eb9876522a198 (patch)
tree531166db669c5aecef9f86980eb6c0c57c72fcdc
parentaf378653701ef62fc89800c9b2e3dd1c2039ebe8 (diff)
downloadcoreutils-d4439bcbf474d396f1aac4351c0eb9876522a198.tar.xz
update from master
-rw-r--r--config/config.guess6
-rwxr-xr-xconfig/config.rpath76
-rw-r--r--config/mkinstalldirs2
3 files changed, 50 insertions, 34 deletions
diff --git a/config/config.guess b/config/config.guess
index d7c7fd7e2..ffcb6435d 100644
--- a/config/config.guess
+++ b/config/config.guess
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002 Free Software Foundation, Inc.
-timestamp='2002-07-03'
+timestamp='2002-07-09'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -283,7 +283,7 @@ EOF
;;
esac
fi
- rm -f $dummy.s $dummy && dir $tmpdir
+ rm -f $dummy.s $dummy && rmdir $tmpdir
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;;
Alpha\ *:Windows_NT*:*)
@@ -324,7 +324,7 @@ EOF
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
exit 0 ;;
- DSR?6000:UNIX_SV:4.2*:7*)
+ DRS?6000:UNIX_SV:4.2*:7*)
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7 && exit 0 ;;
esac ;;
diff --git a/config/config.rpath b/config/config.rpath
index f5b8921e6..5ead7586a 100755
--- a/config/config.rpath
+++ b/config/config.rpath
@@ -50,9 +50,7 @@ if test "$GCC" = yes; then
else
case "$host_os" in
aix3* | aix4* | aix5*)
- if test "$host_cpu" = ia64; then
- wl='-Wl,'
- fi
+ wl='-Wl,'
;;
hpux9* | hpux10* | hpux11*)
wl='-Wl,'
@@ -95,7 +93,7 @@ hardcode_direct=no
hardcode_minus_L=no
case "$host_os" in
- cygwin* | mingw* | pw32* )
+ cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@@ -103,6 +101,9 @@ case "$host_os" in
with_gnu_ld=no
fi
;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -171,38 +172,42 @@ else
fi
;;
aix4* | aix5*)
- hardcode_libdir_separator=':'
- if test "$GCC" = yes; then
- collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" && \
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- hardcode_direct=yes
- else
- # We have old collect2
- hardcode_direct=unsupported
- hardcode_minus_L=yes
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_libdir_separator=
- fi
- else
- hardcode_direct=yes
- fi
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.
aix_use_runtimelinking=no
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 run time linking.
aix_use_runtimelinking=no
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
- aix_use_runtimelinking=yes
- break
+ # 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*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
+ done
+ esac
+ fi
+ hardcode_direct=yes
+ hardcode_libdir_separator=':'
+ if test "$GCC" = yes; then
+ case $host_os in aix4.[012]|aix4.[012].*)
+ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" && \
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+ hardcode_direct=yes
+ else
+ # We have old collect2
+ hardcode_direct=unsupported
+ hardcode_minus_L=yes
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_libdir_separator=
fi
- done
+ esac
fi
if test "$aix_use_runtimelinking" = yes; then
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
@@ -267,8 +272,19 @@ else
hardcode_libdir_separator=:
;;
openbsd*)
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ ;;
+ esac
+ fi
;;
os2*)
hardcode_libdir_flag_spec='-L$libdir'
diff --git a/config/mkinstalldirs b/config/mkinstalldirs
index 7f7cec962..76f873dbe 100644
--- a/config/mkinstalldirs
+++ b/config/mkinstalldirs
@@ -4,7 +4,7 @@
# Created: 1993-05-16
# Public domain
-# $Id: mkinstalldirs,v 1.2 2002/06/13 09:30:02 meyering Exp $
+# $Id: mkinstalldirs,v 1.3 2002/07/18 20:44:25 meyering Exp $
errstatus=0
dirmode=""