* include/am_defs.h : Merged a diff from 6.1 branch that addresses a

problem with GROUP_OBJ on Solaris 10:

Solaris 10 (build 72) defines GROUP_OBJ in <sys/acl.h>, which is included
in many other header files.  <rpcsvc/nis.h> uses GROUP_OBJ inside enum
zotypes.  So if you're unlucky enough to include both headers, you get a
compile error because the two symbols conflict.

* m4/macros/check_nfs_prot_headers.m4 : Fix to allow Solaris 10 to pick
up the right nfs header files.

diff --git a/ChangeLog b/ChangeLog
index de55379a5eef761c235cf8144a255e37f86e9e43..92d141d5c0261bcf22ef5d676cc656172e113e59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-03-09  Daniel P. Ottavio  <dottavio@ic.sunysb.edu>
+
+       * include/am_defs.h : Merged a diff from 6.1 branch that addresses a
+       problem with GROUP_OBJ on Solaris 10:
+       
+       Solaris 10 (build 72) defines GROUP_OBJ in <sys/acl.h>, which is included 
+       in many other header files.  <rpcsvc/nis.h> uses GROUP_OBJ inside enum 
+       zotypes.  So if you're unlucky enough to include both headers, you get a 
+       compile error because the two symbols conflict.
+
+       * m4/macros/check_nfs_prot_headers.m4 : Fix to allow Solaris 10 to pick
+       up the right nfs header files.
+       
 2005-03-02  Daniel P. Ottavio  <dottavio@ic.sunysb.edu>
 
        * AUTHORS: add Dan Ottavio.

diff --git a/include/am_defs.h b/include/am_defs.h
index 936ca9c65ee742723c48f21d976246e84988ab3f..a78c60aa34abcf24d300c842096f8b5813aa1e58 100644 (file)
--- a/include/am_defs.h
+++ b/include/am_defs.h
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: am_defs.h,v 1.15.2.19 2005/01/16 23:56:32 ezk Exp $
+ * $Id: am_defs.h,v 1.15.2.20 2005/03/11 18:48:21 ottavio Exp $
  *
  */
 
@@ -931,6 +931,18 @@ struct sockaddr_dl;
  * Actions to take if <rpcsvc/nis.h> exists.
  */
 #ifdef HAVE_RPCSVC_NIS_H
+/*
+ * Solaris 10 (build 72) defines GROUP_OBJ in <sys/acl.h>, which is included
+ * in many other header files.  <rpcsvc/nis.h> uses GROUP_OBJ inside enum
+ * zotypes.  So if you're unlucky enough to include both headers, you get a
+ * compile error because the two symbols conflict.
+ *
+ * Temp hack: undefine acl.h's GROUP_OBJ because it's not needed for
+ * am-utils.
+ */
+# ifdef GROUP_OBJ
+#  undef GROUP_OBJ
+# endif /* GROUP_OBJ */
 # include <rpcsvc/nis.h>
 #endif /* HAVE_RPCSVC_NIS_H */
 

diff --git a/m4/macros/check_nfs_prot_headers.m4 b/m4/macros/check_nfs_prot_headers.m4
index 41d25b02fb81da8556b6be046026fe55d108f5d8..c2c8fec0cc7ecdad73c3e94dfebf0e03db5a8a13 100644 (file)
--- a/m4/macros/check_nfs_prot_headers.m4
+++ b/m4/macros/check_nfs_prot_headers.m4
@@ -15,7 +15,7 @@ case "${host_os}" in
                        ac_cv_nfs_prot_headers=sunos3 ;;
        sunos4* | solaris1* )
                        ac_cv_nfs_prot_headers=sunos4 ;;
-       sunos5.[[0-3]]* | solaris2.[[0-3]]* )
+       sunos5.[[0-3]] | solaris2.[[0-3]] )
                        ac_cv_nfs_prot_headers=sunos5_3 ;;
        sunos5.4* | solaris2.4* )
                        ac_cv_nfs_prot_headers=sunos5_4 ;;
@@ -25,7 +25,7 @@ case "${host_os}" in
                        ac_cv_nfs_prot_headers=sunos5_6 ;;
        sunos5.7* | solaris2.7* )
                        ac_cv_nfs_prot_headers=sunos5_7 ;;
-       sunos* | solaris* )
+       sunos5* | solaris2* )
                        ac_cv_nfs_prot_headers=sunos5_8 ;;
        bsdi2*)
                        ac_cv_nfs_prot_headers=bsdi2 ;;