*******************************************************************

*** Released am-utils-6.1-rc7					***
*******************************************************************

* m4/macros/os_cflags.m4 (CFLAGS): use custom-OS C flags for
configuring, not just for building.  That way the two phases
(configure and compile) are in sync.  This fixes getwire() on
OSF/1 systems.

* conf/nfs_prot/nfs_prot_sunos5_8.h: define INADDR_NONE if not
defined in system headers.

diff --git a/ChangeLog b/ChangeLog
index 893de5b1472d1855cfb47cd94dd0f5710f90d581..960c4af4658723bb5840e277bc14fbf4315010da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-06-03  Erez Zadok  <ezk@cs.sunysb.edu>
+
+       *******************************************************************
+       *** Released am-utils-6.1-rc7                                   ***
+       *******************************************************************
+
+       * m4/macros/os_cflags.m4 (CFLAGS): use custom-OS C flags for
+       configuring, not just for building.  That way the two phases
+       (configure and compile) are in sync.  This fixes getwire() on
+       OSF/1 systems.
+
+       * conf/nfs_prot/nfs_prot_sunos5_8.h: define INADDR_NONE if not
+       defined in system headers.
+
 2005-06-01  Erez Zadok  <ezk@cs.sunysb.edu>
 
        * libamu/Makefile.am (EXTRA_DIST): remove alloca.c as it's no

diff --git a/NEWS b/NEWS
index b3e4a13b881dec8e0117447699fa2d17d9349d39..8406e192e7eb831f6f8ce1c5e65bb0552d2ce845 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,9 @@ Assorted minor code cleanups.
        mips-unknown-linux-gentoo1.4.16
        sparc64-unknown-linux-gentoo1.4.16
 
+- bugs fixed:
+       * getwire() detects networks correctly on OSF/1
+
 *** Notes specific to am-utils version 6.1-rc6
 
 - minor new ports:

diff --git a/conf/nfs_prot/nfs_prot_sunos5_8.h b/conf/nfs_prot/nfs_prot_sunos5_8.h
index f9afabd8608cc58d3bdad54c4f067e9883b0a297..2b46c604a7c841b50d07fbaa804a44a94d0326d5 100644 (file)
--- a/conf/nfs_prot/nfs_prot_sunos5_8.h
+++ b/conf/nfs_prot/nfs_prot_sunos5_8.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: nfs_prot_sunos5_8.h,v 1.10 2005/01/03 20:56:45 ezk Exp $
+ * $Id: nfs_prot_sunos5_8.h,v 1.11 2005/06/03 14:46:36 ezk Exp $
  *
  */
 
@@ -104,6 +104,9 @@
 
 #define AUTOFS_CONFTYPE "ticotsord"
 
+#ifndef INADDR_NONE
+# define INADDR_NONE ((unsigned long) -1)
+#endif /* INADDR_NONE */
 
 /*
  * TYPEDEFS:

diff --git a/m4/macros/os_cflags.m4 b/m4/macros/os_cflags.m4
index 00a03aa301ccb5d704a41921085eec65b4469557..d2faf8e62c282349e7da306084b0a5a7dc459aa6 100644 (file)
--- a/m4/macros/os_cflags.m4
+++ b/m4/macros/os_cflags.m4
@@ -89,5 +89,8 @@ case "${host_os}" in
 esac
 ])
 AMU_CFLAGS="$AMU_CFLAGS $ac_cv_os_cflags"
+# use same flags for configuring, so it matches what we do at compile time
+CFLAGS="$CFLAGS $ac_cv_os_cflags"
+export CFLAGS
 ])
 dnl ======================================================================