--- Frodo4/Src/configure.ac	2003/07/01 19:30:24	1.4
+++ Frodo4/Src/configure.ac	2010/04/21 19:55:45	1.12
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(Frodo, 4.2, [Christian.Bauer@uni-mainz.de], Frodo)
+AC_INIT(Frodo, 4.2)
 AC_CONFIG_SRCDIR(main.cpp)
 AC_PREREQ(2.52)
 AC_CONFIG_HEADER(sysconfig.h)
@@ -11,41 +11,62 @@ AC_PROG_CXX
 AC_PROG_CPP
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
+PKG_PROG_PKG_CONFIG
 
 dnl -fomit-frame-pointer makes things faster
 if [[ x"$GXX" = "xyes" ]]; then
   CFLAGS="$CFLAGS -fomit-frame-pointer -fno-exceptions"
 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/\..*$//'`
-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)
 
+EMBEDDED_EXTENSION=none
+AC_MSG_CHECKING([if Frodo should be compiled with extensions for an embedded device])
+AC_ARG_WITH([embedded-extension], [AS_HELP_STRING([--with-embedded-extension=qtopia|maemo],[Specify which extension for Frodo on an embedded device should be used.])])
+if [[ x"$with_embedded_extension" == "xqtopia" ]]; then
+  EMBEDDED_EXTENSION=$with_embedded_extension
+  AC_DEFINE(QTOPIA, 1, [Extension for Qtopia is enabled])
+elif [[ x"$with_embedded_extension" == "xmaemo" ]]; then
+  EMBEDDED_EXTENSION=$with_embedded_extension
+  AC_DEFINE(MAEMO, 1, [Extension for Maemo is enabled])
+fi
+AC_MSG_RESULT([$EMBEDDED_EXTENSION])
+
+if [[ x"$EMBEDDED_EXTENSION" == "xmaemo" ]]; then
+  PKG_CHECK_MODULES(OSSO, [libosso >= 0.9.19], AC_DEFINE(HAVE_LIBOSSO, [], [Weather libosso is present on the system]), [AC_MSG_NOTICE([libosso not present.])])
+fi
+
+if [[ x"$EMBEDDED_EXTENSION" == "xnone" ]]; then
+  HAVE_GLADE=no
+  PKG_CHECK_MODULES(GLADE, [libglade-2.0 libgnomeui-2.0 >= 1.110.0], HAVE_GLADE=yes)
+  if [[ $HAVE_GLADE = yes ]]; then
+    AC_DEFINE(HAVE_GLADE, 1, [Glade support is enabled])
+    LDFLAGS="$LDFLAGS -Wl,-E"
+  fi
+else
+  GUIOBJS="sdlgui.o file.o dlgFileSelect.o dlgMain.o dlgDrives.o dlgOptions.o dlgVideoSound.o dlgAdvanced.o dlgInput.o"
+  GUISRCS="sdlgui.cpp file.cpp dlgFileSelect.cpp dlgMain.cpp dlgDrives.cpp dlgOptions.cpp dlgVidoSound.cpp dlgAdvanced.cpp dlgInput.cpp"
+fi
+
 AC_PATH_XTRA
 
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_CHECK_HEADERS(unistd.h fcntl.h sys/time.h sys/types.h utime.h string.h strings.h values.h ncurses.h)
-AC_CHECK_HEADERS(sys/vfs.h sys/mount.h sys/select.h sys/param.h sys/statfs.h sys/statvfs.h sys/stat.h linux/joystick.h)
+AC_CHECK_HEADERS(sys/vfs.h sys/mount.h sys/select.h sys/param.h sys/statfs.h sys/statvfs.h sys/stat.h)
 
+dnl Checks for types.
 AC_CHECK_SIZEOF(char)
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)
+AC_CHECK_SIZEOF(void *)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_MODE_T
@@ -67,13 +88,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,76 +110,13 @@ 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 <stdio.h>
-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 <stdio.h>
-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
-  CFLAGS="$CFLAGS -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)
 AC_SUBST(HPUX_REV)
 AC_SUBST(KBD_LANG)
+AC_SUBST(GUIOBJS)
+AC_SUBST(GUISRCS)
 
 dnl Generate Makefile.
 AC_CONFIG_FILES([Makefile])