* m4/macros/host_macros.m4: if a NetBSD system, remove 'elf' part

from OS name because it's no longer relevant.  Also, don't include
the major OS version number in the OS name because that's also
unnecessary (and users can always use $osver in maps).

diff --git a/ChangeLog b/ChangeLog
index e84af22cfdebe9567ed9a6b292ca5714b1c64d35..135e626066e352a0e4bd6ce9b08da31d3c659046 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-05-16  Erez Zadok  <ezk@cs.sunysb.edu>
 
+       * m4/macros/host_macros.m4: if a NetBSD system, remove 'elf' part
+       from OS name because it's no longer relevant.  Also, don't include
+       the major OS version number in the OS name because that's also
+       unnecessary (and users can always use $osver in maps).
+
        * amd/nfs_subr.c: use [1] for out-of-band pointer at the end of
        struct am_fh, because it's the most portable method.  Bug fix
        suggestion from Dan Riley <dsr at mail.lns.cornell.edu>.  Better

diff --git a/NEWS b/NEWS
index 1f422f1cd589683cbc462ebacfdb78ec61d3fcbd..29ac67f492e34df3aae0fe9ae1336dd6f8346d74 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 *** Notes specific to am-utils version 6.1-rc4
 
+For NetBSD systems, $os used to say "netbsdelf1" or "netbsdelf2."  Now it
+just says "netbsd."
+
 - bugs fixed:
        * check for "macosx" in M4 macros properly
        * minor memory leaks (thanks to Valgrind)

diff --git a/m4/macros/host_macros.m4 b/m4/macros/host_macros.m4
index 957084217324dc77b25732164fc4242dec5b9527..faa7434c7a95e734721aa5ba515f8056bafdfb45 100644 (file)
--- a/m4/macros/host_macros.m4
+++ b/m4/macros/host_macros.m4
@@ -29,6 +29,8 @@ AC_DEFUN([AMU_HOST_MACROS],
   case ${host_os} in
        # linux is linux is linux, regardless of RMS.
        linux-gnu* | lignux* )  host_os=linux ;;
+       # NetBSD systems today are elf, so no need to distinguish
+       netbsdelf* ) host_os=`echo ${host_os} | sed 's/^netbsdelf/netbsd/'`;;
   esac
   AC_DEFINE_UNQUOTED(HOST_OS, "$host_os")
   AC_MSG_RESULT($host_os)
@@ -40,6 +42,8 @@ AC_DEFUN([AMU_HOST_MACROS],
   case ${host_os_name} in
        # linux is linux is linux, regardless of RMS.
        linux-gnu* | lignux* )  host_os_name=linux ;;
+       # all NetBSD systems today should just show up as "netbsd"
+       netbsd* ) host_os_name=netbsd;;
   esac
   AC_DEFINE_UNQUOTED(HOST_OS_NAME, "$host_os_name")
   AC_MSG_RESULT($host_os_name)