From ad6ba002e1819a72e66095401c3657d0e93bcc4a Mon Sep 17 00:00:00 2001
From: Sjoerd van der Berg <harekiet@users.sourceforge.net>
Date: Sun, 24 Aug 2003 14:44:32 +0000
Subject: [PATCH] Some new configure options for core inlining and heavy
 debugging. Fixed the --disable-fpu option

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1204
---
 acinclude.m4 | 12 ------------
 configure.in | 35 +++++++++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 84406fc3..f0a8266b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -303,9 +303,6 @@ AC_SUBST(ALSA_CFLAGS)
 AC_SUBST(ALSA_LIBS)
 ])
 
-
-
-
 AH_TOP([
 /*
  *  Copyright (C) 2002-2003  The DOSBox Team
@@ -334,13 +331,4 @@ AH_BOTTOM([#if C_HAS_ATTRIBUTE
 #define GCC_ATTRIBUTE(x) /* attribute not supported */
 #endif])
 
-AH_BOTTOM([
-/* Enable some heavy debugging options */
-#define C_HEAVY_DEBUG 0
-
-/* Enable some big compile-time increasing inlines */
-#define C_EXTRAINLINE 0
-
-])
-
 
diff --git a/configure.in b/configure.in
index fafa8333..d1bea377 100644
--- a/configure.in
+++ b/configure.in
@@ -60,23 +60,45 @@ AC_C_BIGENDIAN
 
 #Features to enable/disable
 AH_TEMPLATE(C_DEBUG,[Define to 1 to enable internal debugger, requires libcurses])
+AH_TEMPLATE(C_HEAVY_DEBUG,[Define to 1 to enable heavy debugging, also have to enable C_DEBUG])
 AC_ARG_ENABLE(debug,AC_HELP_STRING([--enable-debug],[Enable debug mode]),[
    AC_CHECK_HEADER(curses.h,have_curses_h=yes,)
    AC_CHECK_LIB(curses, initscr, have_curses_lib=yes, , )
+   AC_CHECK_LIB(pdcurses, initscr, have_pdcurses_lib=yes, , )
 
    if test x$have_curses_lib = xyes -a x$have_curses_h = xyes ; then
-    LIBS="$LIBS -lcurses"
+     LIBS="$LIBS -lcurses"
      AC_DEFINE(C_DEBUG,1)
+     if test x$enable_debug = xheavy ; then 
+       AC_DEFINE(C_HEAVY_DEBUG,1)
+     fi
+   elif test x$have_pdcurses_lib = xyes -a x$have_curses_h = xyes ; then
+     LIBS="$LIBS -lpdcurses"
+     AC_DEFINE(C_DEBUG,1)
+     if test x$enable_debug = xheavy ; then 
+       AC_DEFINE(C_HEAVY_DEBUG,1)
+     fi
    else 
-     AC_MSG_WARN([Can't enable debug mode without libcurses])
+     AC_MSG_WARN([Can't find curses, debug mode disabled])
    fi
 ],)
 
+AH_TEMPLATE(C_CORE_INLINE,[Define to 1 to use inlined memory functions in cpu core])
+AC_ARG_ENABLE(core-inline,AC_HELP_STRING([--enable-core-inline],[Enable inlined memory handling in CPU Core]),[
+  if test x$enable_core_inline = xyes ; then 
+    AC_MSG_RESULT([enabling inlined memory handling in CPU Core]),
+    AC_DEFINE(C_CORE_INLINE,1)
+  fi
+],)
+
 AH_TEMPLATE(C_FPU,[Define to 1 to enable floating point emulation])
-  AC_ARG_ENABLE(fpu,AC_HELP_STRING([--disable-fpu],[Disable FPU support]),
-  AC_MSG_RESULT([FPU support has been disabled]),
-  AC_DEFINE(C_FPU,1)
-)
+AC_ARG_ENABLE(fpu,AC_HELP_STRING([--disable-fpu],[Disable FPU support]),[
+  if test x$enable_fpu = xno ; then 
+    AC_MSG_RESULT([disabling FPU supportd])
+  else 
+    AC_DEFINE(C_FPU,1)
+  fi 
+],AC_DEFINE(C_FPU,1))
 
 AH_TEMPLATE(C_SSHOT,[Define to 1 to enable screenshots, requires libpng])
 AC_CHECK_HEADER(png.h,have_png_h=yes,)
@@ -121,6 +143,7 @@ src/Makefile
 src/cpu/Makefile
 src/cpu/core_16/Makefile
 src/cpu/core_full/Makefile
+src/cpu/core_normal/Makefile
 src/debug/Makefile
 src/dos/Makefile
 src/fpu/Makefile