4 files changed, 13 insertions, 12 deletions
diff --git a/sysdeps/unix/inet/Subdirs b/sysdeps/unix/inet/Subdirs
index bce3ada782..5043651cc5 100644
--- a/sysdeps/unix/inet/Subdirs
+++ b/sysdeps/unix/inet/Subdirs
@@ -1,4 +1,4 @@
 inet
-nis
 resolv
 sunrpc
+nis
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index ddf8663931..4508848a03 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -60,7 +60,7 @@ fi
 # Under Linux the LinuxThreads and crypt add-on should be available.
 case $add_ons in
   # Both are available.  Good.
-  *linuxthreads*des-crypt* | *des-crypt*linuxthreads*)
+  *linuxthreads*crypt* | *crypt*linuxthreads*)
     message=
     ;;
   *linuxthreads*)
@@ -68,14 +68,14 @@ case $add_ons in
 *** WARNING:
 *** Are you sure you do not want to use the \`crypt' add-on?"
     ;;
-  *des-crypt*)
+  *crypt*)
     message="\
 *** WARNING:
-*** Are you sure you do not want to use the \`LinuxThread' add-on?"
+*** Are you sure you do not want to use the \`linuxthread' add-on?"
     ;;
   *)
     message="\
-*** WARNING: Are you sure you do not want to use the \`LinuxThreads'
+*** WARNING: Are you sure you do not want to use the \`linuxthreads'
 *** and \`crypt' add-ons?"
     ;;
 esac
@@ -83,7 +83,7 @@ esac
 if test "$message"; then
   if test $enable_sanity = yes; then
     echo "\
-*** You should not compile the GNU libc without the \`LinuxThreads' and
+*** You should not compile the GNU libc without the \`linuxthreads' and
 *** \`crypt' add-on.  Not using them risks to be incompatible with the
 *** libraries of other systems.  Consider getting the add-ons and restart
 *** the configuration.
diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in
index fe499af438..174eb32ce1 100644
--- a/sysdeps/unix/sysv/linux/configure.in
+++ b/sysdeps/unix/sysv/linux/configure.in
@@ -45,7 +45,7 @@ fi
 # Under Linux the LinuxThreads and crypt add-on should be available.
 case $add_ons in
   # Both are available.  Good.
-  *linuxthreads*des-crypt* | *des-crypt*linuxthreads*)
+  *linuxthreads*crypt* | *crypt*linuxthreads*)
     message=
     ;;
   *linuxthreads*)
@@ -53,14 +53,14 @@ case $add_ons in
 *** WARNING:
 *** Are you sure you do not want to use the \`crypt' add-on?"
     ;;
-  *des-crypt*)
+  *crypt*)
     message="\
 *** WARNING:
-*** Are you sure you do not want to use the \`LinuxThread' add-on?"
+*** Are you sure you do not want to use the \`linuxthread' add-on?"
     ;;
   *)
     message="\
-*** WARNING: Are you sure you do not want to use the \`LinuxThreads'
+*** WARNING: Are you sure you do not want to use the \`linuxthreads'
 *** and \`crypt' add-ons?"
     ;;
 esac
@@ -68,7 +68,7 @@ esac
 if test "$message"; then
   if test $enable_sanity = yes; then
     echo "\
-*** You should not compile the GNU libc without the \`LinuxThreads' and
+*** You should not compile the GNU libc without the \`linuxthreads' and
 *** \`crypt' add-on.  Not using them risks to be incompatible with the
 *** libraries of other systems.  Consider getting the add-ons and restart
 *** the configuration.
diff --git a/sysdeps/unix/sysv/linux/paths.h b/sysdeps/unix/sysv/linux/paths.h
index f5629fc3fc..53c4fc5dcb 100644
--- a/sysdeps/unix/sysv/linux/paths.h
+++ b/sysdeps/unix/sysv/linux/paths.h
@@ -48,8 +48,9 @@
 #define	_PATH_DEVDB	"/var/run/dev.db"
 #define	_PATH_DEVNULL	"/dev/null"
 #define	_PATH_DRUM	"/dev/drum"
+#define	_PATH_KLOG	"/proc/kmsg"
 #define	_PATH_KMEM	"/dev/kmem"
-#define _PATH_LASTLOG	"/var/log/lastlog"
+#define	_PATH_LASTLOG	"/var/log/lastlog"
 #define	_PATH_MAILDIR	"/var/spool/mail"
 #define	_PATH_MAN	"/usr/man"
 #define	_PATH_MEM	"/dev/mem"