X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fhost-os.m4;h=0b7efb61a69cabb791c08e9dc39895c3c2d1fd00;hb=ef66119f6b4d0211693d944c495d1e15c9331667;hp=0a96a852be3ac8bff1e8d8397649bc98a99d6dff;hpb=2183c2199b61a0738ff5712257ad503223669fe2;p=gnulib.git

diff --git a/m4/host-os.m4 b/m4/host-os.m4
index 0a96a852b..0b7efb61a 100644
--- a/m4/host-os.m4
+++ b/m4/host-os.m4
@@ -1,20 +1,9 @@
-#serial 4
+#serial 6
 
-# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+# 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.
 
 # Written by Paul Eggert.
 
@@ -23,6 +12,7 @@ dnl From Paul Eggert.
 # 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,
 
@@ -50,8 +40,8 @@ AC_DEFUN([gl_HOST_OS],
        nonstopux*)	os='NonStop-UX';;
        netbsd*-gnu*)	os='GNU/NetBSD';; # NetBSD kernel+libc, GNU userland
        netbsd*)		os='NetBSD';;
-       knetbsd*-gnu)	os='GNU/KNetBSD';; # NetBSD kernel, GNU libc+userland
-       kfreebsd*-gnu)	os='GNU/KFreeBSD';; # FreeBSD kernel, GNU libc+userland
+       knetbsd*-gnu)	os='GNU/kNetBSD';; # NetBSD kernel, GNU libc+userland
+       kfreebsd*-gnu)	os='GNU/kFreeBSD';; # FreeBSD kernel, GNU libc+userland
        msdosdjgpp*)	os='DJGPP';;
        mpeix*)		os='MPE/iX';;
        mint*)		os='MiNT';;