Update.

1998-11-28 23:23 -0500  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* sysdeps/unix/sysv/linux/configure.in: Test for symlinks in
	$prefix/include that may be clobbered on installation.

diff --git a/ChangeLog b/ChangeLog
index b469218..a2d5943 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-11-28 23:23 -0500  Zack Weinberg  <zack@rabi.phys.columbia.edu> 
+ 
+       * sysdeps/unix/sysv/linux/configure.in: Test for symlinks in 
+       $prefix/include that may be clobbered on installation. 
+ 
 1998-11-27  Philip Blundell  <pb@nexus.co.uk>
 
        Fixes to allow compilation with static NSS:

diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index a55ba24..4165a54 100644 (file)
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -116,3 +116,26 @@ 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:
+$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"
+fi

diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in
index 535cd8f..7a38bfd 100644 (file)
--- a/sysdeps/unix/sysv/linux/configure.in
+++ b/sysdeps/unix/sysv/linux/configure.in
@@ -101,3 +101,26 @@ 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:
+$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"
+fi