From b876ab39322adbbc27962cf644e0b67888871c51 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Sat, 7 Aug 2021 18:25:36 -0600
Subject: [PATCH] dtinfo: use autotools endian detection instead of
 cpu-specific checks

This affects the definitions of OLIAS_BIG_ENDIAN and
OLIAS_LITTLE_ENDIAN when building mmdb.
---
 .../dtinfo/DtMmdb/utility/Makefile.am         | 22 -------------------
 cde/programs/dtinfo/DtMmdb/utility/config.h   | 10 +++++++++
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/cde/programs/dtinfo/DtMmdb/utility/Makefile.am b/cde/programs/dtinfo/DtMmdb/utility/Makefile.am
index 6e1e004ea..080f67ccb 100644
--- a/cde/programs/dtinfo/DtMmdb/utility/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/utility/Makefile.am
@@ -4,28 +4,6 @@ noinst_LTLIBRARIES = libutility.la
 
 libutility_la_CXXFLAGS = -DC_API -DPORTABLE_DB -I.. -I../dti_excs -I../misc
 
-
-#FIXME: This should be done in autotools_config.h
-if I386
-libutility_la_CXXFLAGS += -DMMDB_LITTLE_ENDIAN
-endif
-
-if X86_64
-libutility_la_CXXFLAGS += -DMMDB_LITTLE_ENDIAN
-endif
-
-if ARM
-libutility_la_CXXFLAGS += -DMMDB_LITTLE_ENDIAN
-endif
-
-if PPC
-libutility_la_CXXFLAGS += -DMMDB_BIG_ENDIAN
-endif
-
-if SPARC
-libutility_la_CXXFLAGS += -DMMDB_BIG_ENDIAN
-endif
-
 libutility_la_SOURCES = funcs.C         ostring.C       pm_random.C \
 			atoi_pearson.C 	xtime.C         buffer.C \
 		        atoi_larson.C   atomic_lock.C 	rw_lock.C \
diff --git a/cde/programs/dtinfo/DtMmdb/utility/config.h b/cde/programs/dtinfo/DtMmdb/utility/config.h
index 106e83b79..1efb80e31 100644
--- a/cde/programs/dtinfo/DtMmdb/utility/config.h
+++ b/cde/programs/dtinfo/DtMmdb/utility/config.h
@@ -25,6 +25,16 @@
 #ifndef _config_h
 #define _config_h 1
 
+#include <autotools_config.h> // determine endianess
+
+#if defined(WORDS_BIGENDIAN)
+# define OLIAS_BIG_ENDIAN
+# undef OLIAS_LITTLE_ENDIAN
+#else
+# define OLIAS_LITTLE_ENDIAN
+# undef OLIAS_BIG_ENDIAN
+#endif
+
 #ifdef OLIAS_LITTLE_ENDIAN
 # define MMDB_LITTLE_ENDIAN  // i386
 #else