1.1 --- a/configure.in	Sun Jun 22 06:49:00 2008 +0000
     1.2 +++ b/configure.in	Sun Jun 22 08:59:39 2008 +0000
     1.3 @@ -103,6 +103,7 @@
     1.4    AC_CHECK_HEADER([GL/osmesa.h], [],
     1.5      [AC_MSG_FAILURE( [--with-osmesa was given, but osmesa.h could not be found])])
     1.6    HAVE_OSMESA='yes'
     1.7 +  VIDEO_DRIVERS="$VIDEO_DRIVERS osmesa"
     1.8    AC_DEFINE([HAVE_OSMESA],1,[Building with the OSMesa video driver]) ], [
     1.9  
    1.10  dnl Otherwise we want a real GL library (unless we're on darwin, in which case it's already
    1.11 @@ -115,6 +116,7 @@
    1.12     else
    1.13        AC_CHECK_FUNC(NSOpenGLGetVersion, [
    1.14           HAVE_NSGL='yes'
    1.15 +         VIDEO_DRIVERS="$VIDEO_DRIVERS nsgl"
    1.16           AC_DEFINE([HAVE_NSGL],1, [Have NSOpenGL support]) ] )
    1.17     fi
    1.18  
    1.19 @@ -125,17 +127,13 @@
    1.20        fi
    1.21        AC_CHECK_FUNC(glXQueryVersion, [
    1.22           HAVE_GLX='yes'
    1.23 +         VIDEO_DRIVERS="$VIDEO_DRIVERS glx"
    1.24           AC_DEFINE([HAVE_GLX], 1, [Have GLX support]) ] )
    1.25 -dnl   elif test "x$HAVE_GTK_OSX" = "xyes"; then
    1.26     fi
    1.27        
    1.28  ])
    1.29  
    1.30  
    1.31 -dnl OK, now decide which video driver(s) we can build
    1.32 -if test "x$HAVE_OSMESA" = "x" -a "x$HAVE_GLX" = "x" -a "x$HAVE_NSGL" = "x"; then
    1.33 -   echo "Warning: Building with no video support"
    1.34 -fi
    1.35  
    1.36  AM_CONDITIONAL(VIDEO_OSMESA, [test "x$HAVE_OSMESA" = "xyes"])
    1.37  AM_CONDITIONAL(VIDEO_GLX, [test "x$HAVE_GLX" = "xyes"])
    1.38 @@ -153,41 +151,40 @@
    1.39      i386|i486|i586|i686|x86_64)
    1.40  	SH4_TRANSLATOR="x86"
    1.41          AC_DEFINE_UNQUOTED(SH4_TRANSLATOR,[TARGET_X86], [SH4 Translator to use (if any)] );;
    1.42 -    *)
    1.43 -	echo "Warning: No translator available for $host. Building emulation core only";;
    1.44  esac
    1.45  AM_CONDITIONAL(BUILD_SH4X86, [test "$SH4_TRANSLATOR" = "x86" -o "$SH4_TRANSLATOR" = "x86_64"])
    1.46  AM_CONDITIONAL(BUILD_X86_64, [test "$SH4_TRANSLATOR" = "x86_64"])
    1.47  
    1.48  dnl ------------------ Optional driver support -------------------
    1.49  dnl Check for Apple CoreAudio
    1.50 -AC_CHECK_HEADER([AudioToolbox/AudioToolbox.h], [
    1.51 +AC_CHECK_HEADER([CoreAudio/CoreAudio.h], [
    1.52       HAVE_CORE_AUDIO=yes
    1.53 -     LIBS="$LIBS -framework AudioToolbox -framework AudioUnit"
    1.54 +     LIBS="$LIBS -framework CoreAudio"
    1.55 +     AUDIO_DRIVERS="$AUDIO_DRIVERS osx"
    1.56       AC_DEFINE([HAVE_CORE_AUDIO], 1, [Have Apple CoreAudio support]) ],[true ])
    1.57  AM_CONDITIONAL( AUDIO_OSX, [test "$HAVE_CORE_AUDIO" = 'yes'] )
    1.58  
    1.59  dnl Check for pulseaudio
    1.60  PKG_CHECK_MODULES(PULSE, [libpulse-simple], [
    1.61       HAVE_PULSE='yes'
    1.62 +     AUDIO_DRIVERS="$AUDIO_DRIVERS pulse"
    1.63       AC_DEFINE([HAVE_PULSE],1,[Have pulseaudio support]) ], [true])
    1.64  AM_CONDITIONAL( AUDIO_PULSE, [test "$HAVE_PULSE" = 'yes'] )
    1.65  
    1.66  dnl Check for esound
    1.67  PKG_CHECK_MODULES(ESOUND, [esound], [ 
    1.68       HAVE_ESOUND='yes'
    1.69 +     AUDIO_DRIVERS="$AUDIO_DRIVERS esd"
    1.70       AC_DEFINE([HAVE_ESOUND],1,[Have esound support]) ], [true])
    1.71  AM_CONDITIONAL( AUDIO_ESOUND, [test "$HAVE_ESOUND" = 'yes'] )
    1.72  
    1.73  dnl Check for alsa support
    1.74  PKG_CHECK_MODULES(ALSA, [alsa], [ 
    1.75       HAVE_ALSA='yes'
    1.76 +     AUDIO_DRIVERS="$AUDIO_DRIVERS alsa"
    1.77       AC_DEFINE([HAVE_ALSA],1,[Have alsa support]) ], [true])
    1.78  AM_CONDITIONAL( AUDIO_ALSA, [test "$HAVE_ALSA" = 'yes'] )
    1.79  
    1.80 -if test "x$HAVE_ESOUND" = "x" -a "x$HAVE_ALSA" = "x" -a "x$HAVE_PULSE" = "x"; then
    1.81 -   echo "Warning: Building without audio support"
    1.82 -fi
    1.83  
    1.84  dnl Check for linux cdrom device support
    1.85  AC_CHECK_HEADER([linux/cdrom.h], [HAVE_LINUX_CDROM_H=yes], [
    1.86 @@ -240,3 +237,37 @@
    1.87  test/Makefile
    1.88  ])
    1.89  
    1.90 +dnl ------------------------- Print out a summary ----------------------
    1.91 +
    1.92 +echo
    1.93 +echo "Configuration complete"
    1.94 +echo
    1.95 +
    1.96 +if test "x$HAVE_GTK" = x; then
    1.97 +  if test "x$HAVE_COCOA" = x; then
    1.98 +     echo "  User interface: none"
    1.99 +  else
   1.100 +     echo "  User interface: Cocoa"
   1.101 +  fi
   1.102 +else
   1.103 +  echo "  User interface: GTK"
   1.104 +fi
   1.105 +
   1.106 +if test "x$SH4_TRANSLATOR" = "x"; then
   1.107 +  echo "  SH4 translator: None (emulation core only)"
   1.108 +else
   1.109 +  echo "  SH4 translator: $SH4_TRANSLATOR"
   1.110 +fi
   1.111 +
   1.112 +if test "x$VIDEO_DRIVERS" = "x"; then
   1.113 +   echo "  Video drivers: none (no supported GL found)"
   1.114 +else
   1.115 +   echo "  Video drivers: $VIDEO_DRIVERS"
   1.116 +fi
   1.117 +
   1.118 +if test "x$AUDIO_DRIVERS" = "x"; then
   1.119 +   echo "  Audio drivers: none (no supported output devices found)"
   1.120 +else
   1.121 +   echo "  Audio drivers: $AUDIO_DRIVERS"
   1.122 +fi
   1.123 +