PERFORCE change 214749 for review
Robert Watson
rwatson at FreeBSD.org
Sun Jul 22 12:45:36 UTC 2012
http://p4web.freebsd.org/@@214749?ac=10
Change 214749 by rwatson at rwatson_cinnamon on 2012/07/22 12:45:10
Gegenerate autofoo following endian.h changes in OpenBSM.
Affected files ...
.. //depot/projects/trustedbsd/openbsm/Makefile.in#12 edit
.. //depot/projects/trustedbsd/openbsm/bin/Makefile.in#13 edit
.. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#14 edit
.. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#13 edit
.. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#10 edit
.. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#12 edit
.. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#12 edit
.. //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#12 edit
.. //depot/projects/trustedbsd/openbsm/config/config.h.in#19 edit
.. //depot/projects/trustedbsd/openbsm/configure#59 edit
.. //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#5 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#17 edit
.. //depot/projects/trustedbsd/openbsm/man/Makefile.in#11 edit
.. //depot/projects/trustedbsd/openbsm/modules/Makefile.in#9 edit
.. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#10 edit
.. //depot/projects/trustedbsd/openbsm/sys/Makefile.in#6 edit
.. //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.in#9 edit
.. //depot/projects/trustedbsd/openbsm/test/Makefile.in#10 edit
.. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#10 edit
.. //depot/projects/trustedbsd/openbsm/tools/Makefile.in#13 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/Makefile.in#12 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#11 $
+# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#12 $
#
VPATH = @srcdir@
am__make_dryrun = \
==== //depot/projects/trustedbsd/openbsm/bin/Makefile.in#13 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#12 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#13 $
#
VPATH = @srcdir@
am__make_dryrun = \
==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#14 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#13 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#14 $
#
VPATH = @srcdir@
==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#13 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#12 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#13 $
#
VPATH = @srcdir@
==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#10 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#9 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#10 $
#
VPATH = @srcdir@
==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#12 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#11 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#12 $
#
VPATH = @srcdir@
==== //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#12 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#11 $
+# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#12 $
#
VPATH = @srcdir@
==== //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#12 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#11 $
+# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#12 $
#
VPATH = @srcdir@
==== //depot/projects/trustedbsd/openbsm/config/config.h.in#19 (text+ko) ====
@@ -6,9 +6,6 @@
/* Define if audit system calls present */
#undef HAVE_AUDIT_SYSCALLS
-/* Define if be32enc is present */
-#undef HAVE_BE32ENC
-
/* Define to 1 if you have the `bzero' function. */
#undef HAVE_BZERO
@@ -21,7 +18,7 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define to 1 if you have the <endian.h> header file. */
+/* Define if endian.h is present */
#undef HAVE_ENDIAN_H
/* Define to 1 if you have the `fork' function. */
@@ -54,9 +51,6 @@
/* Define if ipc_perm.__seq instead of seq */
#undef HAVE_IPC_PERM___SEQ
-/* Define to 1 if you have the <machine/endian.h> header file. */
-#undef HAVE_MACHINE_ENDIAN_H
-
/* Define to 1 if you have the <mach/mach.h> header file. */
#undef HAVE_MACH_MACH_H
@@ -119,7 +113,7 @@
/* Define to 1 if `st_rdev' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_RDEV
-/* Define to 1 if you have the <sys/endian.h> header file. */
+/* Define if sys/endian.h is present */
#undef HAVE_SYS_ENDIAN_H
/* Define to 1 if you have the <sys/stat.h> header file. */
@@ -190,12 +184,24 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
+/* Define if compat/endian_enc.h is required */
+#undef USE_COMPAT_ENDIAN_ENC_H
+
+/* Define if compat/endian.h is required */
+#undef USE_COMPAT_ENDIAN_H
+
+/* Define if endian should be included */
+#undef USE_ENDIAN_H
+
/* Define if uses Mach IPC for Triggers messages */
#undef USE_MACH_IPC
/* Define to use native include files */
#undef USE_NATIVE_INCLUDES
+/* Define if sys/endian.h should be included */
+#undef USE_SYS_ENDIAN_H
+
/* Version number of package */
#undef VERSION
==== //depot/projects/trustedbsd/openbsm/configure#59 (xtext) ====
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#56 .
+# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#57 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for OpenBSM 1.2alpha1.
#
@@ -11771,7 +11771,7 @@
fi
-for ac_header in endian.h mach/mach.h machine/endian.h sys/endian.h stdint.h
+for ac_header in mach/mach.h stdint.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -12951,21 +12951,132 @@
#
-# There are a wide variety of endian macros and functions in the wild; we try
-# to use the native support if it defines be32enc(), but otherwise have to
-# use our own.
+# We rely on the BSD be32toh() and be32enc()-style endian macros to perform
+# byte order conversions. Availability of these varies considerably -- in
+#Â general, a system might have neither, be32toh(), or be32toh() and be32enc().
+# There is also variation in which headers are even present, and whether they
+# are macros or functions. Try to organise the world into some simpler cases.
+# The following macros may be set at the end:
+#
+# USE_ENDIAN_H
+# USE_SYS_ENDIAN_H
+# USE_COMPAT_ENDIAN_H
+# USE_COMPAT_ENDIAN_ENC_H
+#
+# First, decide which system endian.h to use.
+#
+for ac_header in endian.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "endian.h" "ac_cv_header_endian_h" "$ac_includes_default"
+if test "x$ac_cv_header_endian_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_ENDIAN_H 1
+_ACEOF
+
+ have_endian_h=yes
+
+$as_echo "#define HAVE_ENDIAN_H /**/" >>confdefs.h
+
+
+else
+
+ have_endian_h=no
+
+fi
+
+done
+
+
+for ac_header in sys/endian.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "sys/endian.h" "ac_cv_header_sys_endian_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_endian_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_ENDIAN_H 1
+_ACEOF
+
+ have_sys_endian_h=yes
+
+$as_echo "#define HAVE_SYS_ENDIAN_H /**/" >>confdefs.h
+
+
+else
+
+ have_sys_endian_h=no
+
+fi
+
+done
+
+
+if test $have_endian_h; then
+
+$as_echo "#define USE_ENDIAN_H /**/" >>confdefs.h
+
+elif test $have_sys_endian_h; then
+
+$as_echo "#define USE_SYS_ENDIAN_H /**/" >>confdefs.h
+
+else
+ as_fn_error $? "no endian.h" "$LINENO" 5
+fi
+
+#
+# Next, decide if we need to supplement with compat headers.
#
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+ #ifdef USE_ENDIAN_H
+ #include <endian.h>
+ #endif
+ #ifdef USE_SYS_ENDIAN_H
+ #include <sys/endian.h>
+ #endif
+
+int
+main ()
+{
+
+ be32toh(0);
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+else
+
+
+$as_echo "#define USE_COMPAT_ENDIAN_H /**/" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: using compat/endian.h" >&5
+$as_echo "using compat/endian.h" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #ifdef USE_ENDIAN_H
+ #include <endian.h>
+ #endif
+ #ifdef USE_SYS_ENDIAN_H
#include <sys/endian.h>
+ #endif
+ #ifdef USE_COMPAT_ENDIAN_H
+ #include <compat/endian.h>
+ #endif
#include <stdlib.h>
int
main ()
{
- be32enc(NULL, 1);
+ be32enc(NULL, 0);
;
return 0;
@@ -12973,9 +13084,13 @@
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
+else
+
-$as_echo "#define HAVE_BE32ENC /**/" >>confdefs.h
+$as_echo "#define USE_COMPAT_ENDIAN_ENC_H /**/" >>confdefs.h
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: using compat/endian_enc.h" >&5
+$as_echo "using compat/endian_enc.h" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext \
==== //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#5 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#4 $
+# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#5 $
#
VPATH = @srcdir@
==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#17 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#16 $
+# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#17 $
#
VPATH = @srcdir@
==== //depot/projects/trustedbsd/openbsm/man/Makefile.in#11 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.in#10 $
+# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.in#11 $
#
VPATH = @srcdir@
am__make_dryrun = \
==== //depot/projects/trustedbsd/openbsm/modules/Makefile.in#9 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/modules/Makefile.in#8 $
+# $P4: //depot/projects/trustedbsd/openbsm/modules/Makefile.in#9 $
#
VPATH = @srcdir@
am__make_dryrun = \
==== //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#10 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#9 $
+# $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#10 $
#
VPATH = @srcdir@
==== //depot/projects/trustedbsd/openbsm/sys/Makefile.in#6 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/sys/Makefile.in#5 $
+# $P4: //depot/projects/trustedbsd/openbsm/sys/Makefile.in#6 $
#
VPATH = @srcdir@
am__make_dryrun = \
==== //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.in#9 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.in#8 $
+# $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.in#9 $
#
VPATH = @srcdir@
==== //depot/projects/trustedbsd/openbsm/test/Makefile.in#10 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/test/Makefile.in#9 $
+# $P4: //depot/projects/trustedbsd/openbsm/test/Makefile.in#10 $
#
VPATH = @srcdir@
am__make_dryrun = \
==== //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#10 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#9 $
+# $P4: //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#10 $
#
VPATH = @srcdir@
==== //depot/projects/trustedbsd/openbsm/tools/Makefile.in#13 (text+ko) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#12 $
+# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#13 $
#
VPATH = @srcdir@
More information about the p4-projects
mailing list