Thu Jul 25 00:53:06 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>

	* sysdeps/unix/sysv/linux/configure.in (LIBC_LINUX_VERSION): New
	macro, now put the needed Linux version just once, here; update to
	needing linux-2.0.3 headers.
	(libc_cv_linuxVER): New macro derived from that.
	(kernel header check): Use those macros and some m4 magic to replace
	hard-coded `201' and `2.0.1' in several places.

	* Makerules ($(libdir)/libc.so): Fix typos in generated comment.

Wed Jul 24 17:02:30 1996  Ulrich Drepper  <drepper@cygnus.com>

	* time/localtime.c: Move lock variable declaration to end of
	variable declarations since if is a dummy macro the ; at the
	end terminates the variable section of the function.

	* time/tzset.c: Undefine `tzset' before function declaration.
	Use `weak_function' macro instead of `weak_symbol'.

Wed Jul 24 18:57:33 1996  Ulrich Drepper  <drepper@cygnus.com>

	* stdlib/strtouq.c: Additional weak alias is `strtoull', not
	`strotull'.

Wed Jul 24 18:26:23 1996  Ulrich Drepper  <drepper@cygnus.com>

	* locale/C-ctype.c: Increment number of fields after change
	from Wed Jun 19 03:24:58 1996.

7 files changed, 55 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index ca0184bf05..682fd4d357 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+Thu Jul 25 00:53:06 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
+
+	* sysdeps/unix/sysv/linux/configure.in (LIBC_LINUX_VERSION): New
+	macro, now put the needed Linux version just once, here; update to
+	needing linux-2.0.3 headers.
+	(libc_cv_linuxVER): New macro derived from that.
+	(kernel header check): Use those macros and some m4 magic to replace
+	hard-coded `201' and `2.0.1' in several places.
+
+	* Makerules ($(libdir)/libc.so): Fix typos in generated comment.
+
+Wed Jul 24 17:02:30 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* time/localtime.c: Move lock variable declaration to end of
+	variable declarations since if is a dummy macro the ; at the
+	end terminates the variable section of the function.
+
+	* time/tzset.c: Undefine `tzset' before function declaration.
+	Use `weak_function' macro instead of `weak_symbol'.
+
+Wed Jul 24 18:57:33 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* stdlib/strtouq.c: Additional weak alias is `strtoull', not
+	`strotull'.
+
+Wed Jul 24 18:26:23 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* locale/C-ctype.c: Increment number of fields after change
+	from Wed Jun 19 03:24:58 1996.
+
 Tue Jul 23 18:13:37 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
 	* sysdeps/mach/hurd/Makefile (rpcuserlibs): New variable.
diff --git a/Makerules b/Makerules
index 7fcc0385e2..3eabcb453e 100644
--- a/Makerules
+++ b/Makerules
@@ -590,8 +590,8 @@ $(libdir)/libc.so: $(common-objpfx)libc.so$(libc.so-version) \
 	(echo '/* Use the shared library, but some functions are only in';\
 	 echo '   the static library, so try that secondarily.'; \
 	 echo '   The dynamic linker defines some functions used by $(<F),';\
-	 echo '	  but ld uses definitions from libc.a before the examining';\
-	 echo '    dependencies of $(<F) to find $(rtld-installed-name).  */';\
+	 echo '	  but ld uses definitions from libc.a before examining the';\
+	 echo '   dependencies of $(<F) to find $(rtld-installed-name).  */';\
 	 echo 'GROUP ( $(^F) )') > $@.new
 	mv -f $@.new $@
 
