* m4/macros/{check_checkmount_style.m4, check_mnttab_style.m4,

check_nfs_fh_dref.m4, check_nfs_prot_headers.m4,
check_nfs_sa_dref.m4, check_umount_style.m4, os_cflags.m4}: check
for "macosx" as valid OS string, so we compile properly on Darwin
systems.

diff --git a/ChangeLog b/ChangeLog
index 9e234dabed8fba8a00de551023459e63030cd504..48ca4243c9cfd7eb3e77437c5481f62208e6b36f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-05-11  Erez Zadok  <ezk@cs.sunysb.edu>
 
+       * m4/macros/{check_checkmount_style.m4, check_mnttab_style.m4,
+       check_nfs_fh_dref.m4, check_nfs_prot_headers.m4,
+       check_nfs_sa_dref.m4, check_umount_style.m4, os_cflags.m4}: check
+       for "macosx" as valid OS string, so we compile properly on Darwin
+       systems.
+
        *******************************************************************
        *** Released am-utils-6.1-rc3                                   ***
        *******************************************************************

diff --git a/NEWS b/NEWS
index e19347ba1e259c34954b1d693174eca715d8e45c..3c29b48fbedec727db7ecf95f3c0f177f2eb9e79 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+*** Notes specific to am-utils version 6.1-rc4
+
+- bugs fixed:
+       * check for "macosx" in M4 macros properly
+
 *** Notes specific to am-utils version 6.1-rc3
 
 Minor fix to configure.in.  Reran bootstrap to get a working configure

diff --git a/configure.in b/configure.in
index 2275bca400395c5163f359b1bb61cf34b444058d..89411f9c54c36881aeb2b8e3fd6c54a3733a314b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ dnl ######################################################################
 dnl INITIALIZATION
 dnl AC_INIT
 dnl new init style: PACKAGE, VERSION, BUG-REPORTING-ADDRESS
-AC_INIT([am-utils],[6.1-rc3],[am-utils@am-utils.org])
+AC_INIT([am-utils],[6.1-rc4],[am-utils@am-utils.org])
 AC_MSG_NOTICE(*** INITIALIZATION ***)
 AC_CONFIG_SRCDIR([amd/amd.c])
 AM_CONFIG_HEADER(config.h)
@@ -53,7 +53,7 @@ AH_BOTTOM([
 dnl
 dnl AC_CONFIG_AUX_DIR(m4)
 AC_PREREQ(2.52)
-AC_REVISION($Revision: 1.86 $)
+AC_REVISION($Revision: 1.87 $)
 AC_COPYRIGHT([Copyright (c) 1997-2005 Erez Zadok])
 dnl find out system type
 AC_MSG_NOTICE(*** SYSTEM TYPES ***)

diff --git a/m4/macros/check_checkmount_style.m4 b/m4/macros/check_checkmount_style.m4
index 2c86ae80e2358e5c6d37516d60bac3eb8e15169e..404a3ecc800cac703541b4d339f2668ea38e7979 100644 (file)
--- a/m4/macros/check_checkmount_style.m4
+++ b/m4/macros/check_checkmount_style.m4
@@ -9,7 +9,7 @@ ac_cv_style_checkmount,
 case "${host_os_name}" in
        svr4* | sysv4* | solaris2* | sunos5* )
                        ac_cv_style_checkmount=svr4 ;;
-       bsd44* | bsdi* | freebsd* | netbsd* | openbsd* | darwin* | rhapsody* )
+       bsd44* | bsdi* | freebsd* | netbsd* | openbsd* | darwin* | macosx* | rhapsody* )
                        ac_cv_style_checkmount=bsd44 ;;
        aix* )
                        ac_cv_style_checkmount=aix ;;

diff --git a/m4/macros/check_mnttab_style.m4 b/m4/macros/check_mnttab_style.m4
index 545791e96683349cc3f967d86b03771c8795ad13..00d6dd8ebee4d0efd9e6244f452ee29a1a3fccb5 100644 (file)
--- a/m4/macros/check_mnttab_style.m4
+++ b/m4/macros/check_mnttab_style.m4
@@ -9,7 +9,7 @@ ac_cv_style_mnttab,
 case "${host_os_name}" in
        aix* )
                        ac_cv_style_mnttab=aix ;;
-       bsd* | bsdi* | freebsd* | netbsd* | openbsd* | darwin* | rhapsody* )
+       bsd* | bsdi* | freebsd* | netbsd* | openbsd* | darwin* | macosx* | rhapsody* )
                        ac_cv_style_mnttab=bsd ;;
        isc3* )
                        ac_cv_style_mnttab=isc3 ;;

