--- Frodo4/Src/configure.ac 2003/07/01 19:04:37 1.3 +++ Frodo4/Src/configure.ac 2003/07/09 14:40:52 1.6 @@ -12,25 +12,15 @@ AC_PROG_CPP AC_PROG_MAKE_SET AC_PROG_INSTALL -dnl Don't want the default "-O2 -g" that autoconf uses for gcc. +dnl -fomit-frame-pointer makes things faster if [[ x"$GXX" = "xyes" ]]; then - CFLAGS="-O2 -g -fomit-frame-pointer -Wall -Wno-unused -Wno-format" -fi - -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown - -HPUX_REV=0 -if [[ x$UNAME_SYSTEM = "xHP-UX" ]]; then - HPUX_REV=`echo $UNAME_RELEASE | sed -e 's/[^.]*.[0B]*//' -e 's/\..*$//'` + CFLAGS="$CFLAGS -fomit-frame-pointer -fno-exceptions" fi AC_AIX AC_ISC_POSIX dnl Checks for libraries. -HAVE_BEBOX=no -AC_CHECK_LIB(amiga, OpenLibrary, HAVE_AMIGA_LIB=yes, HAVE_AMIGA_LIB=no) AC_CHECK_LIB(vga, vga_setmode, HAVE_SVGA_LIB=yes, HAVE_SVGA_LIB=no) AM_PATH_SDL(1.2.0, HAVE_SDL=yes, HAVE_SDL=no) @@ -67,13 +57,7 @@ AC_ARG_ENABLE(kbd-lang-de,[ --enable-kb AC_ARG_ENABLE(kbd-lang-us,[ --enable-kbd-lang-us Use american keyboard layout],[KBD_LANG=0],[]) AC_MSG_CHECKING(which target to use) -if [[ x"$HAVE_BEBOX" = "xyes" ]]; then - AC_MSG_RESULT([BeBox]) - TARGET=be -elif [[ x"$HAVE_AMIGA_LIB" = "xyes" ]]; then - AC_MSG_RESULT([AmigaOS]) - TARGET=amigaos -elif [[ x"$no_x" = "xyes" ]]; then +if [[ x"$no_x" = "xyes" ]]; then if [[ x"$HAVE_SVGA_LIB" = "xyes" ]]; then AC_MSG_RESULT([SVGAlib]) TARGET=svgalib @@ -95,72 +79,6 @@ else LIBS="$LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS" fi -dnl Find out some things about the system -dnl - whether we have GCC 2.7 or better. -dnl - what CPU we have (to use some assembly hacks on the x86) - -HAVEGCC27=n -HAVEI386=n - -cat >conftest.cpp << EOF -#include -int main() -{ -#if defined(__GNUC__) && defined(__GNUC_MINOR__) -#if __GNUC__ > 2 || __GNUC_MINOR__ > 6 -printf("GNU\n"); -#endif -#endif -return 0; -} -EOF - -$CXX conftest.cpp -c -o conftest.o -$CXX conftest.o -o conftest -./conftest >conftest.file -if grep GNU conftest.file >/dev/null; then - HAVEGCC27=y - echo "Good news. Found GCC 2.7 or better." -elif [[ "$CC" = "gcc" ]]; then - echo "I suggest you upgrade to at least version 2.7 of GCC" -else - echo "Couldn't find GCC. Frodo may or may not compile and run correctly." -fi - -cat >conftest.c << EOF -#include -int main() -{ -#ifdef __i386__ -printf("386\n"); -#endif -return 0; -} -EOF - -$CC conftest.c -c -o conftest.o -$CC conftest.o -o conftest -./conftest >conftest.file -if grep 386 conftest.file >/dev/null; then - HAVEI386=y - echo "You seem to be using a x86 CPU" -else - echo "No special hacks for your CPU, sorry." -fi - -rm -f conftest* - -if [[ "$HAVEGCC27" = "y" -a "$HAVEI386" = "y" ]]; then -# Don't want strength-reduce on the i386, makes the code slower usually. - CFLAGS="$CFLAGS -fno-strength-reduce -DREGPARAM=\"__attribute__((regparm(3)))\"" -elif [[ "$TARGET" = "amigaos" ]]; then - CFLAGS="$CFLAGS -DREGPARAM=\"__attribute__((regargs(4)))\" " -else - CFLAGS="$CFLAGS -DREGPARAM=" -fi - -CC=$CXX - AC_SUBST(TARGET) AC_SUBST(SET_MAKE) AC_SUBST(top_srcdir)