Fix recognition of sys/sysctl.h on OpenBSD 4.0.

[gnulib.git] / m4 / host-os.m4

diff --git a/m4/host-os.m4 b/m4/host-os.m4
index f520e38..375210b 100644 (file)
--- a/m4/host-os.m4
+++ b/m4/host-os.m4
@@ -1,12 +1,20 @@
-#serial 3
+# serial 7
+
+# Copyright (C) 2001, 2003, 2004, 2006, 2009 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,10 +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*-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';;
@@ -67,8 +75,8 @@ AC_DEFUN([UTILS_HOST_OS],
        *)
         os=$host_os;;
      esac
-     utils_cv_host_operating_system=$os]])
-  AC_DEFINE_UNQUOTED(HOST_OPERATING_SYSTEM,
-    "$utils_cv_host_operating_system",
+     gl_cv_host_operating_system=$os]])
+  AC_DEFINE_UNQUOTED([HOST_OPERATING_SYSTEM],
+    "$gl_cv_host_operating_system",
     [The host operating system.])
 ])