Update.

	* sysdeps/unix/sysv/linux/configure.in: Set libc_cv_sysconfdir
	depending on the configure option --sysconfdir.
        Closes PR libc/1762.
        Patch by Andreas Schwab <schwab@suse.de>.

diff --git a/ChangeLog b/ChangeLog
index 7ca0380..25fadcf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2000-06-14  Andreas Jaeger  <aj@suse.de>
 
+       * sysdeps/unix/sysv/linux/configure.in: Set libc_cv_sysconfdir
+       depending on the configure option --sysconfdir.
+        Closes PR libc/1762.
+        Patch by Andreas Schwab <schwab@suse.de>.
+
        * sysdeps/mips/dl-machine.h: Pass finalizer correctly to user
        entry point.
        Reported by Jim Pick <jim@jimpick.com>.

diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index acc47c5..1a3d18c 100644 (file)
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -130,7 +130,12 @@ if test "$prefix" = "/usr" -o "$prefix" = "/usr/"; then
   else
     libc_cv_slibdir="/lib"
   fi
-  libc_cv_sysconfdir="/etc"
+  # Allow the user to override the path with --sysconfdir
+  if test $sysconfdir = '${prefix}/etc'; then
+    libc_cv_sysconfdir=/etc
+  else
+    libc_cv_sysconfdir=$sysconfdir
+   fi
   libc_cv_rootsbindir="/sbin"
 fi
 
@@ -189,7 +194,7 @@ if test $host = $build; then
     ac_prefix=$ac_default_prefix
   fi
   echo $ac_n "checking for symlinks in ${ac_prefix}/include""... $ac_c" 1>&6
-echo "configure:193: checking for symlinks in ${ac_prefix}/include" >&5
+echo "configure:198: checking for symlinks in ${ac_prefix}/include" >&5
   ac_message=
   if test -L ${ac_prefix}/include/net; then
     ac_message="$ac_message

diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in
index 2ed2c09..d379421 100644 (file)
--- a/sysdeps/unix/sysv/linux/configure.in
+++ b/sysdeps/unix/sysv/linux/configure.in
@@ -101,7 +101,12 @@ if test "$prefix" = "/usr" -o "$prefix" = "/usr/"; then
   else
     libc_cv_slibdir="/lib"
   fi
-  libc_cv_sysconfdir="/etc"
+  # Allow the user to override the path with --sysconfdir
+  if test $sysconfdir = '${prefix}/etc'; then
+    libc_cv_sysconfdir=/etc
+  else
+    libc_cv_sysconfdir=$sysconfdir
+   fi
   libc_cv_rootsbindir="/sbin"
 fi