Date: Tue, 28 Feb 2006 01:48:11 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 92508 for review Message-ID: <200602280148.k1S1mBwF075425@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=92508 Change 92508 by rwatson@rwatson_peppercorn on 2006/02/28 01:47:21 Attempt 2: don't just test for __seq and __key, also create a define that can be tested for. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#5 edit .. //depot/projects/trustedbsd/openbsm/configure#8 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#5 (text+ko) ==== @@ -33,6 +33,12 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define if ipc_perm.__key instead of key */ +#undef HAVE_IPC_PERM___KEY + +/* Define if ipc_perm.__seq instead of seq */ +#undef HAVE_IPC_PERM___SEQ + /* Define to 1 if you have the `bsm' library (-lbsm). */ #undef HAVE_LIBBSM ==== //depot/projects/trustedbsd/openbsm/configure#8 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#9 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#10 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -20478,6 +20478,7 @@ fi + echo "$as_me:$LINENO: checking for struct ipc_perm.__key" >&5 echo $ECHO_N "checking for struct ipc_perm.__key... $ECHO_C" >&6 if test "${ac_cv_member_struct_ipc_perm___key+set}" = set; then @@ -20586,6 +20587,7 @@ echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm___key" >&5 echo "${ECHO_T}$ac_cv_member_struct_ipc_perm___key" >&6 + echo "$as_me:$LINENO: checking for struct ipc_perm.__seq" >&5 echo $ECHO_N "checking for struct ipc_perm.__seq... $ECHO_C" >&6 if test "${ac_cv_member_struct_ipc_perm___seq+set}" = set; then @@ -20694,6 +20696,7 @@ echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm___seq" >&5 echo "${ECHO_T}$ac_cv_member_struct_ipc_perm___seq" >&6 + echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then ==== //depot/projects/trustedbsd/openbsm/configure.ac#11 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#10 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#11 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -31,12 +31,17 @@ AC_TYPE_PID_T AC_TYPE_SIZE_T AC_CHECK_MEMBERS([struct stat.st_rdev]) + AC_CHECK_MEMBER([struct ipc_perm.__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],,,[ #include <sys/ipc.h> -]) +], AC_DEFINE(HAVE_IPC_PERM___SEQ,, Define if ipc_perm.__seq instead of seq) +) + AC_HEADER_TIME AC_STRUCT_TM
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602280148.k1S1mBwF075425>