Date: Sun, 22 Jul 2012 12:57:39 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 214750 for review Message-ID: <201207221257.q6MCvdcX061503@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <dlfcn.h> header file. */ #undef HAVE_DLFCN_H -/* Define if endian.h is present */ +/* Define to 1 if you have the <endian.h> 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 <sys/endian.h> header file. */ #undef HAVE_SYS_ENDIAN_H /* Define to 1 if you have the <sys/stat.h> 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 <sys/endian.h> #endif #ifdef USE_COMPAT_ENDIAN_H - #include <compat/endian.h> + #include "compat/endian.h" #endif #include <stdlib.h> ==== //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 <sys/endian.h> #endif #ifdef USE_COMPAT_ENDIAN_H - #include <compat/endian.h> + #include "compat/endian.h" #endif #include <stdlib.h> ], [
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207221257.q6MCvdcX061503>