* minor new ports: i386-pc-linux-gentoo1.4.16 and

powerpc-unknown-linux-yellowdog2.3.

* include/{mount_headers2.h, am_defs.h}: safer setup before
inclusion of <linux/nfs_mount.h>, which is broken on several
systems.

* configure.in: test for <linux/nfs2.h>.  Separate special test
for <linux/nfs_mount.h> because we need to define __KERNEL__ for
that test, as well as optionally define struct nfs2_fh for some
systems (gentoo with 2.4 kernel, yellowdog 2.3, and others).

* config.guess.long: support Gentoo and Yellow Dog Linux distros.

* minor new ports: i386-pc-linux-suse9.2 and
i386-unknown-freebsd5.4.

diff --git a/.cvsignore b/.cvsignore
index 659c9797f7c8b31f23cb54b4a9d9df3773184548..e9cc922b2d24e80c1f773589316edd9693e818f8 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -143,3 +143,7 @@ A.sparc-sun-solaris2.10
 A.powerpc64-unknown-linux-rhel4
 A.powerpc64-unknown-linux-sles9
 A.powerpc-apple-darwin7.9.0
+A.i386-pc-linux-suse9.2
+A.i386-unknown-freebsd5.4
+A.i386-pc-linux-gentoo1.4.16
+A.powerpc-unknown-linux-yellowdog2.3

diff --git a/ChangeLog b/ChangeLog
index 2847eed91dd3d8190097da4db1bb7734434cef56..ca93da8b85856fd750c00087a0d2b496fd62ed22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
+2005-05-20  Erez Zadok  <ezk@cs.sunysb.edu>
+
+       * minor new ports: i386-pc-linux-gentoo1.4.16 and
+       powerpc-unknown-linux-yellowdog2.3.
+
+       * include/{mount_headers2.h, am_defs.h}: safer setup before
+       inclusion of <linux/nfs_mount.h>, which is broken on several
+       systems.
+
+       * configure.in: test for <linux/nfs2.h>.  Separate special test
+       for <linux/nfs_mount.h> because we need to define __KERNEL__ for
+       that test, as well as optionally define struct nfs2_fh for some
+       systems (gentoo with 2.4 kernel, yellowdog 2.3, and others).
+
+       * config.guess.long: support Gentoo and Yellow Dog Linux distros.
+
 2005-05-18  Erez Zadok  <ezk@cs.sunysb.edu>
 
+       * minor new ports: i386-pc-linux-suse9.2 and
+       i386-unknown-freebsd5.4.
+
        * amd/nfs_subr.c: use NFS_FHSIZE, not FHSIZE.
 
 2005-05-17  Erez Zadok  <ezk@cs.sunysb.edu>

diff --git a/NEWS b/NEWS
index 0f2a7c44c532889e86bb618aff07620e5f168246..1ec790249a082b54e373a51e9a4fff333da6969f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 *** Notes specific to am-utils version 6.1-rc6
 
+- minor new ports:
+       i386-pc-linux-gentoo1.4.16
+       i386-pc-linux-suse9.2
+       i386-unknown-freebsd5.4
+       powerpc-unknown-linux-yellowdog2.3
+
 - bugs fixed:
        * minor compile error of nfs_subr.c on some systems.
 

diff --git a/config.guess.long b/config.guess.long
index 7889e48e513736b27d97373955cf895ebe7ca884..481cd340d7b48d0969ac44353d26efb9fb738284 100755 (executable)
--- a/config.guess.long
+++ b/config.guess.long
@@ -51,6 +51,14 @@ case "${GCONFIG}" in
            long=`getver /etc/debian_version`
            echo ${GCONFIG}-deb${long}
            exit 0
+       elif test -f /etc/gentoo-release ; then
+           long=`getver /etc/gentoo-release`
+           echo ${GCONFIG}-gentoo${long}
+           exit 0
+       elif test -f /etc/yellowdog-release ; then
+           long=`getver /etc/yellowdog-release`
+           echo ${GCONFIG}-yellowdog${long}
+           exit 0
        else
            echo ${GCONFIG}
        fi

