1.1 --- a/configure Sun Jun 22 06:49:00 2008 +0000
1.2 +++ b/configure Sun Jun 22 08:59:39 2008 +0000
1.3 @@ -7774,6 +7774,7 @@
1.7 + VIDEO_DRIVERS="$VIDEO_DRIVERS osmesa"
1.9 cat >>confdefs.h <<\_ACEOF
1.10 #define HAVE_OSMESA 1
1.11 @@ -8093,6 +8094,7 @@
1.12 if test $ac_cv_func_NSOpenGLGetVersion = yes; then
1.15 + VIDEO_DRIVERS="$VIDEO_DRIVERS nsgl"
1.17 cat >>confdefs.h <<\_ACEOF
1.19 @@ -8194,6 +8196,7 @@
1.20 if test $ac_cv_func_glXQueryVersion = yes; then
1.23 + VIDEO_DRIVERS="$VIDEO_DRIVERS glx"
1.25 cat >>confdefs.h <<\_ACEOF
1.27 @@ -8208,9 +8211,6 @@
1.31 -if test "x$HAVE_OSMESA" = "x" -a "x$HAVE_GLX" = "x" -a "x$HAVE_NSGL" = "x"; then
1.32 - echo "Warning: Building with no video support"
1.37 @@ -8625,8 +8625,6 @@
1.38 #define SH4_TRANSLATOR TARGET_X86
1.42 - echo "Warning: No translator available for $host. Building emulation core only";;
1.46 @@ -8649,26 +8647,26 @@
1.50 -if test "${ac_cv_header_AudioToolbox_AudioToolbox_h+set}" = set; then
1.51 - { $as_echo "$as_me:$LINENO: checking for AudioToolbox/AudioToolbox.h" >&5
1.52 -$as_echo_n "checking for AudioToolbox/AudioToolbox.h... " >&6; }
1.53 -if test "${ac_cv_header_AudioToolbox_AudioToolbox_h+set}" = set; then
1.54 - $as_echo_n "(cached) " >&6
1.56 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_AudioToolbox_AudioToolbox_h" >&5
1.57 -$as_echo "$ac_cv_header_AudioToolbox_AudioToolbox_h" >&6; }
1.58 +if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
1.59 + { $as_echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
1.60 +$as_echo_n "checking for CoreAudio/CoreAudio.h... " >&6; }
1.61 +if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
1.62 + $as_echo_n "(cached) " >&6
1.64 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
1.65 +$as_echo "$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
1.67 # Is the header compilable?
1.68 -{ $as_echo "$as_me:$LINENO: checking AudioToolbox/AudioToolbox.h usability" >&5
1.69 -$as_echo_n "checking AudioToolbox/AudioToolbox.h usability... " >&6; }
1.70 -cat >conftest.$ac_ext <<_ACEOF
1.73 -cat confdefs.h >>conftest.$ac_ext
1.74 -cat >>conftest.$ac_ext <<_ACEOF
1.75 -/* end confdefs.h. */
1.76 -$ac_includes_default
1.77 -#include <AudioToolbox/AudioToolbox.h>
1.78 +{ $as_echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
1.79 +$as_echo_n "checking CoreAudio/CoreAudio.h usability... " >&6; }
1.80 +cat >conftest.$ac_ext <<_ACEOF
1.83 +cat confdefs.h >>conftest.$ac_ext
1.84 +cat >>conftest.$ac_ext <<_ACEOF
1.85 +/* end confdefs.h. */
1.86 +$ac_includes_default
1.87 +#include <CoreAudio/CoreAudio.h>
1.89 rm -f conftest.$ac_objext
1.90 if { (ac_try="$ac_compile"
1.91 @@ -8701,15 +8699,15 @@
1.92 $as_echo "$ac_header_compiler" >&6; }
1.94 # Is the header present?
1.95 -{ $as_echo "$as_me:$LINENO: checking AudioToolbox/AudioToolbox.h presence" >&5
1.96 -$as_echo_n "checking AudioToolbox/AudioToolbox.h presence... " >&6; }
1.97 -cat >conftest.$ac_ext <<_ACEOF
1.100 -cat confdefs.h >>conftest.$ac_ext
1.101 -cat >>conftest.$ac_ext <<_ACEOF
1.102 -/* end confdefs.h. */
1.103 -#include <AudioToolbox/AudioToolbox.h>
1.104 +{ $as_echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
1.105 +$as_echo_n "checking CoreAudio/CoreAudio.h presence... " >&6; }
1.106 +cat >conftest.$ac_ext <<_ACEOF
1.109 +cat confdefs.h >>conftest.$ac_ext
1.110 +cat >>conftest.$ac_ext <<_ACEOF
1.111 +/* end confdefs.h. */
1.112 +#include <CoreAudio/CoreAudio.h>
1.114 if { (ac_try="$ac_cpp conftest.$ac_ext"
1.115 case "(($ac_try" in
1.116 @@ -8743,43 +8741,44 @@
1.117 # So? What about this header?
1.118 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
1.120 - { $as_echo "$as_me:$LINENO: WARNING: AudioToolbox/AudioToolbox.h: accepted by the compiler, rejected by the preprocessor!" >&5
1.121 -$as_echo "$as_me: WARNING: AudioToolbox/AudioToolbox.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.122 - { $as_echo "$as_me:$LINENO: WARNING: AudioToolbox/AudioToolbox.h: proceeding with the compiler's result" >&5
1.123 -$as_echo "$as_me: WARNING: AudioToolbox/AudioToolbox.h: proceeding with the compiler's result" >&2;}
1.124 + { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
1.125 +$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.126 + { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&5
1.127 +$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&2;}
1.128 ac_header_preproc=yes
1.131 - { $as_echo "$as_me:$LINENO: WARNING: AudioToolbox/AudioToolbox.h: present but cannot be compiled" >&5
1.132 -$as_echo "$as_me: WARNING: AudioToolbox/AudioToolbox.h: present but cannot be compiled" >&2;}
1.133 - { $as_echo "$as_me:$LINENO: WARNING: AudioToolbox/AudioToolbox.h: check for missing prerequisite headers?" >&5
1.134 -$as_echo "$as_me: WARNING: AudioToolbox/AudioToolbox.h: check for missing prerequisite headers?" >&2;}
1.135 - { $as_echo "$as_me:$LINENO: WARNING: AudioToolbox/AudioToolbox.h: see the Autoconf documentation" >&5
1.136 -$as_echo "$as_me: WARNING: AudioToolbox/AudioToolbox.h: see the Autoconf documentation" >&2;}
1.137 - { $as_echo "$as_me:$LINENO: WARNING: AudioToolbox/AudioToolbox.h: section \"Present But Cannot Be Compiled\"" >&5
1.138 -$as_echo "$as_me: WARNING: AudioToolbox/AudioToolbox.h: section \"Present But Cannot Be Compiled\"" >&2;}
1.139 - { $as_echo "$as_me:$LINENO: WARNING: AudioToolbox/AudioToolbox.h: proceeding with the preprocessor's result" >&5
1.140 -$as_echo "$as_me: WARNING: AudioToolbox/AudioToolbox.h: proceeding with the preprocessor's result" >&2;}
1.141 - { $as_echo "$as_me:$LINENO: WARNING: AudioToolbox/AudioToolbox.h: in the future, the compiler will take precedence" >&5
1.142 -$as_echo "$as_me: WARNING: AudioToolbox/AudioToolbox.h: in the future, the compiler will take precedence" >&2;}
1.146 -{ $as_echo "$as_me:$LINENO: checking for AudioToolbox/AudioToolbox.h" >&5
1.147 -$as_echo_n "checking for AudioToolbox/AudioToolbox.h... " >&6; }
1.148 -if test "${ac_cv_header_AudioToolbox_AudioToolbox_h+set}" = set; then
1.149 - $as_echo_n "(cached) " >&6
1.151 - ac_cv_header_AudioToolbox_AudioToolbox_h=$ac_header_preproc
1.153 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_AudioToolbox_AudioToolbox_h" >&5
1.154 -$as_echo "$ac_cv_header_AudioToolbox_AudioToolbox_h" >&6; }
1.157 -if test $ac_cv_header_AudioToolbox_AudioToolbox_h = yes; then
1.158 + { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
1.159 +$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
1.160 + { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&5
1.161 +$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&2;}
1.162 + { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
1.163 +$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
1.164 + { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: section \"Present But Cannot Be Compiled\"" >&5
1.165 +$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: section \"Present But Cannot Be Compiled\"" >&2;}
1.166 + { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
1.167 +$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
1.168 + { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
1.169 +$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
1.173 +{ $as_echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
1.174 +$as_echo_n "checking for CoreAudio/CoreAudio.h... " >&6; }
1.175 +if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
1.176 + $as_echo_n "(cached) " >&6
1.178 + ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
1.180 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
1.181 +$as_echo "$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
1.184 +if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
1.186 HAVE_CORE_AUDIO=yes
1.187 - LIBS="$LIBS -framework AudioToolbox -framework AudioUnit"
1.188 + LIBS="$LIBS -framework CoreAudio"
1.189 + AUDIO_DRIVERS="$AUDIO_DRIVERS osx"
1.191 cat >>confdefs.h <<\_ACEOF
1.192 #define HAVE_CORE_AUDIO 1
1.193 @@ -8872,6 +8871,7 @@
1.194 $as_echo "yes" >&6; }
1.197 + AUDIO_DRIVERS="$AUDIO_DRIVERS pulse"
1.199 cat >>confdefs.h <<\_ACEOF
1.200 #define HAVE_PULSE 1
1.201 @@ -8960,6 +8960,7 @@
1.202 $as_echo "yes" >&6; }
1.205 + AUDIO_DRIVERS="$AUDIO_DRIVERS esd"
1.207 cat >>confdefs.h <<\_ACEOF
1.208 #define HAVE_ESOUND 1
1.209 @@ -9048,6 +9049,7 @@
1.210 $as_echo "yes" >&6; }
1.213 + AUDIO_DRIVERS="$AUDIO_DRIVERS alsa"
1.215 cat >>confdefs.h <<\_ACEOF
1.216 #define HAVE_ALSA 1
1.217 @@ -9065,9 +9067,6 @@
1.221 -if test "x$HAVE_ESOUND" = "x" -a "x$HAVE_ALSA" = "x" -a "x$HAVE_PULSE" = "x"; then
1.222 - echo "Warning: Building without audio support"
1.225 if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
1.226 { $as_echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5
1.227 @@ -12790,3 +12789,36 @@
1.233 +echo "Configuration complete"
1.236 +if test "x$HAVE_GTK" = x; then
1.237 + if test "x$HAVE_COCOA" = x; then
1.238 + echo " User interface: none"
1.240 + echo " User interface: Cocoa"
1.243 + echo " User interface: GTK"
1.246 +if test "x$SH4_TRANSLATOR" = "x"; then
1.247 + echo " SH4 translator: None (emulation core only)"
1.249 + echo " SH4 translator: $SH4_TRANSLATOR"
1.252 +if test "x$VIDEO_DRIVERS" = "x"; then
1.253 + echo " Video drivers: none (no supported GL found)"
1.255 + echo " Video drivers: $VIDEO_DRIVERS"
1.258 +if test "x$AUDIO_DRIVERS" = "x"; then
1.259 + echo " Audio drivers: none (no supported output devices found)"
1.261 + echo " Audio drivers: $AUDIO_DRIVERS"