From owner-p4-projects@FreeBSD.ORG Sun Jul 22 12:57:42 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F9071065673; Sun, 22 Jul 2012 12:57:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11D6F106564A for ; Sun, 22 Jul 2012 12:57:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id ECE6F8FC12 for ; Sun, 22 Jul 2012 12:57:39 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MCvdCk061506 for ; Sun, 22 Jul 2012 12:57:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q6MCvdcX061503 for perforce@freebsd.org; Sun, 22 Jul 2012 12:57:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 22 Jul 2012 12:57:39 GMT Message-Id: <201207221257.q6MCvdcX061503@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 214750 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jul 2012 12:57:42 -0000 http://p4web.freebsd.org/@@214750?ac=10 Change 214750 by rwatson@rwatson_cinnamon on 2012/07/22 12:57:38 Refine autoconf logic for handling endian.h combinations; regenerate. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#20 edit .. //depot/projects/trustedbsd/openbsm/configure#60 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#58 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#20 (text+ko) ==== @@ -18,7 +18,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define if endian.h is present */ +/* Define to 1 if you have the header file. */ #undef HAVE_ENDIAN_H /* Define to 1 if you have the `fork' function. */ @@ -113,7 +113,7 @@ /* Define to 1 if `st_rdev' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_RDEV -/* Define if sys/endian.h is present */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_ENDIAN_H /* Define to 1 if you have the header file. */ @@ -190,7 +190,7 @@ /* Define if compat/endian.h is required */ #undef USE_COMPAT_ENDIAN_H -/* Define if endian should be included */ +/* Define if endian.h should be included */ #undef USE_ENDIAN_H /* Define if uses Mach IPC for Triggers messages */ ==== //depot/projects/trustedbsd/openbsm/configure#60 (xtext) ==== @@ -12975,9 +12975,6 @@ have_endian_h=yes -$as_echo "#define HAVE_ENDIAN_H /**/" >>confdefs.h - - else have_endian_h=no @@ -12997,9 +12994,6 @@ have_sys_endian_h=yes -$as_echo "#define HAVE_SYS_ENDIAN_H /**/" >>confdefs.h - - else have_sys_endian_h=no @@ -13009,11 +13003,11 @@ done -if test $have_endian_h; then +if test $have_endian_h = yes; then $as_echo "#define USE_ENDIAN_H /**/" >>confdefs.h -elif test $have_sys_endian_h; then +elif test $have_sys_endian_h = yes; then $as_echo "#define USE_SYS_ENDIAN_H /**/" >>confdefs.h @@ -13068,7 +13062,7 @@ #include #endif #ifdef USE_COMPAT_ENDIAN_H - #include + #include "compat/endian.h" #endif #include ==== //depot/projects/trustedbsd/openbsm/configure.ac#58 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.2alpha1], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#57 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#58 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR([m4]) @@ -141,21 +141,19 @@ # AC_CHECK_HEADERS([endian.h], [ have_endian_h=yes - AC_DEFINE(HAVE_ENDIAN_H,, Define if endian.h is present) ], [ have_endian_h=no ]) AC_CHECK_HEADERS([sys/endian.h], [ have_sys_endian_h=yes - AC_DEFINE(HAVE_SYS_ENDIAN_H, , Define if sys/endian.h is present) ], [ have_sys_endian_h=no ]) -if test $have_endian_h; then - AC_DEFINE(USE_ENDIAN_H,, Define if endian should be included) -elif test $have_sys_endian_h; then +if test $have_endian_h = yes; then + AC_DEFINE(USE_ENDIAN_H,, Define if endian.h should be included) +elif test $have_sys_endian_h = yes; then AC_DEFINE(USE_SYS_ENDIAN_H,, Define if sys/endian.h should be included) else AC_MSG_ERROR([no endian.h]) @@ -186,7 +184,7 @@ #include #endif #ifdef USE_COMPAT_ENDIAN_H - #include + #include "compat/endian.h" #endif #include ], [