diff --git a/configure.in b/configure.in
index 0efed32c3da5cee3d26985caba020172a0b32790..d2646e4698bccdccaa8efa19120531a0fe924b5e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,13 @@ dnl ######################################################################
 dnl INITIALIZATION
 dnl AC_INIT
 dnl new init style: PACKAGE, VERSION, BUG-REPORTING-ADDRESS
+dnl     UPDATE LIBAMU VERSION BEFORE OFFICIAL RELEASE!!!
+dnl   UPDATE LIBAMU VERSION BEFORE OFFICIAL RELEASE!!!
+dnl UPDATE LIBAMU VERSION BEFORE OFFICIAL RELEASE!!!
 AC_INIT([am-utils],[6.1-rc6],[am-utils@am-utils.org])
+dnl UPDATE LIBAMU VERSION BEFORE OFFICIAL RELEASE!!!
+dnl   UPDATE LIBAMU VERSION BEFORE OFFICIAL RELEASE!!!
+dnl     UPDATE LIBAMU VERSION BEFORE OFFICIAL RELEASE!!!
 AC_MSG_NOTICE(*** INITIALIZATION ***)
 AC_CONFIG_SRCDIR([amd/amd.c])
 AM_CONFIG_HEADER(config.h)
@@ -53,7 +59,7 @@ AH_BOTTOM([
 dnl
 dnl AC_CONFIG_AUX_DIR(m4)
 AC_PREREQ(2.52)
-AC_REVISION($Revision: 1.89 $)
+AC_REVISION($Revision: 1.90 $)
 AC_COPYRIGHT([Copyright (c) 1997-2005 Erez Zadok])
 dnl find out system type
 AC_MSG_NOTICE(*** SYSTEM TYPES ***)
@@ -421,6 +427,7 @@ AC_CHECK_HEADERS(                   \
        linux/kdev_t.h                  \
        linux/list.h                    \
        linux/nfs.h                     \
+       linux/nfs2.h                    \
        linux/posix_types.h             \
        machine/endian.h                \
        msdosfs/msdosfsmount.h          \
@@ -563,6 +570,23 @@ AC_CHECK_HEADERS([                 \
        linux/auto_fs.h                 \
        linux/auto_fs4.h                \
        linux/loop.h                    \
+], [], [],
+[
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif /* HAVE_SYS_SOCKET_H */
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif /* HAVE_LIMITS_H */
+#ifdef HAVE_LINUX_POSIX_TYPES_H
+# include <linux/posix_types.h>
+#endif /* HAVE_LINUX_POSIX_TYPES_H */
+/* next dev_t lines needed due to changes in kernel code */
+#undef dev_t
+#define dev_t unsigned short   /* compatible with Red Hat and SuSE */
+])
+dnl even more special checks for Linux nfs headers
+AC_CHECK_HEADERS([                     \
        linux/nfs_mount.h               \
 ], [], [],
 [
@@ -575,9 +599,19 @@ AC_CHECK_HEADERS([                 \
 #ifdef HAVE_LINUX_POSIX_TYPES_H
 # include <linux/posix_types.h>
 #endif /* HAVE_LINUX_POSIX_TYPES_H */
+#ifdef HAVE_LINUX_NFS2_H
+struct nfs2_fh {
+  char data[FHSIZE];
+};
+# define _LINUX_NFS2_H
+#endif /* HAVE_LINUX_NFS2_H */
 /* next dev_t lines needed due to changes in kernel code */
 #undef dev_t
 #define dev_t unsigned short   /* compatible with Red Hat and SuSE */
+/* needed to find nfs2_fh and nfs_fh on older systems (yellowdog2.3, gentoo, etc.) */
+# ifndef __KERNEL__
+#  define __KERNEL__
+# endif /* __KERNEL__ */
 ])
 
 dnl ======================================================================

diff --git a/include/am_defs.h b/include/am_defs.h
index 50bbea54cb72ba520df479df991d871e9b14adf9..3ec7ae7d43d5c2e7395ca943c545d16e719fafaf 100644 (file)
--- a/include/am_defs.h
+++ b/include/am_defs.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: am_defs.h,v 1.56 2005/04/17 03:05:54 ezk Exp $
+ * $Id: am_defs.h,v 1.57 2005/05/20 14:34:26 ezk Exp $
  *
  */
 
@@ -755,13 +755,29 @@ struct ypall_callback;
 #ifdef HAVE_SYS_FS_NFS_CLNT_H
 # include <sys/fs/nfs_clnt.h>
 #endif /* HAVE_SYS_FS_NFS_CLNT_H */
+
+/* complex rules for linux/nfs_mount.h: broken on so many systems */
 #ifdef HAVE_LINUX_NFS_MOUNT_H
-# define _LINUX_NFS_H
-# define _LINUX_NFS2_H
-# define _LINUX_NFS3_H
-# define _LINUX_NFS_FS_H
-# define _LINUX_IN_H
+# ifndef _LINUX_NFS_H
+#  define _LINUX_NFS_H
+# endif /* not _LINUX_NFS_H */
+# ifndef _LINUX_NFS2_H
+#  define _LINUX_NFS2_H
+# endif /* not _LINUX_NFS2_H */
+# ifndef _LINUX_NFS3_H
+#  define _LINUX_NFS3_H
+# endif /* not _LINUX_NFS3_H */
+# ifndef _LINUX_NFS_FS_H
+#  define _LINUX_NFS_FS_H
+# endif /* not _LINUX_NFS_FS_H */
+# ifndef _LINUX_IN_H
+#  define _LINUX_IN_H
+# endif /* not _LINUX_IN_H */
+# ifndef __KERNEL__
+#  define __KERNEL__
+# endif /* __KERNEL__ */
 # include <linux/nfs_mount.h>
+# undef __KERNEL__
 #endif /* HAVE_LINUX_NFS_MOUNT_H */
 
 /*

diff --git a/include/mount_headers2.h b/include/mount_headers2.h
index bd9f567420b13a6e21b9809e36ce71dd4f3beba6..f06e272511335ec3860d866266ae5817809c35b6 100644 (file)
--- a/include/mount_headers2.h
+++ b/include/mount_headers2.h
@@ -19,11 +19,24 @@
 # include <sys/fs/nfs_clnt.h>
 #endif /* HAVE_SYS_FS_NFS_CLNT_H */
 
-#ifdef HAVE_LINUX_NFS_MOUNT_H
-# define _LINUX_NFS_H
-# define _LINUX_NFS2_H
-# define _LINUX_NFS3_H
-# define _LINUX_NFS_FS_H
-# define _LINUX_IN_H
+# ifndef _LINUX_NFS_H
+#  define _LINUX_NFS_H
+# endif /* not _LINUX_NFS_H */
+# ifndef _LINUX_NFS2_H
+#  define _LINUX_NFS2_H
+# endif /* not _LINUX_NFS2_H */
+# ifndef _LINUX_NFS3_H
+#  define _LINUX_NFS3_H
+# endif /* not _LINUX_NFS3_H */
+# ifndef _LINUX_NFS_FS_H
+#  define _LINUX_NFS_FS_H
+# endif /* not _LINUX_NFS_FS_H */
+# ifndef _LINUX_IN_H
+#  define _LINUX_IN_H
+# endif /* not _LINUX_IN_H */
+# ifndef __KERNEL__
+#  define __KERNEL__
+# endif /* __KERNEL__ */
 # include <linux/nfs_mount.h>
+# undef __KERNEL__
 #endif /* HAVE_LINUX_NFS_MOUNT_H */