aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-12-02 13:44:40 +0000
committerUlrich Drepper <drepper@redhat.com>1998-12-02 13:44:40 +0000
commiteeabe8776dadea2e3cb3eb0b2d792fbc6e0ae198 (patch)
treedfac4db6a92226a1b8bb633b6f42df5890a7e2cd /sysdeps
parent19c6b9c8abf9c3d2a3c856ebc32b5cfeb3e2affe (diff)
downloadglibc-eeabe8776dadea2e3cb3eb0b2d792fbc6e0ae198.zip
glibc-eeabe8776dadea2e3cb3eb0b2d792fbc6e0ae198.tar.gz
glibc-eeabe8776dadea2e3cb3eb0b2d792fbc6e0ae198.tar.bz2
Update.
1998-12-02 Ulrich Drepper <drepper@cygnus.com> * elf/elf.h: Add R_MIPS_JALR and adjust R_MIPS_NUM appropriately. 1998-12-02 Andreas Jaeger <aj@arthur.rhein-neckar.de> * inet/Versions: Remove inet6_isipv4mapped. 1998-12-02 Philip Blundell <pb@nexus.co.uk> * inet/in6_addr.c (inet6_isipv4mapped): Obsolete, deleted. 1998-11-30 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * manual/time.texi (Formatting Date and Time): Fix typo. 1998-11-30 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * sysdeps/unix/sysv/linux/configure.in: Only check for symlinks when configuring natively. Use autoconf macros instead of rolling our own. Handle defaulted prefix.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/configure42
-rw-r--r--sysdeps/unix/sysv/linux/configure.in41
2 files changed, 47 insertions, 36 deletions
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index 4165a54..dabffe6 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -117,25 +117,31 @@ case "$machine" in
esac
-# If $prefix/include/{net,scsi} are symlinks, make install will
-# clobber what they're linked to (probably a kernel tree).
-# test -L ought to work on all Linux boxes.
-echo $ac_n "checking for symlinks in ${prefix}/include...$ac_c"
-if test -L ${prefix}/include/net
-then message=" ${prefix}/include/net is a symlink"
-fi
-if test -L ${prefix}/include/scsi
-then message="$message
- ${prefix}/include/scsi is a symlink"
-fi
-if test -n "$message"; then
-echo "
-*** error:
+if test $host = $build; then
+ # If $prefix/include/{net,scsi} are symlinks, make install will
+ # clobber what they're linked to (probably a kernel tree).
+ # test -L ought to work on all Linux boxes.
+ if test "x$prefix" != xNONE; then
+ ac_prefix=$prefix
+ else
+ ac_prefix=$ac_default_prefix
+ fi
+ echo $ac_n "checking for symlinks in ${ac_prefix}/include""... $ac_c" 1>&6
+echo "configure:131: checking for symlinks in ${ac_prefix}/include" >&5
+ if test -L ${ac_prefix}/include/net; then
+ message=" ${ac_prefix}/include/net is a symlink"
+ fi
+ if test -L ${ac_prefix}/include/scsi; then
+ message="$message
+ ${ac_prefix}/include/scsi is a symlink"
+ fi
+ if test -n "$message"; then
+ { echo "configure: error:
$message
\`make install' will destroy the target of the link(s).
Delete the links and re-run configure, or better still, move the entire
-${prefix}/include directory out of the way."
-exit 1
-else
-echo " ok"
+${ac_prefix}/include directory out of the way." 1>&2; exit 1; }
+ else
+ echo "$ac_t""ok" 1>&6
+ fi
fi
diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in
index 7a38bfd..94c4361 100644
--- a/sysdeps/unix/sysv/linux/configure.in
+++ b/sysdeps/unix/sysv/linux/configure.in
@@ -102,25 +102,30 @@ case "$machine" in
esac
changequote([,])
-# If $prefix/include/{net,scsi} are symlinks, make install will
-# clobber what they're linked to (probably a kernel tree).
-# test -L ought to work on all Linux boxes.
-echo $ac_n "checking for symlinks in ${prefix}/include...$ac_c"
-if test -L ${prefix}/include/net
-then message=" ${prefix}/include/net is a symlink"
-fi
-if test -L ${prefix}/include/scsi
-then message="$message
- ${prefix}/include/scsi is a symlink"
-fi
-if test -n "$message"; then
-echo "
-*** error:
+if test $host = $build; then
+ # If $prefix/include/{net,scsi} are symlinks, make install will
+ # clobber what they're linked to (probably a kernel tree).
+ # test -L ought to work on all Linux boxes.
+ if test "x$prefix" != xNONE; then
+ ac_prefix=$prefix
+ else
+ ac_prefix=$ac_default_prefix
+ fi
+ AC_MSG_CHECKING([for symlinks in ${ac_prefix}/include])
+ if test -L ${ac_prefix}/include/net; then
+ message=" ${ac_prefix}/include/net is a symlink"
+ fi
+ if test -L ${ac_prefix}/include/scsi; then
+ message="$message
+ ${ac_prefix}/include/scsi is a symlink"
+ fi
+ if test -n "$message"; then
+ AC_MSG_ERROR([
$message
\`make install' will destroy the target of the link(s).
Delete the links and re-run configure, or better still, move the entire
-${prefix}/include directory out of the way."
-exit 1
-else
-echo " ok"
+${ac_prefix}/include directory out of the way.])
+ else
+ AC_MSG_RESULT(ok)
+ fi
fi