Date: Tue, 29 Jan 2008 12:17:55 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 134372 for review Message-ID: <200801291217.m0TCHtX0037298@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=134372 Change 134372 by rwatson@rwatson_cinnamon on 2008/01/29 12:17:34 Add configure tests for ipc_perm fields _key and _seq, as found in recent Mac OS X versions, in addition to the existing consideration of key, __key, seq, and __seq. Regenerate. Submitted by: Eric Hall <trustedbsdat darkart dot com> Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#11 edit .. //depot/projects/trustedbsd/openbsm/configure#35 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#38 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#11 (text+ko) ==== @@ -39,6 +39,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 if ipc_perm.__key instead of key */ #undef HAVE_IPC_PERM___KEY ==== //depot/projects/trustedbsd/openbsm/configure#35 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#35 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#37 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for OpenBSM 1.0. +# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha1. # # Report bugs to <trustedbsd-audit@TrustesdBSD.org>. # @@ -729,8 +729,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0' -PACKAGE_STRING='OpenBSM 1.0' +PACKAGE_VERSION='1.1alpha1' +PACKAGE_STRING='OpenBSM 1.1alpha1' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -1399,7 +1399,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.1alpha1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1469,7 +1469,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0:";; + short | recursive ) echo "Configuration of OpenBSM 1.1alpha1:";; esac cat <<\_ACEOF @@ -1573,7 +1573,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0 +OpenBSM configure 1.1alpha1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1587,7 +1587,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0, which was +It was created by OpenBSM $as_me 1.1alpha1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -18998,7 +18998,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0 + VERSION=1.1alpha1 cat >>confdefs.h <<_ACEOF @@ -20403,6 +20403,116 @@ 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 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include <sys/types.h> +#include <sys/ipc.h> + + +int +main () +{ +static struct ipc_perm ac_aggr; +if (ac_aggr._key) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_ipc_perm__key=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include <sys/types.h> +#include <sys/ipc.h> + + +int +main () +{ +static struct ipc_perm ac_aggr; +if (sizeof ac_aggr._key) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_ipc_perm__key=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_member_struct_ipc_perm__key=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +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 echo $ECHO_N "checking for struct ipc_perm.__seq... $ECHO_C" >&6; } if test "${ac_cv_member_struct_ipc_perm___seq+set}" = set; then @@ -20513,6 +20623,116 @@ fi +{ 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 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include <sys/types.h> +#include <sys/ipc.h> + + +int +main () +{ +static struct ipc_perm ac_aggr; +if (ac_aggr._seq) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_ipc_perm__seq=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include <sys/types.h> +#include <sys/ipc.h> + + +int +main () +{ +static struct ipc_perm ac_aggr; +if (sizeof ac_aggr._seq) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_ipc_perm__seq=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_member_struct_ipc_perm__seq=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +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 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 @@ -23166,7 +23386,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenBSM $as_me 1.0, which was +This file was extended by OpenBSM $as_me 1.1alpha1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23219,7 +23439,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0 +OpenBSM config.status 1.1alpha1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/trustedbsd/openbsm/configure.ac#38 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.1alpha1], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#37 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#38 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -38,6 +38,13 @@ #include <sys/ipc.h> ]) +AC_CHECK_MEMBER([struct ipc_perm._key], +[AC_DEFINE(HAVE_IPC_PERM__KEY,, Define if ipc_perm._key instead of key)], +[],[ +#include <sys/types.h> +#include <sys/ipc.h> +]) + AC_CHECK_MEMBER([struct ipc_perm.__seq], [AC_DEFINE(HAVE_IPC_PERM___SEQ,, Define if ipc_perm.__seq instead of seq)], [],[ @@ -45,6 +52,13 @@ #include <sys/ipc.h> ]) +AC_CHECK_MEMBER([struct ipc_perm._seq], +[AC_DEFINE(HAVE_IPC_PERM__SEQ,, Define if ipc_perm._seq instead of seq)], +[],[ +#include <sys/types.h> +#include <sys/ipc.h> +]) + AC_HEADER_TIME AC_STRUCT_TM
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801291217.m0TCHtX0037298>