about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2000-06-14 13:50:11 +0000
committerAndreas Jaeger <aj@suse.de>2000-06-14 13:50:11 +0000
commitcee49e0c4cc09458914516e160bc3ee085138998 (patch)
treeeadbdfc7b28f7551dde37baf1e6917ca0c7e54c9
parente85db9de5986e7935b4dd9ff0c0a140eaa561a77 (diff)
downloadglibc-cee49e0c4cc09458914516e160bc3ee085138998.tar.gz
glibc-cee49e0c4cc09458914516e160bc3ee085138998.tar.xz
glibc-cee49e0c4cc09458914516e160bc3ee085138998.zip
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>.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/configure9
-rw-r--r--sysdeps/unix/sysv/linux/configure.in7
3 files changed, 18 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ca038004d..25fadcfe1f 100644
--- 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 acc47c5b3b..1a3d18c7dd 100644
--- 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 2ed2c096d8..d379421a80 100644
--- 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