diff --git a/locale/C-ctype.c b/locale/C-ctype.c
index 0cbae19836..89becbdf9f 100644
--- a/locale/C-ctype.c
+++ b/locale/C-ctype.c
@@ -898,7 +898,7 @@ const struct locale_data _nl_C_LC_CTYPE =
 {
   _nl_C_name,
   NULL, 0, /* no file mapped */
-  14,
+  15,
   {
     { string: _nl_C_LC_CTYPE_class },
 #if BYTE_ORDER == LITTLE_ENDIAN
diff --git a/stdlib/strtouq.c b/stdlib/strtouq.c
index e4d817f7f7..7900721979 100644
--- a/stdlib/strtouq.c
+++ b/stdlib/strtouq.c
@@ -21,4 +21,4 @@ Cambridge, MA 02139, USA.  */
 
 #include <strtoul.c>
 
-weak_alias (strtouq, strotull)
+weak_alias (strtouq, strtoull)
diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in
index 15637fae76..7d87ef5207 100644
--- a/sysdeps/unix/sysv/linux/configure.in
+++ b/sysdeps/unix/sysv/linux/configure.in
@@ -9,18 +9,23 @@ test $stdio = default && stdio=libio
 # existing system library, because we are the only system library.
 inhibit_glue=yes
 
-AC_CACHE_CHECK(installed Linux kernel header files, libc_cv_linux201, [dnl
+define([LIBC_LINUX_VERSION],[2.0.3])dnl
+define([libc_cv_linuxVER], [libc_cv_linux]patsubst(LIBC_LINUX_VERSION,[\.]))dnl
+AC_CACHE_CHECK(installed Linux kernel header files, libc_cv_linuxVER, [dnl
 AC_TRY_COMPILE([#include <linux/version.h>],
-[#if LINUX_VERSION_CODE < (2 *65536+ 0 *256+ 1) /* 2.0.1 */
+[#if LINUX_VERSION_CODE < ]dnl
+patsubst(LIBC_LINUX_VERSION,[^\([^.]*\)\.\([^.]*\)\.\([^.]*\)$],dnl
+[ (\1 *65536+ \2 *256+ \3) /* \1.\2.\3 */])[
 eat flaming death
 #endif],
-	       libc_cv_linux201='2.0.1 or later',
-	       libc_cv_linux201='TOO OLD!')])
-if test "$libc_cv_linux201" != '2.0.1 or later'; then
-  AC_MSG_ERROR([GNU libc requires kernel header files from Linux 2.0.1
-or later to be installed before configuring.  The kernel header files
-are found usually in /usr/include/asm and /usr/include/linux; make sure
-these directories use files from Linux 2.0.1 or later.  This check uses
-<linux/version.h>, so make sure that file was built correctly when
-installing the kernel header files.])
+	       libc_cv_linuxVER='LIBC_LINUX_VERSION or later',
+	       libc_cv_linuxVER='TOO OLD!')])
+if test "$libc_cv_linuxVER" != 'LIBC_LINUX_VERSION or later'; then
+  AC_MSG_ERROR([GNU libc requires kernel header files from
+Linux LIBC_LINUX_VERSION or later to be installed before configuring.
+The kernel header files are found usually in /usr/include/asm and
+/usr/include/linux; make sure these directories use files from
+Linux LIBC_LINUX_VERSION or later.  This check uses <linux/version.h>, so
+make sure that file was built correctly when installing the kernel header
+files.])
 fi
diff --git a/time/localtime.c b/time/localtime.c
index 9dff89ce74..3800d8b5b0 100644
--- a/time/localtime.c
+++ b/time/localtime.c
@@ -40,13 +40,13 @@ __localtime_r (timer, tp)
   /* This lock is defined in tzset.c and locks all the data defined there
      and in tzfile.c; the internal functions do no locking themselves.
      This lock is only taken here and in `tzset'.  */
-  __libc_lock_define (extern, __tzset_lock);
   extern int __tzset_run, __use_tzfile;
   extern int __tz_compute __P ((time_t timer, struct tm *tp));
   extern int __tzfile_compute __P ((time_t timer,
 				    long int *leap_correct, int *leap_hit));
   long int leap_correction;
   int leap_extra_secs;
+  __libc_lock_define (extern, __tzset_lock);
 
   if (timer == NULL)
     {
diff --git a/time/tzset.c b/time/tzset.c
index a4fa8e358b..8323c7be6d 100644
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -490,9 +490,12 @@ DEFUN(__tz_compute, (timer, tm),
 __libc_lock_define (, __tzset_lock)
 
 /* Reinterpret the TZ environment variable and set `tzname'.  */
+#undef tzset
 
-weak_symbol (tzset)
 void
+#ifdef weak_function
+weak_function
+#endif
 tzset (void)
 {
   __libc_lock_lock (__tzset_lock);