* include/am_defs.h: include <sys/statvfs.h> if it exists.

* conf/nfs_prot/nfs_prot_netbsd1_4.h: NetBSD 3 has both statfs()
and statvfs(), but the latter is preferred, so #define to use
statvfs.

* configure.in: check for statfs(), statvfs(), and
<sys/statvfs.h>.

* config.guess.long: strip trailing '.' on "netbsdelf3.0."
(Beta).  Workaround for bug in config.guess.

* config.{guess,sub}: update to latest versions.

diff --git a/.cvsignore b/.cvsignore
index f9cd1c7ed222899cb30495cc7685ada92605cdc4..9aa5dcdab9074a8e7bed6387f62da655b831c4ba 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -159,3 +159,4 @@ A.i386-pc-linux-suse9.3
 A.i386-pc-linuxoldld-deb3.1
 A.i386-pc-linux-deb3.1
 A.powerpc-apple-darwin8.2.0
+A.i386-unknown-netbsdelf3.0

diff --git a/ChangeLog b/ChangeLog
index 6d86382a8fb10cb8465f2a43b6d465384129d09e..f4bcea5906082391618ae3cc56c921cb8393ba0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2005-10-01  Erez Zadok  <ezk@cs.sunysb.edu>
+
+       * include/am_defs.h: include <sys/statvfs.h> if it exists.
+
+       * conf/nfs_prot/nfs_prot_netbsd1_4.h: NetBSD 3 has both statfs()
+       and statvfs(), but the latter is preferred, so #define to use
+       statvfs.
+
+       * configure.in: check for statfs(), statvfs(), and
+       <sys/statvfs.h>.
+
+       * config.guess.long: strip trailing '.' on "netbsdelf3.0."
+       (Beta).  Workaround for bug in config.guess.
+
+       * config.{guess,sub}: update to latest versions.
+
 2005-09-29  Erez Zadok  <ezk@cs.sunysb.edu>
 
        * amq/pawd.c (find_mt): if the auto mount type is used, pawd could

diff --git a/INSTALL b/INSTALL
index 3323920131e07c1847f8aa1451b7e5d40d2e24d4..78f6b497017e726f82bec579b687057c4a2c0d49 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -49,6 +49,7 @@ i386-unknown-netbsdelf1.6.1   ezk     ezk     ezk     ezk     -
 i386-unknown-netbsdelf1.6.2    ezk     ezk     ezk     ezk     -
 i386-unknown-netbsdelf2.0      ezk     ezk     ezk     ezk     -
 i386-unknown-netbsdelf2.0.2    ezk     ezk     ezk     ezk     -
+i386-unknown-netbsdelf3.0      ezk     ezk     ezk     ezk     -
 i386-unknown-openbsd3.3                ezk     ezk     ezk     ezk     -
 i386-unknown-openbsd3.6                ezk     ezk     ezk     ezk     -
 i386-unknown-openbsd3.7                ezk     ezk     ezk     ezk     -

diff --git a/NEWS b/NEWS
index 0030fe2c296540685575ff07b02e1a90f18eca64..3cd959226474ff9860809246f610ddfe54d646f7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,7 @@ Amd.
 
 - minor new ports:
        i386-pc-linux-deb3.1
+       i386-unknown-netbsdelf3.0 (BETA)
        powerpc-apple-darwin8.2.0
 
 XXX: Dan, document sun_map_syntax flag in more detail in am-utils.texi and

diff --git a/conf/nfs_prot/nfs_prot_netbsd1_4.h b/conf/nfs_prot/nfs_prot_netbsd1_4.h
index 3d1650f590ca888e3337559b11a8e47822c6bca0..4c3659b295caed5bfa46f7dcc5c563c9a8e63b95 100644 (file)
--- a/conf/nfs_prot/nfs_prot_netbsd1_4.h
+++ b/conf/nfs_prot/nfs_prot_netbsd1_4.h
@@ -79,6 +79,9 @@ typedef int (*ypall_callback_fxn_t)(u_long, char *, int, char *, int, void *);
 typedef int (*ypall_callback_fxn_t)(int, char *, int, char *, int, char *);
 #endif /* DEFINED_YPALL_CALLBACK_FXN_T */
 
+#ifdef HAVE_STATVFS
+# define statfs statvfs
+#endif /* HAVE_STATVFS */
 
 /*
  * MACROS:

diff --git a/config.guess.long b/config.guess.long
index 481cd340d7b48d0969ac44353d26efb9fb738284..e6468df9cc313f0edb8910e6c909a04436c3a2ea 100755 (executable)
--- a/config.guess.long
+++ b/config.guess.long
@@ -62,8 +62,12 @@ case "${GCONFIG}" in
        else
            echo ${GCONFIG}
        fi
-    ;;
-    * ) echo ${GCONFIG}
-    ;;
+       ;;
+    *netbsdelf3* )             # remove trailing '.' from beta
+       echo ${GCONFIG} | sed 's/\.$//g'
+       ;;
+    * )
+       echo ${GCONFIG}
+       ;;
 esac
 exit 0

diff --git a/configure.in b/configure.in
index 5536b77f46d074913406f239e64a7c6f92aa404c..5becebfc4b7654f8000683c83760c83716343690 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -55,7 +55,7 @@ AH_BOTTOM([
 dnl
 dnl AC_CONFIG_AUX_DIR(m4)
 AC_PREREQ(2.52)
-AC_REVISION($Revision: 1.116 $)
+AC_REVISION($Revision: 1.117 $)
 AC_COPYRIGHT([Copyright (c) 1997-2005 Erez Zadok])
 dnl find out system type
 AC_MSG_NOTICE(*** SYSTEM TYPES ***)
@@ -318,6 +318,8 @@ AC_CHECK_FUNCS(                     \
        signal                  \
        sigsuspend              \
        socket                  \
+       statfs                  \
+       statvfs                 \
        strcasecmp              \
        strchr                  \
        strcspn                 \
@@ -515,6 +517,7 @@ AC_CHECK_HEADERS(                   \
        sys/sockio.h                    \
        sys/stat.h                      \
        sys/statfs.h                    \
+       sys/statvfs.h                   \
        sys/syscall.h                   \
        sys/syslimits.h                 \
        sys/syslog.h                    \

diff --git a/include/am_defs.h b/include/am_defs.h
index 27dbf10dd3ddd6bdda87ea318dac5f1eb47d0f85..7954e8376b2c67c69ce9f07661ac184f008f25b1 100644 (file)
--- a/include/am_defs.h
+++ b/include/am_defs.h
@@ -1220,6 +1220,13 @@ extern char *nc_sperror(void);
 # include <sys/statfs.h>
 #endif /* HAVE_SYS_STATFS_H */
 
+/*
+ * Actions to take if <sys/statvfs.h> exists.
+ */
+#ifdef HAVE_SYS_STATVFS_H
+# include <sys/statvfs.h>
+#endif /* HAVE_SYS_STATVFS_H */
+
 /*
  * Actions to take if <sys/vfs.h> exists.
  */