From: Erez Zadok Date: Fri, 20 May 2005 14:34:26 +0000 (+0000) Subject: * minor new ports: i386-pc-linux-gentoo1.4.16 and X-Git-Tag: am-utils-6_1_rc6~7 X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=548ca5b5cbc025f7fcb7f3ce7eb9a5b961dfba24;p=am-utils-6.0.git * 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 , which is broken on several systems. * configure.in: test for . Separate special test for 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 659c979..e9cc922 100644 --- 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 2847eed..ca93da8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,24 @@ +2005-05-20 Erez Zadok + + * 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 , which is broken on several + systems. + + * configure.in: test for . Separate special test + for 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 + * 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 diff --git a/NEWS b/NEWS index 0f2a7c4..1ec7902 100644 --- 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 7889e48..481cd34 100755 --- 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 0efed32..d2646e4 100644 --- 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 +#endif /* HAVE_SYS_SOCKET_H */ +#ifdef HAVE_LIMITS_H +# include +#endif /* HAVE_LIMITS_H */ +#ifdef HAVE_LINUX_POSIX_TYPES_H +# include +#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 #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 50bbea5..3ec7ae7 100644 --- 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 #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 +# undef __KERNEL__ #endif /* HAVE_LINUX_NFS_MOUNT_H */ /* diff --git a/include/mount_headers2.h b/include/mount_headers2.h index bd9f567..f06e272 100644 --- a/include/mount_headers2.h +++ b/include/mount_headers2.h @@ -19,11 +19,24 @@ # include #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 +# undef __KERNEL__ #endif /* HAVE_LINUX_NFS_MOUNT_H */