From 3958676a112469ebfd961d92505d5f7e7722b579 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Mon, 11 Feb 2002 07:17:57 +0000
Subject: [PATCH] c++, versioning, endianness, deb, rpm stuff

---
 acconfig.h   | 13 +++++++++----
 configure.ac | 25 ++++++++++++++++---------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/acconfig.h b/acconfig.h
index c337f994..9b61c306 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -25,9 +25,6 @@
 /* Define for a "release" build */
 #undef RELEASE
 
-/* Define to enable cross-platform bitmap/palette loading functions */
-#undef PORTABLE_LOADER
-
 /* Define to enable trick to show movies */
 #undef MOVIE_TRICK
 
@@ -40,8 +37,16 @@
 /* Define this to be the shared game directory root */
 #undef SHAREPATH
 
-@BOTTOM@
+/* d2x major version */
+#undef D2XMAJOR
+
+/* d2x minor version */
+#undef D2XMINOR
 
+/* d2x micro version */
+#undef D2XMICRO
+
+@BOTTOM@
 /* General defines */
 #define NMONO 1
 #define PIGGY_USE_PAGING 1
diff --git a/configure.ac b/configure.ac
index 00effaf9..991346f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,18 @@ AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
 AM_CONFIG_HEADER(conf.h)
-AM_INIT_AUTOMAKE(d2x, 0.1.2)
+
+D2XMAJOR=0
+D2XMINOR=1
+D2XMICRO=3
+
+AC_DEFINE_UNQUOTED(D2XMAJOR)
+AC_DEFINE_UNQUOTED(D2XMINOR)
+AC_DEFINE_UNQUOTED(D2XMICRO)
+
+VERSION=$D2XMAJOR.$D2XMINOR.$D2XMICRO
+
+AM_INIT_AUTOMAKE(d2x, $VERSION)
 
 AM_MAINTAINER_MODE
 
@@ -22,8 +33,10 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_CHECK_TOOL(STRIP, strip, :)
 AC_CHECK_TOOL(AR, ar, :)
 AC_PROG_CC
+AC_PROG_CXX
 AC_STDC_HEADERS
 AC_PATH_PROGS(NASM, nasmw nasm, no)
+AC_C_BIGENDIAN
 
 AC_CYGWIN
 AC_MINGW32
@@ -86,14 +99,6 @@ if test x$enable_nmovies = xyes; then
 fi
 AM_CONDITIONAL(NMOVIES, test x$enable_nmovies = xyes)
 
-dnl Enable cross-platform bitmap/palette loader?
-AC_ARG_ENABLE(xploader,
-  [  --enable-xploader       Enable cross-platform bitmap/palette loader ],,)
-if test x$enable_xploader = xyes; then
-    AC_DEFINE(PORTABLE_LOADER)
-    D2X_FEATURES="xploader ${D2X_FEATURES}"
-fi
-
 dnl Count warnings as errors?
 AC_ARG_ENABLE(werror,
   [  --enable-werror         Count compiler warning as errors ],,)
@@ -297,6 +302,8 @@ maths/Makefile
 mem/Makefile
 misc/Makefile
 texmap/Makefile
+debian/changelog
+rpm/d2x.spec
 )
 
 AC_MSG_RESULT([
-- 
2.39.2