Use the AC_C_BIGENDIAN_CROSS macro instead of the non-cross-compile-safe

version normally provided with autoconf.

I have not tested this in a cross-compilation environment, but it does
not break things in my x86 environment.  (If this breaks things for anyone,
please file a bug report!)

This closes SF patch #431342.

diff --git a/expat/buildconf.sh b/expat/buildconf.sh
index ceaca5e5108343455c5f1a038f82e5a7c805a12b..1f7112680dd20b258d93c73e4d00f194a139852e 100755 (executable)
--- a/expat/buildconf.sh
+++ b/expat/buildconf.sh
@@ -11,6 +11,10 @@ echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
 echo "dnl edits here will be lost" >> aclocal.m4
 cat $ltfile >> aclocal.m4
 
+ltfile='conftools/ac_c_bigendian_cross.m4'
+echo "Incorporating $ltfile into aclocal.m4 ..."
+cat $ltfile >> aclocal.m4
+
 #
 # Create the libtool helper files
 #

diff --git a/expat/configure.in b/expat/configure.in
index d1f4ce8e4395670c630bb29afda19f93b8fd3a9c..c9be67dce0cbb8a4082b7a5cd49dde29055cb87e 100644 (file)
--- a/expat/configure.in
+++ b/expat/configure.in
@@ -69,7 +69,11 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h unistd.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_BIGENDIAN
+
+dnl Note: Avoid using AC_C_BIGENDIAN because it does not
+dnl work in a cross compile.
+AC_C_BIGENDIAN_CROSS
+
 AC_C_CONST
 AC_TYPE_OFF_T
 AC_TYPE_SIZE_T