2 files changed, 53 insertions, 20 deletions

diff --git a/configure.ac b/configure.ac
index d20e9bcf9..8c28b6643 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,24 +203,40 @@ dnl --------------------------------------------------
 dnl check for big/little endian for LCMS
 dnl --------------------------------------------------
 
+BIGENDIAN=
+
 AC_MSG_CHECKING([for big endian])
 
-AC_RUN_IFELSE(
-  [AC_LANG_PROGRAM([#include <stdio.h>], [
-   static const int one = 1;
-   return (*(char*)&one == 0 ? 0 : 1);
-  ])],
-  [LCMS_BIGENDIAN=1],
-  [LCMS_BIGENDIAN=0])
+AC_ARG_ENABLE([big-endian], AC_HELP_STRING([--enable-big-endian],
+    [Force big endian]), [BIGENDIAN=1])
 
-if test "x$LCMS_BIGENDIAN" != "x0"; then
-  LCMS_ENDIAN="-DUSE_BIG_ENDIAN=$LCMS_BIGENDIAN"
-  LCMS2_ENDIAN="-DCMS_USE_BIG_ENDIAN=$LCMS_BIGENDIAN"
-  AC_MSG_RESULT(yes)
+if test x$BIGENDIAN = x; then
+  AC_ARG_ENABLE([little-endian], AC_HELP_STRING([--enable-little-endian],
+      [Force little endian]), [BIGENDIAN=0])
+fi
+
+if test x$BIGENDIAN = x ; then
+  AC_RUN_IFELSE(
+    [AC_LANG_PROGRAM([#include <stdio.h>], [
+     static const int one = 1;
+     return (*(char*)&one == 0 ? 0 : 1);
+    ])],
+    [BIGENDIAN=1;AC_MSG_RESULT(big)],
+    [BIGENDIAN=0;AC_MSG_RESULT(little)])
+else
+  if test x$BIGENDIAN = x1 ; then
+    AC_MSG_RESULT(big)
+  else
+    AC_MSG_RESULT(little)
+  fi
+fi
+
+if test x$BIGENDIAN = x1 ; then
+  LCMS_ENDIAN="-DUSE_BIG_ENDIAN=$BIGENDIAN"
+  LCMS2_ENDIAN="-DCMS_USE_BIG_ENDIAN=$BIGENDIAN"
 else
   LCMS_ENDIAN=
   LCMS2_ENDIAN=
-  AC_MSG_RESULT(no)
 fi
 
 AC_SUBST(LCMS_ENDIAN)
diff --git a/gs/configure.ac b/gs/configure.ac
index 1bea46db9..a4d30437f 100644
--- a/gs/configure.ac
+++ b/gs/configure.ac
@@ -258,16 +258,33 @@ dnl ----------------------------
 dnl check for big/little endian
 dnl ----------------------------
 
+BIGENDIAN=
+
 AC_MSG_CHECKING([for big endian])
 
-AC_RUN_IFELSE(
-  [AC_LANG_PROGRAM([#include <stdio.h>], [
-   static const int one = 1;
-   return (*(char*)&one == 0 ? 0 : 1);
-  ])],
-  [BIGENDIAN=1;AC_MSG_RESULT(big)],
-  [BIGENDIAN=0;AC_MSG_RESULT(little)])
+AC_ARG_ENABLE([big-endian], AC_HELP_STRING([--enable-big-endian],
+    [Force big endian]), [BIGENDIAN=1])
 
+if test x$BIGENDIAN = x; then
+  AC_ARG_ENABLE([little-endian], AC_HELP_STRING([--enable-little-endian],
+      [Force little endian]), [BIGENDIAN=0])
+fi
+
+if test x$BIGENDIAN = x ; then
+  AC_RUN_IFELSE(
+    [AC_LANG_PROGRAM([#include <stdio.h>], [
+     static const int one = 1;
+     return (*(char*)&one == 0 ? 0 : 1);
+    ])],
+    [BIGENDIAN=1;AC_MSG_RESULT(big)],
+    [BIGENDIAN=0;AC_MSG_RESULT(little)])
+else
+  if test x$BIGENDIAN = x1 ; then
+    AC_MSG_RESULT(big)
+  else
+    AC_MSG_RESULT(little)
+  fi
+fi
 
 
 dnl --------------------------------------------------
@@ -275,7 +292,7 @@ dnl Enable thread safe build
 dnl --------------------------------------------------
 AC_ARG_ENABLE([threadsafe], AC_HELP_STRING([--enable-threadsafe],
     [enable a thread safe build - NOTE: this will exclude non-threadsafe devices]))
-if test x$enable_threadsafe = xyes; then
+if test x$enable_threadsafe = xyes ; then
     CFLAGS="-DGS_THREADSAFE"
 fi