From df749c8286f579bab2d9bf59978959797a87e9ea Mon Sep 17 00:00:00 2001 From: Sjoerd van der Berg Date: Wed, 18 Jun 2003 07:20:46 +0000 Subject: [PATCH] Changed configure to enable FPU by default Rewrote some scripts Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1074 --- acinclude.m4 | 7 ------- configure.in | 12 ++++++++++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index bdf27631..84406fc3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -326,8 +326,6 @@ AH_TOP([ */ ]) -AH_TEMPLATE([C_HAS_ATTRIBUTE],[Determines if the compilers supports attributes for structures.]) - AH_BOTTOM([#define INLINE inline]) AH_BOTTOM([#if C_HAS_ATTRIBUTE @@ -343,11 +341,6 @@ AH_BOTTOM([ /* Enable some big compile-time increasing inlines */ #define C_EXTRAINLINE 0 -/* Enable the FPU module, still only for beta testing */ -#define C_FPU 0 - -/* Maximum memory address range in megabytes */ -#define C_MEM_MAX_SIZE 12 ]) diff --git a/configure.in b/configure.in index 67e2888a..655c9e37 100644 --- a/configure.in +++ b/configure.in @@ -48,6 +48,7 @@ AC_TRY_LINK([extern char ** environ;],[*environ;], dnl Checks for libraries. #Check if the compiler support attributes +AH_TEMPLATE([C_HAS_ATTRIBUTE],[Determines if the compilers supports attributes for structures.]) AC_MSG_CHECKING(if compiler allows __attribute__) AC_TRY_COMPILE([], [typedef struct { } __attribute__ ((packed)) junk;], [ AC_MSG_RESULT(yes);AC_DEFINE(C_HAS_ATTRIBUTE)],AC_MSG_RESULT(no)) @@ -59,7 +60,7 @@ AC_C_BIGENDIAN #Features to enable/disable AH_TEMPLATE(C_DEBUG,[Define to 1 to enable internal debugger, requires libcurses]) -AC_ARG_ENABLE(debug,[ --enable-debug Enable debug mode],[ +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, , ) @@ -72,7 +73,7 @@ AC_ARG_ENABLE(debug,[ --enable-debug Enable debug mode],[ ],) AH_TEMPLATE(C_SSHOT,[Define to 1 to enable screenshots, requires libpng]) -AC_ARG_ENABLE(shots,[ --enable-shots Enable screenshot support],[ +AC_ARG_ENABLE(shots,AC_HELP_STRING([--enable-shots],[Enable screenshot support]),[ AC_CHECK_HEADER(png.h,have_png_h=yes,) AC_CHECK_LIB(png, png_check_sig, have_png_lib=yes, ,-lz) if test x$have_png_lib = xyes -a x$have_png_h = xyes ; then @@ -83,6 +84,13 @@ AC_ARG_ENABLE(shots,[ --enable-shots Enable screenshot support],[ 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) +) + dnl Some host detection and actions for them case "$target" in *-*-cygwin* | *-*-mingw32*)