diff --git a/m4/macros/check_nfs_fh_dref.m4 b/m4/macros/check_nfs_fh_dref.m4
index 72613ddcc514305b5e3831bc90686ff686df08a2..6ef0ab4fbb66d92d0fd3fb1e5682d6299b74a1ec 100644 (file)
--- a/m4/macros/check_nfs_fh_dref.m4
+++ b/m4/macros/check_nfs_fh_dref.m4
@@ -19,7 +19,7 @@ case "${host_os}" in
                ac_cv_nfs_fh_dref_style=bsd44 ;;
        # all new BSDs changed the type of the
        # filehandle in nfs_args from nfsv2fh_t to u_char.
-       freebsd* | freebsdelf* | bsdi* | netbsd* | openbsd* | darwin* | rhapsody* )
+       freebsd* | freebsdelf* | bsdi* | netbsd* | openbsd* | darwin* | macosx* | rhapsody* )
                ac_cv_nfs_fh_dref_style=freebsd22 ;;
        aix[[1-3]]* | aix4.[[01]]* )
                ac_cv_nfs_fh_dref_style=aix3 ;;

diff --git a/m4/macros/check_nfs_prot_headers.m4 b/m4/macros/check_nfs_prot_headers.m4
index 1e47b9175655eb57e3f126f216e3f05133d7ddcc..36b2c39472998fb07aa0003c8dab1c1b1e4896b0 100644 (file)
--- a/m4/macros/check_nfs_prot_headers.m4
+++ b/m4/macros/check_nfs_prot_headers.m4
@@ -75,7 +75,7 @@ case "${host_os}" in
                        ac_cv_nfs_prot_headers=nextstep ;;
        ultrix* )
                        ac_cv_nfs_prot_headers=ultrix ;;
-       darwin* | rhapsody* )
+       darwin* | macosx* | rhapsody* )
                        ac_cv_nfs_prot_headers=darwin ;;
        * )
                        ac_cv_nfs_prot_headers=default ;;

diff --git a/m4/macros/check_nfs_sa_dref.m4 b/m4/macros/check_nfs_sa_dref.m4
index 0d506c816d5cc87e4d4f7d5a083db0803dd8931e..5fa1bea6d9b631cb2f533002850ab0c7631bde82 100644 (file)
--- a/m4/macros/check_nfs_sa_dref.m4
+++ b/m4/macros/check_nfs_sa_dref.m4
@@ -13,7 +13,7 @@ case "${host_os}" in
                ac_cv_nfs_sa_dref_style=svr4 ;;
        386bsd* | bsdi1* )
                ac_cv_nfs_sa_dref_style=386bsd ;;
-       bsd44* | bsdi* | freebsd* | netbsd* | openbsd* | darwin* | rhapsody* )
+       bsd44* | bsdi* | freebsd* | netbsd* | openbsd* | darwin* | macosx* | rhapsody* )
                ac_cv_nfs_sa_dref_style=bsd44 ;;
        linux* )
                ac_cv_nfs_sa_dref_style=linux ;;

diff --git a/m4/macros/check_umount_style.m4 b/m4/macros/check_umount_style.m4
index 9b110426596d71c3a14297a54c3b486d8614487e..2df0b0a2122a82eee29567f338288aced21dedb4 100644 (file)
--- a/m4/macros/check_umount_style.m4
+++ b/m4/macros/check_umount_style.m4
@@ -9,7 +9,7 @@ ac_cv_style_umount,
 case "${host_os_name}" in
        linux* )
                        ac_cv_style_umount=linux ;;
-       bsd44* | bsdi* | freebsd* | netbsd* | openbsd* | darwin* | rhapsody* )
+       bsd44* | bsdi* | freebsd* | netbsd* | openbsd* | darwin* | macosx* | rhapsody* )
                        ac_cv_style_umount=bsd44 ;;
        osf* )
                        ac_cv_style_umount=osf ;;

diff --git a/m4/macros/os_cflags.m4 b/m4/macros/os_cflags.m4
index 7e4b0b8829876e60bee1ee900c7581670f0c3dfd..132ad15300271b5cc35456c6418cb13efd32885d 100644 (file)
--- a/m4/macros/os_cflags.m4
+++ b/m4/macros/os_cflags.m4
@@ -76,7 +76,7 @@ case "${host_os}" in
                                ;;
                esac
                ;;
-       darwin* | rhapsody* )
+       darwin* | macosx* | rhapsody* )
                ac_cv_os_cflags="-D_P1003_1B_VISIBLE"
                ;;
        * )