getlogin_r.m4 and host_os.m4 (was: megatest fallout)

[Ralf Wildenhues]

> (b) comparing (1) and (2):
> getlogin_r declared in the glob test, but not in the getlogin_r test.

> (c) HOST_OPERATING_SYSTEM is set to empty in (2).

OK to apply?

Cheers,
Ralf

        * getlogin_r.m4 (gl_PREREQ_GETLOGIN_R): Require AC_GNU_SOURCE.
        * host-os.m4 (gl_HOST_OS): Require AC_CANONICAL_HOST.

Index: m4/getlogin_r.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/getlogin_r.m4,v
retrieving revision 1.4
diff -u -r1.4 getlogin_r.m4
--- m4/getlogin_r.m4    22 Aug 2006 17:15:28 -0000      1.4
+++ m4/getlogin_r.m4    25 Sep 2006 19:58:06 -0000
@@ -1,4 +1,4 @@
-#serial 3
+#serial 4
 
 # Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 #
@@ -27,6 +27,7 @@
 
 AC_DEFUN([gl_PREREQ_GETLOGIN_R],
 [
+  AC_REQUIRE([AC_GNU_SOURCE])
   AC_CHECK_HEADERS_ONCE([unistd.h])
   AC_CHECK_DECLS_ONCE([getlogin])
   AC_CHECK_DECLS_ONCE([getlogin_r])
Index: m4/host-os.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/host-os.m4,v
retrieving revision 1.8
diff -u -r1.8 host-os.m4
--- m4/host-os.m4       23 Jan 2005 08:06:57 -0000      1.8
+++ m4/host-os.m4       25 Sep 2006 19:58:06 -0000
@@ -1,6 +1,6 @@
-#serial 5
+#serial 6
 
-# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,6 +12,7 @@
 # Define HOST_OPERATING_SYSTEM to a name for the host operating system.
 AC_DEFUN([gl_HOST_OS],
 [
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
   AC_CACHE_CHECK([host operating system],
     gl_cv_host_operating_system,