X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fhost-os.m4;h=0b7efb61a69cabb791c08e9dc39895c3c2d1fd00;hb=d390fdd374ff2bd0918dcf486a4dfe20f1c1cdb3;hp=79799e65c6dd37dc5b6838a968da92393bcc004b;hpb=0eefce1392eae619948896a6b5854446d8254d3a;p=gnulib.git

diff --git a/m4/host-os.m4 b/m4/host-os.m4
index 79799e65c..0b7efb61a 100644
--- a/m4/host-os.m4
+++ b/m4/host-os.m4
@@ -1,12 +1,20 @@
-#serial 3
+#serial 6
+
+# 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.
 
 dnl From Paul Eggert.
 
 # Define HOST_OPERATING_SYSTEM to a name for the host operating system.
-AC_DEFUN([UTILS_HOST_OS],
+AC_DEFUN([gl_HOST_OS],
 [
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
   AC_CACHE_CHECK([host operating system],
-    utils_cv_host_operating_system,
+    gl_cv_host_operating_system,
 
     [[case $host_os in
 
@@ -30,9 +38,10 @@ AC_DEFUN([UTILS_HOST_OS],
        openbsd*)	os='OpenBSD';;
        nsk*)		os='NonStop Kernel';;
        nonstopux*)	os='NonStop-UX';;
+       netbsd*-gnu*)	os='GNU/NetBSD';; # NetBSD kernel+libc, GNU userland
        netbsd*)		os='NetBSD';;
-       knetbsd*-gnu*)	os='GNU/KNetBSD';;
-       kfreebsd*-gnu*)	os='GNU/KFreeBSD';;
+       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';;
@@ -66,8 +75,8 @@ AC_DEFUN([UTILS_HOST_OS],
        *)
 	 os=$host_os;;
      esac
-     utils_cv_host_operating_system=$os]])
+     gl_cv_host_operating_system=$os]])
   AC_DEFINE_UNQUOTED(HOST_OPERATING_SYSTEM,
-    "$utils_cv_host_operating_system",
+    "$gl_cv_host_operating_system",
     [The host operating system.])
 ])