From owner-trustedbsd-cvs@FreeBSD.ORG Tue Feb 28 01:48:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA9D416A427 for ; Tue, 28 Feb 2006 01:48:18 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3130743D5E for ; Tue, 28 Feb 2006 01:48:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 584DA46BC0 for ; Mon, 27 Feb 2006 20:47:56 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id D75A357E42; Tue, 28 Feb 2006 01:48:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id C88D116A424; Tue, 28 Feb 2006 01:48:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E0EA016A422 for ; Tue, 28 Feb 2006 01:48:12 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9386C43D5E for ; Tue, 28 Feb 2006 01:48:11 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1S1mBr5075428 for ; Tue, 28 Feb 2006 01:48:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1S1mBwF075425 for perforce@freebsd.org; Tue, 28 Feb 2006 01:48:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:48:11 GMT Message-Id: <200602280148.k1S1mBwF075425@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 92508 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 01:48:19 -0000 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 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 -]) +], AC_DEFINE(HAVE_IPC_PERM___KEY,, Define if ipc_perm.__key instead of key) +) + AC_CHECK_MEMBER([struct ipc_perm.__seq],,,[ #include -]) +], AC_DEFINE(HAVE_IPC_PERM___SEQ,, Define if ipc_perm.__seq instead of seq) +) + AC_HEADER_TIME AC_STRUCT_TM