revision 702:d39fc81e9630
summary |
tree |
shortlog |
changelog |
graph |
changeset |
raw | bz2 | zip | gz changeset | 702:d39fc81e9630 |
parent | 701:1ff36bb68c79 |
child | 703:585c66692be7 |
author | nkeynes |
date | Sun Jun 22 08:59:39 2008 +0000 (15 years ago) |
Add a tidy summary at the end of the configure script
1.1 --- a/configure Sun Jun 22 07:43:02 2008 +00001.2 +++ b/configure Sun Jun 22 08:59:39 2008 +00001.3 @@ -7774,6 +7774,7 @@1.6 HAVE_OSMESA='yes'1.7 + VIDEO_DRIVERS="$VIDEO_DRIVERS osmesa"1.9 cat >>confdefs.h <<\_ACEOF1.10 #define HAVE_OSMESA 11.11 @@ -8093,6 +8094,7 @@1.12 if test $ac_cv_func_NSOpenGLGetVersion = yes; then1.14 HAVE_NSGL='yes'1.15 + VIDEO_DRIVERS="$VIDEO_DRIVERS nsgl"1.17 cat >>confdefs.h <<\_ACEOF1.18 #define HAVE_NSGL 11.19 @@ -8194,6 +8196,7 @@1.20 if test $ac_cv_func_glXQueryVersion = yes; then1.22 HAVE_GLX='yes'1.23 + VIDEO_DRIVERS="$VIDEO_DRIVERS glx"1.25 cat >>confdefs.h <<\_ACEOF1.26 #define HAVE_GLX 11.27 @@ -8208,9 +8211,6 @@1.31 -if test "x$HAVE_OSMESA" = "x" -a "x$HAVE_GLX" = "x" -a "x$HAVE_NSGL" = "x"; then1.32 - echo "Warning: Building with no video support"1.33 -fi1.37 @@ -8625,8 +8625,6 @@1.38 #define SH4_TRANSLATOR TARGET_X861.39 _ACEOF1.40 ;;1.41 - *)1.42 - echo "Warning: No translator available for $host. Building emulation core only";;1.43 esac1.46 @@ -8649,26 +8647,26 @@1.47 fi1.50 -if test "${ac_cv_header_AudioToolbox_AudioToolbox_h+set}" = set; then1.51 - { $as_echo "$as_me:$LINENO: checking for AudioToolbox/AudioToolbox.h" >&51.52 -$as_echo_n "checking for AudioToolbox/AudioToolbox.h... " >&6; }1.53 -if test "${ac_cv_header_AudioToolbox_AudioToolbox_h+set}" = set; then1.54 - $as_echo_n "(cached) " >&61.55 -fi1.56 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_AudioToolbox_AudioToolbox_h" >&51.57 -$as_echo "$ac_cv_header_AudioToolbox_AudioToolbox_h" >&6; }1.58 +if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then1.59 + { $as_echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&51.60 +$as_echo_n "checking for CoreAudio/CoreAudio.h... " >&6; }1.61 +if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then1.62 + $as_echo_n "(cached) " >&61.63 +fi1.64 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&51.65 +$as_echo "$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }1.66 else1.67 # Is the header compilable?1.68 -{ $as_echo "$as_me:$LINENO: checking AudioToolbox/AudioToolbox.h usability" >&51.69 -$as_echo_n "checking AudioToolbox/AudioToolbox.h usability... " >&6; }1.70 -cat >conftest.$ac_ext <<_ACEOF1.71 -/* confdefs.h. */1.72 -_ACEOF1.73 -cat confdefs.h >>conftest.$ac_ext1.74 -cat >>conftest.$ac_ext <<_ACEOF1.75 -/* end confdefs.h. */1.76 -$ac_includes_default1.77 -#include <AudioToolbox/AudioToolbox.h>1.78 +{ $as_echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&51.79 +$as_echo_n "checking CoreAudio/CoreAudio.h usability... " >&6; }1.80 +cat >conftest.$ac_ext <<_ACEOF1.81 +/* confdefs.h. */1.82 +_ACEOF1.83 +cat confdefs.h >>conftest.$ac_ext1.84 +cat >>conftest.$ac_ext <<_ACEOF1.85 +/* end confdefs.h. */1.86 +$ac_includes_default1.87 +#include <CoreAudio/CoreAudio.h>1.88 _ACEOF1.89 rm -f conftest.$ac_objext1.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" >&51.96 -$as_echo_n "checking AudioToolbox/AudioToolbox.h presence... " >&6; }1.97 -cat >conftest.$ac_ext <<_ACEOF1.98 -/* confdefs.h. */1.99 -_ACEOF1.100 -cat confdefs.h >>conftest.$ac_ext1.101 -cat >>conftest.$ac_ext <<_ACEOF1.102 -/* end confdefs.h. */1.103 -#include <AudioToolbox/AudioToolbox.h>1.104 +{ $as_echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&51.105 +$as_echo_n "checking CoreAudio/CoreAudio.h presence... " >&6; }1.106 +cat >conftest.$ac_ext <<_ACEOF1.107 +/* confdefs.h. */1.108 +_ACEOF1.109 +cat confdefs.h >>conftest.$ac_ext1.110 +cat >>conftest.$ac_ext <<_ACEOF1.111 +/* end confdefs.h. */1.112 +#include <CoreAudio/CoreAudio.h>1.113 _ACEOF1.114 if { (ac_try="$ac_cpp conftest.$ac_ext"1.115 case "(($ac_try" in1.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 in1.119 yes:no: )1.120 - { $as_echo "$as_me:$LINENO: WARNING: AudioToolbox/AudioToolbox.h: accepted by the compiler, rejected by the preprocessor!" >&51.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" >&51.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!" >&51.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" >&51.127 +$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&2;}1.128 ac_header_preproc=yes1.129 ;;1.130 no:yes:* )1.131 - { $as_echo "$as_me:$LINENO: WARNING: AudioToolbox/AudioToolbox.h: present but cannot be compiled" >&51.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?" >&51.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" >&51.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\"" >&51.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" >&51.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" >&51.142 -$as_echo "$as_me: WARNING: AudioToolbox/AudioToolbox.h: in the future, the compiler will take precedence" >&2;}1.143 -1.144 - ;;1.145 -esac1.146 -{ $as_echo "$as_me:$LINENO: checking for AudioToolbox/AudioToolbox.h" >&51.147 -$as_echo_n "checking for AudioToolbox/AudioToolbox.h... " >&6; }1.148 -if test "${ac_cv_header_AudioToolbox_AudioToolbox_h+set}" = set; then1.149 - $as_echo_n "(cached) " >&61.150 -else1.151 - ac_cv_header_AudioToolbox_AudioToolbox_h=$ac_header_preproc1.152 -fi1.153 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_AudioToolbox_AudioToolbox_h" >&51.154 -$as_echo "$ac_cv_header_AudioToolbox_AudioToolbox_h" >&6; }1.155 -1.156 -fi1.157 -if test $ac_cv_header_AudioToolbox_AudioToolbox_h = yes; then1.158 + { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&51.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?" >&51.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" >&51.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\"" >&51.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" >&51.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" >&51.169 +$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}1.170 +1.171 + ;;1.172 +esac1.173 +{ $as_echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&51.174 +$as_echo_n "checking for CoreAudio/CoreAudio.h... " >&6; }1.175 +if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then1.176 + $as_echo_n "(cached) " >&61.177 +else1.178 + ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc1.179 +fi1.180 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&51.181 +$as_echo "$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }1.182 +1.183 +fi1.184 +if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then1.186 HAVE_CORE_AUDIO=yes1.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 <<\_ACEOF1.192 #define HAVE_CORE_AUDIO 11.193 @@ -8872,6 +8871,7 @@1.194 $as_echo "yes" >&6; }1.196 HAVE_PULSE='yes'1.197 + AUDIO_DRIVERS="$AUDIO_DRIVERS pulse"1.199 cat >>confdefs.h <<\_ACEOF1.200 #define HAVE_PULSE 11.201 @@ -8960,6 +8960,7 @@1.202 $as_echo "yes" >&6; }1.204 HAVE_ESOUND='yes'1.205 + AUDIO_DRIVERS="$AUDIO_DRIVERS esd"1.207 cat >>confdefs.h <<\_ACEOF1.208 #define HAVE_ESOUND 11.209 @@ -9048,6 +9049,7 @@1.210 $as_echo "yes" >&6; }1.212 HAVE_ALSA='yes'1.213 + AUDIO_DRIVERS="$AUDIO_DRIVERS alsa"1.215 cat >>confdefs.h <<\_ACEOF1.216 #define HAVE_ALSA 11.217 @@ -9065,9 +9067,6 @@1.218 fi1.221 -if test "x$HAVE_ESOUND" = "x" -a "x$HAVE_ALSA" = "x" -a "x$HAVE_PULSE" = "x"; then1.222 - echo "Warning: Building without audio support"1.223 -fi1.225 if test "${ac_cv_header_linux_cdrom_h+set}" = set; then1.226 { $as_echo "$as_me:$LINENO: checking for linux/cdrom.h" >&51.227 @@ -12790,3 +12789,36 @@1.228 fi1.231 +1.232 +echo1.233 +echo "Configuration complete"1.234 +echo1.235 +1.236 +if test "x$HAVE_GTK" = x; then1.237 + if test "x$HAVE_COCOA" = x; then1.238 + echo " User interface: none"1.239 + else1.240 + echo " User interface: Cocoa"1.241 + fi1.242 +else1.243 + echo " User interface: GTK"1.244 +fi1.245 +1.246 +if test "x$SH4_TRANSLATOR" = "x"; then1.247 + echo " SH4 translator: None (emulation core only)"1.248 +else1.249 + echo " SH4 translator: $SH4_TRANSLATOR"1.250 +fi1.251 +1.252 +if test "x$VIDEO_DRIVERS" = "x"; then1.253 + echo " Video drivers: none (no supported GL found)"1.254 +else1.255 + echo " Video drivers: $VIDEO_DRIVERS"1.256 +fi1.257 +1.258 +if test "x$AUDIO_DRIVERS" = "x"; then1.259 + echo " Audio drivers: none (no supported output devices found)"1.260 +else1.261 + echo " Audio drivers: $AUDIO_DRIVERS"1.262 +fi1.263 +
2.1 --- a/configure.in Sun Jun 22 07:43:02 2008 +00002.2 +++ b/configure.in Sun Jun 22 08:59:39 2008 +00002.3 @@ -103,6 +103,7 @@2.4 AC_CHECK_HEADER([GL/osmesa.h], [],2.5 [AC_MSG_FAILURE( [--with-osmesa was given, but osmesa.h could not be found])])2.6 HAVE_OSMESA='yes'2.7 + VIDEO_DRIVERS="$VIDEO_DRIVERS osmesa"2.8 AC_DEFINE([HAVE_OSMESA],1,[Building with the OSMesa video driver]) ], [2.10 dnl Otherwise we want a real GL library (unless we're on darwin, in which case it's already2.11 @@ -115,6 +116,7 @@2.12 else2.13 AC_CHECK_FUNC(NSOpenGLGetVersion, [2.14 HAVE_NSGL='yes'2.15 + VIDEO_DRIVERS="$VIDEO_DRIVERS nsgl"2.16 AC_DEFINE([HAVE_NSGL],1, [Have NSOpenGL support]) ] )2.17 fi2.19 @@ -125,17 +127,13 @@2.20 fi2.21 AC_CHECK_FUNC(glXQueryVersion, [2.22 HAVE_GLX='yes'2.23 + VIDEO_DRIVERS="$VIDEO_DRIVERS glx"2.24 AC_DEFINE([HAVE_GLX], 1, [Have GLX support]) ] )2.25 -dnl elif test "x$HAVE_GTK_OSX" = "xyes"; then2.26 fi2.28 ])2.31 -dnl OK, now decide which video driver(s) we can build2.32 -if test "x$HAVE_OSMESA" = "x" -a "x$HAVE_GLX" = "x" -a "x$HAVE_NSGL" = "x"; then2.33 - echo "Warning: Building with no video support"2.34 -fi2.36 AM_CONDITIONAL(VIDEO_OSMESA, [test "x$HAVE_OSMESA" = "xyes"])2.37 AM_CONDITIONAL(VIDEO_GLX, [test "x$HAVE_GLX" = "xyes"])2.38 @@ -153,41 +151,40 @@2.39 i386|i486|i586|i686|x86_64)2.40 SH4_TRANSLATOR="x86"2.41 AC_DEFINE_UNQUOTED(SH4_TRANSLATOR,[TARGET_X86], [SH4 Translator to use (if any)] );;2.42 - *)2.43 - echo "Warning: No translator available for $host. Building emulation core only";;2.44 esac2.45 AM_CONDITIONAL(BUILD_SH4X86, [test "$SH4_TRANSLATOR" = "x86" -o "$SH4_TRANSLATOR" = "x86_64"])2.46 AM_CONDITIONAL(BUILD_X86_64, [test "$SH4_TRANSLATOR" = "x86_64"])2.48 dnl ------------------ Optional driver support -------------------2.49 dnl Check for Apple CoreAudio2.50 -AC_CHECK_HEADER([AudioToolbox/AudioToolbox.h], [2.51 +AC_CHECK_HEADER([CoreAudio/CoreAudio.h], [2.52 HAVE_CORE_AUDIO=yes2.53 - LIBS="$LIBS -framework AudioToolbox -framework AudioUnit"2.54 + LIBS="$LIBS -framework CoreAudio"2.55 + AUDIO_DRIVERS="$AUDIO_DRIVERS osx"2.56 AC_DEFINE([HAVE_CORE_AUDIO], 1, [Have Apple CoreAudio support]) ],[true ])2.57 AM_CONDITIONAL( AUDIO_OSX, [test "$HAVE_CORE_AUDIO" = 'yes'] )2.59 dnl Check for pulseaudio2.60 PKG_CHECK_MODULES(PULSE, [libpulse-simple], [2.61 HAVE_PULSE='yes'2.62 + AUDIO_DRIVERS="$AUDIO_DRIVERS pulse"2.63 AC_DEFINE([HAVE_PULSE],1,[Have pulseaudio support]) ], [true])2.64 AM_CONDITIONAL( AUDIO_PULSE, [test "$HAVE_PULSE" = 'yes'] )2.66 dnl Check for esound2.67 PKG_CHECK_MODULES(ESOUND, [esound], [2.68 HAVE_ESOUND='yes'2.69 + AUDIO_DRIVERS="$AUDIO_DRIVERS esd"2.70 AC_DEFINE([HAVE_ESOUND],1,[Have esound support]) ], [true])2.71 AM_CONDITIONAL( AUDIO_ESOUND, [test "$HAVE_ESOUND" = 'yes'] )2.73 dnl Check for alsa support2.74 PKG_CHECK_MODULES(ALSA, [alsa], [2.75 HAVE_ALSA='yes'2.76 + AUDIO_DRIVERS="$AUDIO_DRIVERS alsa"2.77 AC_DEFINE([HAVE_ALSA],1,[Have alsa support]) ], [true])2.78 AM_CONDITIONAL( AUDIO_ALSA, [test "$HAVE_ALSA" = 'yes'] )2.80 -if test "x$HAVE_ESOUND" = "x" -a "x$HAVE_ALSA" = "x" -a "x$HAVE_PULSE" = "x"; then2.81 - echo "Warning: Building without audio support"2.82 -fi2.84 dnl Check for linux cdrom device support2.85 AC_CHECK_HEADER([linux/cdrom.h], [HAVE_LINUX_CDROM_H=yes], [2.86 @@ -240,3 +237,37 @@2.87 test/Makefile2.88 ])2.90 +dnl ------------------------- Print out a summary ----------------------2.91 +2.92 +echo2.93 +echo "Configuration complete"2.94 +echo2.95 +2.96 +if test "x$HAVE_GTK" = x; then2.97 + if test "x$HAVE_COCOA" = x; then2.98 + echo " User interface: none"2.99 + else2.100 + echo " User interface: Cocoa"2.101 + fi2.102 +else2.103 + echo " User interface: GTK"2.104 +fi2.105 +2.106 +if test "x$SH4_TRANSLATOR" = "x"; then2.107 + echo " SH4 translator: None (emulation core only)"2.108 +else2.109 + echo " SH4 translator: $SH4_TRANSLATOR"2.110 +fi2.111 +2.112 +if test "x$VIDEO_DRIVERS" = "x"; then2.113 + echo " Video drivers: none (no supported GL found)"2.114 +else2.115 + echo " Video drivers: $VIDEO_DRIVERS"2.116 +fi2.117 +2.118 +if test "x$AUDIO_DRIVERS" = "x"; then2.119 + echo " Audio drivers: none (no supported output devices found)"2.120 +else2.121 + echo " Audio drivers: $AUDIO_DRIVERS"2.122 +fi2.123 +
.