PERFORCE change 92509 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=92509

Change 92509 by rwatson at rwatson_peppercorn on 2006/02/28 01:56:58

	Third try: the previous attempt resulted in the undef ending up in
	config.h, but not the #def.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/configure#9 edit
.. //depot/projects/trustedbsd/openbsm/configure.ac#12 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/configure#9 (xtext) ====

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#10 .
+# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#11 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5.
 #
@@ -20586,6 +20586,13 @@
 fi
 echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm___key" >&5
 echo "${ECHO_T}$ac_cv_member_struct_ipc_perm___key" >&6
+if test $ac_cv_member_struct_ipc_perm___key = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_IPC_PERM___KEY
+_ACEOF
+
+fi
 
 
 echo "$as_me:$LINENO: checking for struct ipc_perm.__seq" >&5
@@ -20695,6 +20702,13 @@
 fi
 echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm___seq" >&5
 echo "${ECHO_T}$ac_cv_member_struct_ipc_perm___seq" >&6
+if test $ac_cv_member_struct_ipc_perm___seq = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_IPC_PERM___SEQ
+_ACEOF
+
+fi
 
 
 echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5

==== //depot/projects/trustedbsd/openbsm/configure.ac#12 (text+ko) ====

@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.59)
 AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit at TrustesdBSD.org],[openbsm])
-AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#11 $])
+AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#12 $])
 AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADER([config/config.h])
@@ -32,15 +32,17 @@
 AC_TYPE_SIZE_T
 AC_CHECK_MEMBERS([struct stat.st_rdev])
 
-AC_CHECK_MEMBER([struct ipc_perm.__key],,,[
+AC_CHECK_MEMBER([struct ipc_perm.__key],
+[AC_DEFINE(HAVE_IPC_PERM___KEY,, Define if ipc_perm.__key instead of key)],
+[],[
 #include <sys/ipc.h>
-], AC_DEFINE(HAVE_IPC_PERM___KEY,, Define if ipc_perm.__key instead of key)
-)
+])
 
-AC_CHECK_MEMBER([struct ipc_perm.__seq],,,[
+AC_CHECK_MEMBER([struct ipc_perm.__seq],
+[AC_DEFINE(HAVE_IPC_PERM___SEQ,, Define if ipc_perm.__seq instead of seq)],
+[],[
 #include <sys/ipc.h>
-], AC_DEFINE(HAVE_IPC_PERM___SEQ,, Define if ipc_perm.__seq instead of seq)
-)
+])
 
 AC_HEADER_TIME
 AC_STRUCT_TM