1.1 --- a/configure.in	Mon Nov 19 08:45:00 2007 +0000
     1.2 +++ b/configure.in	Tue Nov 20 11:16:09 2007 +0000
     1.3 @@ -12,24 +12,24 @@
     1.4  AC_CANONICAL_BUILD
     1.5  AC_CANONICAL_HOST
     1.6  
     1.7 -PKG_CHECK_MODULES(PACKAGE, 
     1.8 -   [ gtk+-2.0 dnl
     1.9 -     libpng ])
    1.10 -PKG_CHECK_MODULES(ESOUND, [esound], [ 
    1.11 -     HAVE_ESOUND='yes'
    1.12 -     AC_DEFINE([HAVE_ESOUND],1,[Have esound support]) ], 
    1.13 -   [ echo "Warning: esound not found - building without audio support" ])
    1.14 -AM_CONDITIONAL( AUDIO_ESOUND, [test "$HAVE_ESOUND" = 'yes'] )
    1.15 +dnl ----------- Check for mandatory dependencies --------------
    1.16 +dnl Check for libpng (required)
    1.17 +PKG_CHECK_MODULES(LIBPNG, [libpng] )
    1.18  
    1.19 -AC_CHECK_LIB(z, uncompress, [], [
    1.20 -    echo "Zlib (libz.so) could not be found, but is required."
    1.21 -    exit 1])
    1.22  AC_CHECK_LIB(GL, glXQueryVersion, [], [
    1.23      echo "The OpenGL library (libGL.so) could not be found, but is required."
    1.24      exit 1])
    1.25  AC_CHECK_HEADER([GL/gl.h], [], [
    1.26      echo "The OpenGL header files (eg GL/gl.h) could not be found, but are required."
    1.27      exit 1])
    1.28 +dnl Implied by libpng, but check explicitly just in case
    1.29 +AC_CHECK_LIB(z, uncompress, [], [
    1.30 +    echo "Zlib (libz.so) could not be found, but is required."
    1.31 +    exit 1])
    1.32 +
    1.33 +dnl Check for GTK (required for unix systems)
    1.34 +PKG_CHECK_MODULES(GTK, gtk+-2.0, [HAVE_GTK='yes'])
    1.35 +AM_CONDITIONAL(GUI_GTK, [test "$HAVE_GTK" = 'yes'])
    1.36  
    1.37  dnl Check for a supported cpu target for translation purposes
    1.38  case $host_cpu in
    1.39 @@ -44,12 +44,20 @@
    1.40  esac
    1.41  AM_CONDITIONAL(BUILD_SH4X86, [test "$SH4_TRANSLATOR" = "x86" -o "$SH4_TRANSLATOR" = "x86_64"])
    1.42  
    1.43 -dnl Check for cdrom device support
    1.44 +dnl ------------------ Optional driver support -------------------
    1.45 +dnl Check for esound
    1.46 +PKG_CHECK_MODULES(ESOUND, [esound], [ 
    1.47 +     HAVE_ESOUND='yes'
    1.48 +     AC_DEFINE([HAVE_ESOUND],1,[Have esound support]) ], 
    1.49 +   [ echo "Warning: esound not found - building without audio support" ])
    1.50 +AM_CONDITIONAL( AUDIO_ESOUND, [test "$HAVE_ESOUND" = 'yes'] )
    1.51 +
    1.52 +dnl Check for linux cdrom device support
    1.53  AC_CHECK_HEADER([linux/cdrom.h], [HAVE_LINUX_CDROM_H=yes], [
    1.54      echo "Linux CDROM support not found, building without it."]  )
    1.55  AM_CONDITIONAL(CDROM_LINUX, [test "$HAVE_LINUX_CDROM_H" = "yes"])
    1.56  
    1.57 -dnl Check for cross-compiler availability
    1.58 +dnl Check for cross-compiler availability - needed for system tests
    1.59  AC_PATH_PROG(SHCC, [sh-elf-gcc])
    1.60  AC_PATH_PROG(SHLD, [sh-elf-ld])
    1.61  AC_PATH_PROG(SHOBJCOPY, [sh-elf-objcopy])
    1.62 @@ -72,12 +80,11 @@
    1.63  AM_CONDITIONAL(BUILD_SYSTEST, [test "$BUILD_SH" = "yes"])
    1.64  AM_CONDITIONAL(BUILD_ARMTEST, [test "$BUILD_ARM" = "yes"])
    1.65  
    1.66 +
    1.67 +dnl ----------------------- All done, finish up -----------------------
    1.68  GETTEXT_PACKAGE=lxdream
    1.69  AC_SUBST(GETTEXT_PACKAGE)
    1.70  AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[translation domain])
    1.71 -AC_SUBST(PACKAGE_CFLAGS)
    1.72 -AC_SUBST(PACKAGE_LIBS)
    1.73 -
    1.74  
    1.75  dnl Add the languages which your application supports here.
    1.76  ALL_LINGUAS="de pt_BR"