From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Sat, 1 Oct 2005 05:26:55 +0000 (+0000)
Subject: * include/am_defs.h: include <sys/statvfs.h> if it exists.
X-Git-Tag: before-xstr~3
X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=f1dfb3a985b27c8e9c400b07b5a7c779acb689c8;p=am-utils-6.0.git

* 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 f9cd1c7..9aa5dcd 100644
--- 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 6d86382..f4bcea5 100644
--- 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 3323920..78f6b49 100644
--- 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 0030fe2..3cd9592 100644
--- 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 3d1650f..4c3659b 100644
--- 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 481cd34..e6468df 100755
--- 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 5536b77..5becebf 100644
--- 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 27dbf10..7954e83 100644
--- 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.
  */