From 5071cb5c15b7e467037346d9ebc411b8a8e6fdd5 Mon Sep 17 00:00:00 2001 From: Edward Rudd Date: Sat, 25 Jan 2014 15:05:44 -0500 Subject: [PATCH] autoconf script tweaks - fix up chmodding sdl2-config - remove duplicate enable_atomic section - add pretty summary of what was found/enabled --- configure | 131 ++++++++++++++++++++++++++++++++++++++++++++++----- configure.in | 119 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 230 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 6fcddc3c77345..07bc1561be003 100755 --- a/configure +++ b/configure @@ -1507,7 +1507,6 @@ Optional Features: --enable-loadso Enable the shared object loading subsystem [[default=yes]] --enable-cpuinfo Enable the cpuinfo subsystem [[default=yes]] - --enable-atomic Enable the atomic operations [[default=yes]] --enable-assembly Enable assembly routines [[default=yes]] --enable-ssemath Allow GCC to use SSE floating point math [[default=no]] @@ -16821,6 +16820,8 @@ if test x$enable_atomic != xyes; then $as_echo "#define SDL_ATOMIC_DISABLED 1" >>confdefs.h +else + SUMMARY_modules="${SUMMARY_modules} atomic" fi # Check whether --enable-audio was given. if test "${enable_audio+set}" = set; then : @@ -16833,6 +16834,8 @@ if test x$enable_audio != xyes; then $as_echo "#define SDL_AUDIO_DISABLED 1" >>confdefs.h +else + SUMMARY_modules="${SUMMARY_modules} audio" fi # Check whether --enable-video was given. if test "${enable_video+set}" = set; then : @@ -16845,6 +16848,8 @@ if test x$enable_video != xyes; then $as_echo "#define SDL_VIDEO_DISABLED 1" >>confdefs.h +else + SUMMARY_modules="${SUMMARY_modules} video" fi # Check whether --enable-render was given. if test "${enable_render+set}" = set; then : @@ -16857,6 +16862,8 @@ if test x$enable_render != xyes; then $as_echo "#define SDL_RENDER_DISABLED 1" >>confdefs.h +else + SUMMARY_modules="${SUMMARY_modules} render" fi # Check whether --enable-events was given. if test "${enable_events+set}" = set; then : @@ -16869,6 +16876,8 @@ if test x$enable_events != xyes; then $as_echo "#define SDL_EVENTS_DISABLED 1" >>confdefs.h +else + SUMMARY_modules="${SUMMARY_modules} events" fi # Check whether --enable-joystick was given. if test "${enable_joystick+set}" = set; then : @@ -16881,6 +16890,8 @@ if test x$enable_joystick != xyes; then $as_echo "#define SDL_JOYSTICK_DISABLED 1" >>confdefs.h +else + SUMMARY_modules="${SUMMARY_modules} joystick" fi # Check whether --enable-haptic was given. if test "${enable_haptic+set}" = set; then : @@ -16893,6 +16904,8 @@ if test x$enable_haptic != xyes; then $as_echo "#define SDL_HAPTIC_DISABLED 1" >>confdefs.h +else + SUMMARY_modules="${SUMMARY_modules} haptic" fi # Check whether --enable-power was given. if test "${enable_power+set}" = set; then : @@ -16905,6 +16918,8 @@ if test x$enable_power != xyes; then $as_echo "#define SDL_POWER_DISABLED 1" >>confdefs.h +else + SUMMARY_modules="${SUMMARY_modules} power" fi # Check whether --enable-filesystem was given. if test "${enable_filesystem+set}" = set; then : @@ -16917,6 +16932,8 @@ if test x$enable_filesystem != xyes; then $as_echo "#define SDL_FILESYSTEM_DISABLED 1" >>confdefs.h +else + SUMMARY_modules="${SUMMARY_modules} filesystem" fi # Check whether --enable-threads was given. if test "${enable_threads+set}" = set; then : @@ -16929,6 +16946,8 @@ if test x$enable_threads != xyes; then $as_echo "#define SDL_THREADS_DISABLED 1" >>confdefs.h +else + SUMMARY_modules="${SUMMARY_modules} threads" fi # Check whether --enable-timers was given. if test "${enable_timers+set}" = set; then : @@ -16941,6 +16960,8 @@ if test x$enable_timers != xyes; then $as_echo "#define SDL_TIMERS_DISABLED 1" >>confdefs.h +else + SUMMARY_modules="${SUMMARY_modules} timers" fi # Check whether --enable-file was given. if test "${enable_file+set}" = set; then : @@ -16953,6 +16974,8 @@ if test x$enable_file != xyes; then $as_echo "#define SDL_FILE_DISABLED 1" >>confdefs.h +else + SUMMARY_modules="${SUMMARY_modules} file" fi # Check whether --enable-loadso was given. if test "${enable_loadso+set}" = set; then : @@ -16965,6 +16988,8 @@ if test x$enable_loadso != xyes; then $as_echo "#define SDL_LOADSO_DISABLED 1" >>confdefs.h +else + SUMMARY_modules="${SUMMARY_modules} loadso" fi # Check whether --enable-cpuinfo was given. if test "${enable_cpuinfo+set}" = set; then : @@ -16977,18 +17002,8 @@ if test x$enable_cpuinfo != xyes; then $as_echo "#define SDL_CPUINFO_DISABLED 1" >>confdefs.h -fi -# Check whether --enable-atomic was given. -if test "${enable_atomic+set}" = set; then : - enableval=$enable_atomic; else - enable_atomic=yes -fi - -if test x$enable_atomic != xyes; then - -$as_echo "#define SDL_ATOMIC_DISABLED 1" >>confdefs.h - + SUMMARY_modules="${SUMMARY_modules} cpuinfo" fi # Check whether --enable-assembly was given. if test "${enable_assembly+set}" = set; then : @@ -16998,6 +17013,8 @@ else fi if test x$enable_assembly = xyes; then + SUMMARY_modules="${SUMMARY_modules} assembly" + $as_echo "#define SDL_ASSEMBLY_ROUTINES 1" >>confdefs.h @@ -17083,6 +17100,7 @@ $as_echo "$have_gcc_mmx" >&6; } if test x$have_gcc_mmx = xyes; then EXTRA_CFLAGS="$EXTRA_CFLAGS $mmx_CFLAGS" + SUMMARY_math="${SUMMARY_math} mmx" fi fi @@ -17133,6 +17151,7 @@ $as_echo "$have_gcc_3dnow" >&6; } if test x$have_gcc_3dnow = xyes; then EXTRA_CFLAGS="$EXTRA_CFLAGS $amd3dnow_CFLAGS" + SUMMARY_math="${SUMMARY_math} 3dnow" fi fi @@ -17189,6 +17208,7 @@ $as_echo "$have_gcc_sse" >&6; } if test x$have_gcc_sse = xyes; then EXTRA_CFLAGS="$EXTRA_CFLAGS $sse_CFLAGS" + SUMMARY_math="${SUMMARY_math} sse" fi fi @@ -17245,6 +17265,7 @@ $as_echo "$have_gcc_sse2" >&6; } if test x$have_gcc_sse2 = xyes; then EXTRA_CFLAGS="$EXTRA_CFLAGS $sse2_CFLAGS" + SUMMARY_math="${SUMMARY_math} sse2" fi fi @@ -17393,6 +17414,7 @@ $as_echo "#define HAVE_ALTIVEC_H 1" >>confdefs.h fi EXTRA_CFLAGS="$EXTRA_CFLAGS $altivec_CFLAGS" + SUMMARY_math="${SUMMARY_math} altivec" fi fi fi @@ -17474,6 +17496,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_oss" >&5 $as_echo "$have_oss" >&6; } if test x$have_oss = xyes; then + SUMMARY_audio="${SUMMARY_audio} oss" $as_echo "#define SDL_AUDIO_DRIVER_OSS 1" >>confdefs.h @@ -17738,8 +17761,10 @@ cat >>confdefs.h <<_ACEOF #define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "$alsa_lib" _ACEOF + SUMMARY_audio="${SUMMARY_audio} alsa(dynamic)" else EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ALSA_LIBS" + SUMMARY_audio="${SUMMARY_audio} alsa" fi have_audio=yes fi @@ -18021,8 +18046,10 @@ cat >>confdefs.h <<_ACEOF #define SDL_AUDIO_DRIVER_ESD_DYNAMIC "$esd_lib" _ACEOF + SUMMARY_audio="${SUMMARY_audio} esd(dynamic)" else EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS" + SUMMARY_audio="${SUMMARY_audio} esd" fi have_audio=yes fi @@ -18124,6 +18151,7 @@ cat >>confdefs.h <<_ACEOF #define SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC "$pulseaudio_lib" _ACEOF + SUMMARY_audio="${SUMMARY_audio} pulse(dynamic)" case "$host" in # On Solaris, pulseaudio must be linked deferred explicitly @@ -18134,6 +18162,7 @@ _ACEOF esac else EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PULSEAUDIO_LIBS" + SUMMARY_audio="${SUMMARY_audio} pulse" fi have_audio=yes fi @@ -18252,8 +18281,10 @@ cat >>confdefs.h <<_ACEOF #define SDL_AUDIO_DRIVER_ARTS_DYNAMIC "$arts_lib" _ACEOF + SUMMARY_audio="${SUMMARY_audio} arts(dynamic)" else EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARTS_LIBS" + SUMMARY_audio="${SUMMARY_audio} arts" fi have_audio=yes fi @@ -18359,8 +18390,10 @@ cat >>confdefs.h <<_ACEOF #define SDL_AUDIO_DRIVER_NAS_DYNAMIC "$nas_lib" _ACEOF + SUMMARY_audio="${SUMMARY_audio} nas(dynamic)" else EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS" + SUMMARY_audio="${SUMMARY_audio} nas" fi @@ -18465,8 +18498,10 @@ cat >>confdefs.h <<_ACEOF #define SDL_AUDIO_DRIVER_SNDIO_DYNAMIC "$sndio_lib" _ACEOF + SUMMARY_audio="${SUMMARY_audio} sndio(dynamic)" else EXTRA_LDFLAGS="$EXTRA_LDFLAGS $SNDIO_LIBS" + SUMMARY_audio="${SUMMARY_audio} sndio" fi @@ -18493,6 +18528,7 @@ fi $as_echo "#define SDL_AUDIO_DRIVER_DISK 1" >>confdefs.h SOURCES="$SOURCES $srcdir/src/audio/disk/*.c" + SUMMARY_audio="${SUMMARY_audio} disk" fi } @@ -18510,6 +18546,7 @@ fi $as_echo "#define SDL_AUDIO_DRIVER_DUMMY 1" >>confdefs.h SOURCES="$SOURCES $srcdir/src/audio/dummy/*.c" + SUMMARY_audio="${SUMMARY_audio} dummy" fi } @@ -18785,9 +18822,11 @@ cat >>confdefs.h <<_ACEOF #define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON "$xkbcommon_lib" _ACEOF + SUMMARY_video="${SUMMARY_video} wayland(dynamic)" else enable_wayland_shared=no EXTRA_LDFLAGS="$EXTRA_LDFLAGS $WAYLAND_LIBS" + SUMMARY_video="${SUMMARY_video} wayland" fi have_video=yes fi @@ -19601,9 +19640,11 @@ cat >>confdefs.h <<_ACEOF #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "$x11ext_lib" _ACEOF + SUMMARY_video="${SUMMARY_video} x11(dynamic)" else enable_x11_shared=no EXTRA_LDFLAGS="$EXTRA_LDFLAGS $X_LIBS -lX11 -lXext" + SUMMARY_video="${SUMMARY_video} x11" fi have_video=yes @@ -19825,6 +19866,7 @@ fi $as_echo "#define SDL_VIDEO_DRIVER_X11_XCURSOR 1" >>confdefs.h + SUMMARY_video_x11="${SUMMARY_video_x11} xcursor" fi # Check whether --enable-video-x11-xinerama was given. if test "${enable_video_x11_xinerama+set}" = set; then : @@ -19906,6 +19948,7 @@ fi $as_echo "#define SDL_VIDEO_DRIVER_X11_XINERAMA 1" >>confdefs.h + SUMMARY_video_x11="${SUMMARY_video_x11} xinerama" fi # Check whether --enable-video-x11-xinput was given. if test "${enable_video_x11_xinput+set}" = set; then : @@ -19984,6 +20027,7 @@ fi fi fi if test x$definitely_enable_video_x11_xinput = xyes; then + SUMMARY_video_x11="${SUMMARY_video_x11} xinput2" $as_echo "#define SDL_VIDEO_DRIVER_X11_XINPUT2 1" >>confdefs.h @@ -20018,6 +20062,7 @@ if ac_fn_c_try_compile "$LINENO"; then : have_xinput2_multitouch=yes $as_echo "#define SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH 1" >>confdefs.h + SUMMARY_video_x11="${SUMMARY_video_x11} xinput2_multitouch" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -20104,6 +20149,7 @@ fi $as_echo "#define SDL_VIDEO_DRIVER_X11_XRANDR 1" >>confdefs.h + SUMMARY_video_x11="${SUMMARY_video_x11} xrandr" fi # Check whether --enable-video-x11-scrnsaver was given. if test "${enable_video_x11_scrnsaver+set}" = set; then : @@ -20184,6 +20230,7 @@ fi $as_echo "#define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1" >>confdefs.h + SUMMARY_video_x11="${SUMMARY_video_x11} xscrnsaver" fi # Check whether --enable-video-x11-xshape was given. if test "${enable_video_x11_xshape+set}" = set; then : @@ -20207,6 +20254,7 @@ fi $as_echo "#define SDL_VIDEO_DRIVER_X11_XSHAPE 1" >>confdefs.h + SUMMARY_video_x11="${SUMMARY_video_x11} xshape" fi fi # Check whether --enable-video-x11-vm was given. @@ -20289,6 +20337,7 @@ fi $as_echo "#define SDL_VIDEO_DRIVER_X11_XVIDMODE 1" >>confdefs.h + SUMMARY_video_x11="${SUMMARY_video_x11} xvidmode" fi fi fi @@ -20302,6 +20351,7 @@ $as_echo "#define SDL_VIDEO_DRIVER_HAIKU 1" >>confdefs.h SOURCES="$SOURCES $srcdir/src/video/haiku/*.cc" have_video=yes + SUMMARY_video="${SUMMARY_video} haiku" fi } @@ -20348,6 +20398,7 @@ $as_echo "$have_cocoa" >&6; } $as_echo "#define SDL_VIDEO_DRIVER_COCOA 1" >>confdefs.h SOURCES="$SOURCES $srcdir/src/video/cocoa/*.m" + SUMMARY_video="${SUMMARY_video} cocoa" have_video=yes fi fi @@ -20534,8 +20585,10 @@ cat >>confdefs.h <<_ACEOF #define SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC "$directfb_lib" _ACEOF + SUMMARY_video="${SUMMARY_video} directfb(dynamic)" else EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS" + SUMMARY_video="${SUMMARY_video} directfb" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $directfb_shared" >&5 $as_echo "$directfb_shared" >&6; } @@ -20641,8 +20694,10 @@ cat >>confdefs.h <<_ACEOF _ACEOF fusionsound_shared=yes + SUMMARY_audio="${SUMMARY_audio} fusionsound(dynamic)" else EXTRA_LDFLAGS="$EXTRA_LDFLAGS $FUSIONSOUND_LIBS" + SUMMARY_audio="${SUMMARY_audio} fusionsound" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fusionsound_shared" >&5 $as_echo "$fusionsound_shared" >&6; } @@ -20667,6 +20722,7 @@ $as_echo "#define SDL_VIDEO_DRIVER_DUMMY 1" >>confdefs.h SOURCES="$SOURCES $srcdir/src/video/dummy/*.c" have_video=yes + SUMMARY_video="${SUMMARY_video} dummy" fi } @@ -20717,6 +20773,7 @@ $as_echo "#define SDL_VIDEO_OPENGL_GLX 1" >>confdefs.h $as_echo "#define SDL_VIDEO_RENDER_OGL 1" >>confdefs.h + SUMMARY_video="${SUMMARY_video} opengl" fi fi } @@ -20796,6 +20853,7 @@ $as_echo "#define SDL_VIDEO_OPENGL_ES 1" >>confdefs.h $as_echo "#define SDL_VIDEO_RENDER_OGL_ES 1" >>confdefs.h + SUMMARY_video="${SUMMARY_video} opengl_es1" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL ES v2 headers" >&5 @@ -20831,6 +20889,7 @@ $as_echo "#define SDL_VIDEO_OPENGL_ES2 1" >>confdefs.h $as_echo "#define SDL_VIDEO_RENDER_OGL_ES2 1" >>confdefs.h + SUMMARY_video="${SUMMARY_video} opengl_es2" fi fi } @@ -20847,6 +20906,7 @@ $as_echo "#define SDL_VIDEO_OPENGL_WGL 1" >>confdefs.h $as_echo "#define SDL_VIDEO_RENDER_OGL 1" >>confdefs.h + SUMMARY_video="${SUMMARY_video} opengl" fi } @@ -20886,6 +20946,7 @@ $as_echo "#define SDL_VIDEO_OPENGL 1" >>confdefs.h $as_echo "#define SDL_VIDEO_OPENGL_EGL 1" >>confdefs.h + SUMMARY_video="${SUMMARY_video} opengl_es1" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL ES v2 headers" >&5 @@ -20924,6 +20985,7 @@ $as_echo "#define SDL_VIDEO_OPENGL_ES2 1" >>confdefs.h $as_echo "#define SDL_VIDEO_RENDER_OGL_ES2 1" >>confdefs.h + SUMMARY_video="${SUMMARY_video} opengl_es2" fi fi } @@ -20941,6 +21003,7 @@ $as_echo "#define SDL_VIDEO_OPENGL_HAIKU 1" >>confdefs.h $as_echo "#define SDL_VIDEO_RENDER_OGL 1" >>confdefs.h EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL" + SUMMARY_video="${SUMMARY_video} opengl" fi } @@ -20956,6 +21019,7 @@ $as_echo "#define SDL_VIDEO_OPENGL_CGL 1" >>confdefs.h $as_echo "#define SDL_VIDEO_RENDER_OGL 1" >>confdefs.h + SUMMARY_video="${SUMMARY_video} opengl" case "$host" in *-*-darwin*) if test x$enable_video_cocoa = xyes; then @@ -20999,6 +21063,7 @@ $as_echo "$use_input_events" >&6; } $as_echo "#define SDL_INPUT_LINUXEV 1" >>confdefs.h + SUMMARY_input="${SUMMARY_input} linuxev" fi } @@ -21038,6 +21103,7 @@ $as_echo "$use_input_kd" >&6; } $as_echo "#define SDL_INPUT_LINUXKD 1" >>confdefs.h + SUMMARY_input="${SUMMARY_input} linuxkd" fi } @@ -21181,6 +21247,7 @@ $as_echo "$enable_input_tslib" >&6; } $as_echo "#define SDL_INPUT_TSLIB 1" >>confdefs.h EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lts" + SUMMARY_input="${SUMMARY_input} ts" fi fi } @@ -21704,6 +21771,9 @@ fi + SUMMARY_video="${SUMMARY_video} directx" + SUMMARY_audio="${SUMMARY_audio} directx" + # FIXME: latest Cygwin finds dinput headers, but we die on other win32 headers. # FIXME: ...so force it off for now. case "$host" in @@ -23024,6 +23094,37 @@ __EOF__ ac_config_files="$ac_config_files Makefile:Makefile.in:Makefile.rules sdl2-config SDL2.spec sdl2.pc" +ac_config_commands="$ac_config_commands sdl2_config" + + +SUMMARY="SDL2 Configure Summary:\n" +if test x$enable_shared = xyes; then + SUMMARY="${SUMMARY}Building Shared Libraries\n" +fi +if test x$enable_static = xyes; then + SUMMARY="${SUMMARY}Building Static Libraries\n" +fi +SUMMARY="${SUMMARY}Enabled modules :${SUMMARY_modules}\n" +SUMMARY="${SUMMARY}Assembly Math :${SUMMARY_math}\n" +SUMMARY="${SUMMARY}Audio drivers :${SUMMARY_audio}\n" +SUMMARY="${SUMMARY}Video drivers :${SUMMARY_video}\n" +if test x$have_x = xyes; then + SUMMARY="${SUMMARY}X11 libraries :${SUMMARY_video_x11}\n" +fi +SUMMARY="${SUMMARY}Input drivers :${SUMMARY_input}\n" +if test x$enable_libudev = xyes; then + SUMMARY="${SUMMARY}Using libudev : YES\n" +else + SUMMARY="${SUMMARY}Using libudev : NO\n" +fi +if test x$have_dbus_dbus_h_hdr = xyes; then + SUMMARY="${SUMMARY}Using dbus : YES\n" +else + SUMMARY="${SUMMARY}Using dbus : NO\n" +fi +ac_config_commands="$ac_config_commands summary" + + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -24091,6 +24192,7 @@ fi +SUMMARY="$SUMMARY" _ACEOF @@ -24106,6 +24208,8 @@ do "sdl2-config") CONFIG_FILES="$CONFIG_FILES sdl2-config" ;; "SDL2.spec") CONFIG_FILES="$CONFIG_FILES SDL2.spec" ;; "sdl2.pc") CONFIG_FILES="$CONFIG_FILES sdl2.pc" ;; + "sdl2_config") CONFIG_COMMANDS="$CONFIG_COMMANDS sdl2_config" ;; + "summary") CONFIG_COMMANDS="$CONFIG_COMMANDS summary" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -25461,6 +25565,8 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX _LT_EOF ;; + "sdl2_config":C) chmod a+x sdl2-config ;; + "summary":C) echo -en "$SUMMARY" ;; esac done # for ac_tag @@ -25499,4 +25605,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -chmod a+x sdl2-config diff --git a/configure.in b/configure.in index 27eadba305191..a38abd4ba119c 100644 --- a/configure.in +++ b/configure.in @@ -348,95 +348,119 @@ AC_HELP_STRING([--enable-atomic], [Enable the atomic operations subsystem [[defa , enable_atomic=yes) if test x$enable_atomic != xyes; then AC_DEFINE(SDL_ATOMIC_DISABLED, 1, [ ]) +else + SUMMARY_modules="${SUMMARY_modules} atomic" fi AC_ARG_ENABLE(audio, AC_HELP_STRING([--enable-audio], [Enable the audio subsystem [[default=yes]]]), , enable_audio=yes) if test x$enable_audio != xyes; then AC_DEFINE(SDL_AUDIO_DISABLED, 1, [ ]) +else + SUMMARY_modules="${SUMMARY_modules} audio" fi AC_ARG_ENABLE(video, AC_HELP_STRING([--enable-video], [Enable the video subsystem [[default=yes]]]), , enable_video=yes) if test x$enable_video != xyes; then AC_DEFINE(SDL_VIDEO_DISABLED, 1, [ ]) +else + SUMMARY_modules="${SUMMARY_modules} video" fi AC_ARG_ENABLE(render, AC_HELP_STRING([--enable-render], [Enable the render subsystem [[default=yes]]]), , enable_render=yes) if test x$enable_render != xyes; then AC_DEFINE(SDL_RENDER_DISABLED, 1, [ ]) +else + SUMMARY_modules="${SUMMARY_modules} render" fi AC_ARG_ENABLE(events, AC_HELP_STRING([--enable-events], [Enable the events subsystem [[default=yes]]]), , enable_events=yes) if test x$enable_events != xyes; then AC_DEFINE(SDL_EVENTS_DISABLED, 1, [ ]) +else + SUMMARY_modules="${SUMMARY_modules} events" fi AC_ARG_ENABLE(joystick, AC_HELP_STRING([--enable-joystick], [Enable the joystick subsystem [[default=yes]]]), , enable_joystick=yes) if test x$enable_joystick != xyes; then AC_DEFINE(SDL_JOYSTICK_DISABLED, 1, [ ]) +else + SUMMARY_modules="${SUMMARY_modules} joystick" fi AC_ARG_ENABLE(haptic, AC_HELP_STRING([--enable-haptic], [Enable the haptic (force feedback) subsystem [[default=yes]]]), , enable_haptic=yes) if test x$enable_haptic != xyes; then AC_DEFINE(SDL_HAPTIC_DISABLED, 1, [ ]) +else + SUMMARY_modules="${SUMMARY_modules} haptic" fi AC_ARG_ENABLE(power, AC_HELP_STRING([--enable-power], [Enable the power subsystem [[default=yes]]]), , enable_power=yes) if test x$enable_power != xyes; then AC_DEFINE(SDL_POWER_DISABLED, 1, [ ]) +else + SUMMARY_modules="${SUMMARY_modules} power" fi AC_ARG_ENABLE(filesystem, AC_HELP_STRING([--enable-filesystem], [Enable the filesystem subsystem [[default=yes]]]), , enable_filesystem=yes) if test x$enable_filesystem != xyes; then AC_DEFINE(SDL_FILESYSTEM_DISABLED, 1, [ ]) +else + SUMMARY_modules="${SUMMARY_modules} filesystem" fi AC_ARG_ENABLE(threads, AC_HELP_STRING([--enable-threads], [Enable the threading subsystem [[default=yes]]]), , enable_threads=yes) if test x$enable_threads != xyes; then AC_DEFINE(SDL_THREADS_DISABLED, 1, [ ]) +else + SUMMARY_modules="${SUMMARY_modules} threads" fi AC_ARG_ENABLE(timers, AC_HELP_STRING([--enable-timers], [Enable the timer subsystem [[default=yes]]]), , enable_timers=yes) if test x$enable_timers != xyes; then AC_DEFINE(SDL_TIMERS_DISABLED, 1, [ ]) +else + SUMMARY_modules="${SUMMARY_modules} timers" fi AC_ARG_ENABLE(file, AC_HELP_STRING([--enable-file], [Enable the file subsystem [[default=yes]]]), , enable_file=yes) if test x$enable_file != xyes; then AC_DEFINE(SDL_FILE_DISABLED, 1, [ ]) +else + SUMMARY_modules="${SUMMARY_modules} file" fi AC_ARG_ENABLE(loadso, AC_HELP_STRING([--enable-loadso], [Enable the shared object loading subsystem [[default=yes]]]), , enable_loadso=yes) if test x$enable_loadso != xyes; then AC_DEFINE(SDL_LOADSO_DISABLED, 1, [ ]) +else + SUMMARY_modules="${SUMMARY_modules} loadso" fi AC_ARG_ENABLE(cpuinfo, AC_HELP_STRING([--enable-cpuinfo], [Enable the cpuinfo subsystem [[default=yes]]]), , enable_cpuinfo=yes) if test x$enable_cpuinfo != xyes; then AC_DEFINE(SDL_CPUINFO_DISABLED, 1, [ ]) -fi -AC_ARG_ENABLE(atomic, -AC_HELP_STRING([--enable-atomic], [Enable the atomic operations [[default=yes]]]), - , enable_atomic=yes) -if test x$enable_atomic != xyes; then - AC_DEFINE(SDL_ATOMIC_DISABLED, 1, [ ]) +else + SUMMARY_modules="${SUMMARY_modules} cpuinfo" fi AC_ARG_ENABLE(assembly, AC_HELP_STRING([--enable-assembly], [Enable assembly routines [[default=yes]]]), , enable_assembly=yes) if test x$enable_assembly = xyes; then + SUMMARY_modules="${SUMMARY_modules} assembly" + AC_DEFINE(SDL_ASSEMBLY_ROUTINES, 1, [ ]) # Make sure that we don't generate floating point code that would @@ -497,6 +521,7 @@ AC_HELP_STRING([--enable-mmx], [use MMX assembly routines [[default=yes]]]), if test x$have_gcc_mmx = xyes; then EXTRA_CFLAGS="$EXTRA_CFLAGS $mmx_CFLAGS" + SUMMARY_math="${SUMMARY_math} mmx" fi fi @@ -526,6 +551,7 @@ AC_HELP_STRING([--enable-3dnow], [use 3DNow! assembly routines [[default=yes]]]) if test x$have_gcc_3dnow = xyes; then EXTRA_CFLAGS="$EXTRA_CFLAGS $amd3dnow_CFLAGS" + SUMMARY_math="${SUMMARY_math} 3dnow" fi fi @@ -562,6 +588,7 @@ AC_HELP_STRING([--enable-sse], [use SSE assembly routines [[default=yes]]]), if test x$have_gcc_sse = xyes; then EXTRA_CFLAGS="$EXTRA_CFLAGS $sse_CFLAGS" + SUMMARY_math="${SUMMARY_math} sse" fi fi @@ -598,6 +625,7 @@ AC_HELP_STRING([--enable-sse2], [use SSE2 assembly routines [[default=no]]]), if test x$have_gcc_sse2 = xyes; then EXTRA_CFLAGS="$EXTRA_CFLAGS $sse2_CFLAGS" + SUMMARY_math="${SUMMARY_math} sse2" fi fi @@ -674,6 +702,7 @@ AC_HELP_STRING([--enable-altivec], [use Altivec assembly routines [[default=yes] AC_DEFINE(HAVE_ALTIVEC_H, 1, [ ]) fi EXTRA_CFLAGS="$EXTRA_CFLAGS $altivec_CFLAGS" + SUMMARY_math="${SUMMARY_math} altivec" fi fi fi @@ -720,6 +749,7 @@ AC_HELP_STRING([--enable-oss], [support the OSS audio API [[default=maybe]]]), fi AC_MSG_RESULT($have_oss) if test x$have_oss = xyes; then + SUMMARY_audio="${SUMMARY_audio} oss" AC_DEFINE(SDL_AUDIO_DRIVER_OSS, 1, [ ]) SOURCES="$SOURCES $srcdir/src/audio/dsp/*.c" have_audio=yes @@ -762,8 +792,10 @@ AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[de test x$enable_alsa_shared = xyes && test x$alsa_lib != x; then echo "-- dynamic libasound -> $alsa_lib" AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ALSA_DYNAMIC, "$alsa_lib", [ ]) + SUMMARY_audio="${SUMMARY_audio} alsa(dynamic)" else EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ALSA_LIBS" + SUMMARY_audio="${SUMMARY_audio} alsa" fi have_audio=yes fi @@ -795,8 +827,10 @@ AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[defa test x$enable_esd_shared = xyes && test x$esd_lib != x; then echo "-- dynamic libesd -> $esd_lib" AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib", [ ]) + SUMMARY_audio="${SUMMARY_audio} esd(dynamic)" else EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS" + SUMMARY_audio="${SUMMARY_audio} esd" fi have_audio=yes fi @@ -842,6 +876,7 @@ AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio suppor test x$enable_pulseaudio_shared = xyes && test x$pulseaudio_lib != x; then echo "-- dynamic libpulse-simple -> $pulseaudio_lib" AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC, "$pulseaudio_lib", [ ]) + SUMMARY_audio="${SUMMARY_audio} pulse(dynamic)" case "$host" in # On Solaris, pulseaudio must be linked deferred explicitly @@ -852,6 +887,7 @@ AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio suppor esac else EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PULSEAUDIO_LIBS" + SUMMARY_audio="${SUMMARY_audio} pulse" fi have_audio=yes fi @@ -900,8 +936,10 @@ AC_HELP_STRING([--enable-arts-shared], [dynamically load aRts audio support [[de test x$enable_arts_shared = xyes && test x$arts_lib != x; then echo "-- dynamic libartsc -> $arts_lib" AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib", [ ]) + SUMMARY_audio="${SUMMARY_audio} arts(dynamic)" else EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARTS_LIBS" + SUMMARY_audio="${SUMMARY_audio} arts" fi have_audio=yes fi @@ -949,8 +987,10 @@ AC_HELP_STRING([--enable-nas-shared], [dynamically load NAS audio support [[defa test x$enable_nas_shared = xyes && test x$nas_lib != x; then echo "-- dynamic libaudio -> $nas_lib" AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_NAS_DYNAMIC, "$nas_lib", [ ]) + SUMMARY_audio="${SUMMARY_audio} nas(dynamic)" else EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS" + SUMMARY_audio="${SUMMARY_audio} nas" fi AC_DEFINE(SDL_AUDIO_DRIVER_NAS, 1, [ ]) @@ -995,8 +1035,10 @@ AC_HELP_STRING([--enable-sndio-shared], [dynamically load sndio audio support [[ test x$enable_sndio_shared = xyes && test x$sndio_lib != x; then echo "-- dynamic libsndio -> $sndio_lib" AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_SNDIO_DYNAMIC, "$sndio_lib", [ ]) + SUMMARY_audio="${SUMMARY_audio} sndio(dynamic)" else EXTRA_LDFLAGS="$EXTRA_LDFLAGS $SNDIO_LIBS" + SUMMARY_audio="${SUMMARY_audio} sndio" fi AC_DEFINE(SDL_AUDIO_DRIVER_SNDIO, 1, [ ]) @@ -1016,6 +1058,7 @@ AC_HELP_STRING([--enable-diskaudio], [support the disk writer audio driver [[def if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then AC_DEFINE(SDL_AUDIO_DRIVER_DISK, 1, [ ]) SOURCES="$SOURCES $srcdir/src/audio/disk/*.c" + SUMMARY_audio="${SUMMARY_audio} disk" fi } @@ -1028,6 +1071,7 @@ AC_HELP_STRING([--enable-dummyaudio], [support the dummy audio driver [[default= if test x$enable_audio = xyes -a x$enable_dummyaudio = xyes; then AC_DEFINE(SDL_AUDIO_DRIVER_DUMMY, 1, [ ]) SOURCES="$SOURCES $srcdir/src/audio/dummy/*.c" + SUMMARY_audio="${SUMMARY_audio} dummy" fi } @@ -1187,9 +1231,11 @@ AC_HELP_STRING([--enable-wayland-shared], [dynamically load Wayland support [[de AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL, "$wayland_egl_lib", [ ]) AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR, "$wayland_cursor_lib", [ ]) AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON, "$xkbcommon_lib", [ ]) + SUMMARY_video="${SUMMARY_video} wayland(dynamic)" else enable_wayland_shared=no EXTRA_LDFLAGS="$EXTRA_LDFLAGS $WAYLAND_LIBS" + SUMMARY_video="${SUMMARY_video} wayland" fi have_video=yes fi @@ -1299,9 +1345,11 @@ AC_HELP_STRING([--enable-x11-shared], [dynamically load X11 support [[default=ma echo "-- dynamic libX11ext -> $x11ext_lib" AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib", [ ]) AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib", [ ]) + SUMMARY_video="${SUMMARY_video} x11(dynamic)" else enable_x11_shared=no EXTRA_LDFLAGS="$EXTRA_LDFLAGS $X_LIBS -lX11 -lXext" + SUMMARY_video="${SUMMARY_video} x11" fi have_video=yes @@ -1378,6 +1426,7 @@ AC_HELP_STRING([--enable-video-x11-xcursor], [enable X11 Xcursor support [[defau fi if test x$definitely_enable_video_x11_xcursor = xyes; then AC_DEFINE(SDL_VIDEO_DRIVER_X11_XCURSOR, 1, [ ]) + SUMMARY_video_x11="${SUMMARY_video_x11} xcursor" fi AC_ARG_ENABLE(video-x11-xinerama, AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]), @@ -1405,6 +1454,7 @@ AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[def fi if test x$definitely_enable_video_x11_xinerama = xyes; then AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA, 1, [ ]) + SUMMARY_video_x11="${SUMMARY_video_x11} xinerama" fi AC_ARG_ENABLE(video-x11-xinput, AC_HELP_STRING([--enable-video-x11-xinput], [enable X11 XInput extension for manymouse, tablets, etc [[default=yes]]]), @@ -1431,6 +1481,7 @@ AC_HELP_STRING([--enable-video-x11-xinput], [enable X11 XInput extension for man fi fi if test x$definitely_enable_video_x11_xinput = xyes; then + SUMMARY_video_x11="${SUMMARY_video_x11} xinput2" AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINPUT2, 1, [ ]) AC_MSG_CHECKING(for xinput2 multitouch) have_xinput2_multitouch=no @@ -1449,6 +1500,7 @@ XIAllowTouchEvents(Display *a,int b,unsigned int c,Window d,int f) ],[ have_xinput2_multitouch=yes AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH) + SUMMARY_video_x11="${SUMMARY_video_x11} xinput2_multitouch" ]) AC_MSG_RESULT($have_xinput2_multitouch) fi @@ -1478,6 +1530,7 @@ AC_HELP_STRING([--enable-video-x11-xrandr], [enable X11 Xrandr extension for ful fi if test x$definitely_enable_video_x11_xrandr = xyes; then AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR, 1, [ ]) + SUMMARY_video_x11="${SUMMARY_video_x11} xrandr" fi AC_ARG_ENABLE(video-x11-scrnsaver, AC_HELP_STRING([--enable-video-x11-scrnsaver], [enable X11 screensaver extension [[default=yes]]]), @@ -1504,6 +1557,7 @@ AC_HELP_STRING([--enable-video-x11-scrnsaver], [enable X11 screensaver extension fi if test x$definitely_enable_video_x11_scrnsaver = xyes; then AC_DEFINE(SDL_VIDEO_DRIVER_X11_XSCRNSAVER, 1, [ ]) + SUMMARY_video_x11="${SUMMARY_video_x11} xscrnsaver" fi AC_ARG_ENABLE(video-x11-xshape, AC_HELP_STRING([--enable-video-x11-xshape], [enable X11 XShape support [[default=yes]]]), @@ -1516,6 +1570,7 @@ AC_HELP_STRING([--enable-video-x11-xshape], [enable X11 XShape support [[default ]) if test x$have_shape_h_hdr = xyes; then AC_DEFINE(SDL_VIDEO_DRIVER_X11_XSHAPE, 1, [ ]) + SUMMARY_video_x11="${SUMMARY_video_x11} xshape" fi fi AC_ARG_ENABLE(video-x11-vm, @@ -1544,6 +1599,7 @@ AC_HELP_STRING([--enable-video-x11-vm], [use X11 VM extension for fullscreen [[d fi if test x$definitely_enable_video_x11_vm = xyes; then AC_DEFINE(SDL_VIDEO_DRIVER_X11_XVIDMODE, 1, [ ]) + SUMMARY_video_x11="${SUMMARY_video_x11} xvidmode" fi fi fi @@ -1556,6 +1612,7 @@ CheckHaikuVideo() AC_DEFINE(SDL_VIDEO_DRIVER_HAIKU, 1, [ ]) SOURCES="$SOURCES $srcdir/src/video/haiku/*.cc" have_video=yes + SUMMARY_video="${SUMMARY_video} haiku" fi } @@ -1582,6 +1639,7 @@ AC_HELP_STRING([--enable-video-cocoa], [use Cocoa video driver [[default=yes]]]) if test x$have_cocoa = xyes; then AC_DEFINE(SDL_VIDEO_DRIVER_COCOA, 1, [ ]) SOURCES="$SOURCES $srcdir/src/video/cocoa/*.m" + SUMMARY_video="${SUMMARY_video} cocoa" have_video=yes fi fi @@ -1655,8 +1713,10 @@ AC_MSG_WARN("directfb $directfb_lib") directfb_shared=yes echo "-- $directfb_lib_spec -> $directfb_lib" AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC, "$directfb_lib", [ ]) + SUMMARY_video="${SUMMARY_video} directfb(dynamic)" else EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS" + SUMMARY_video="${SUMMARY_video} directfb" fi AC_MSG_RESULT($directfb_shared) have_video=yes @@ -1704,8 +1764,10 @@ AC_HELP_STRING([--enable-fusionsound-shared], [dynamically load fusionsound audi test x$enable_fusionsound_shared = xyes; then AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC, "libfusionsound.so", [ ]) fusionsound_shared=yes + SUMMARY_audio="${SUMMARY_audio} fusionsound(dynamic)" else EXTRA_LDFLAGS="$EXTRA_LDFLAGS $FUSIONSOUND_LIBS" + SUMMARY_audio="${SUMMARY_audio} fusionsound" fi AC_MSG_RESULT($fusionsound_shared) @@ -1724,6 +1786,7 @@ AC_HELP_STRING([--enable-video-dummy], [use dummy video driver [[default=yes]]]) AC_DEFINE(SDL_VIDEO_DRIVER_DUMMY, 1, [ ]) SOURCES="$SOURCES $srcdir/src/video/dummy/*.c" have_video=yes + SUMMARY_video="${SUMMARY_video} dummy" fi } @@ -1750,6 +1813,7 @@ CheckOpenGLX11() AC_DEFINE(SDL_VIDEO_OPENGL, 1, [ ]) AC_DEFINE(SDL_VIDEO_OPENGL_GLX, 1, [ ]) AC_DEFINE(SDL_VIDEO_RENDER_OGL, 1, [ ]) + SUMMARY_video="${SUMMARY_video} opengl" fi fi } @@ -1789,6 +1853,7 @@ CheckOpenGLESX11() if test x$video_opengles_v1 = xyes; then AC_DEFINE(SDL_VIDEO_OPENGL_ES, 1, [ ]) AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES, 1, [ ]) + SUMMARY_video="${SUMMARY_video} opengl_es1" fi AC_MSG_CHECKING(for OpenGL ES v2 headers) @@ -1804,6 +1869,7 @@ CheckOpenGLESX11() if test x$video_opengles_v2 = xyes; then AC_DEFINE(SDL_VIDEO_OPENGL_ES2, 1, [ ]) AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES2, 1, [ ]) + SUMMARY_video="${SUMMARY_video} opengl_es2" fi fi } @@ -1815,6 +1881,7 @@ CheckWINDOWSGL() AC_DEFINE(SDL_VIDEO_OPENGL, 1, [ ]) AC_DEFINE(SDL_VIDEO_OPENGL_WGL, 1, [ ]) AC_DEFINE(SDL_VIDEO_RENDER_OGL, 1, [ ]) + SUMMARY_video="${SUMMARY_video} opengl" fi } @@ -1835,6 +1902,7 @@ CheckWINDOWSGLES() if test x$video_opengl_egl = xyes; then AC_DEFINE(SDL_VIDEO_OPENGL, 1, [ ]) AC_DEFINE(SDL_VIDEO_OPENGL_EGL, 1, [ ]) + SUMMARY_video="${SUMMARY_video} opengl_es1" fi AC_MSG_CHECKING(for OpenGL ES v2 headers) @@ -1851,6 +1919,7 @@ CheckWINDOWSGLES() AC_DEFINE(SDL_VIDEO_OPENGL, 1, [ ]) AC_DEFINE(SDL_VIDEO_OPENGL_ES2, 1, [ ]) AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES2, 1, [ ]) + SUMMARY_video="${SUMMARY_video} opengl_es2" fi fi } @@ -1863,6 +1932,7 @@ CheckHaikuGL() AC_DEFINE(SDL_VIDEO_OPENGL_HAIKU, 1, [ ]) AC_DEFINE(SDL_VIDEO_RENDER_OGL, 1, [ ]) EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL" + SUMMARY_video="${SUMMARY_video} opengl" fi } @@ -1873,6 +1943,7 @@ CheckMacGL() AC_DEFINE(SDL_VIDEO_OPENGL, 1, [ ]) AC_DEFINE(SDL_VIDEO_OPENGL_CGL, 1, [ ]) AC_DEFINE(SDL_VIDEO_RENDER_OGL, 1, [ ]) + SUMMARY_video="${SUMMARY_video} opengl" case "$host" in *-*-darwin*) if test x$enable_video_cocoa = xyes; then @@ -1900,6 +1971,7 @@ CheckInputEvents() AC_MSG_RESULT($use_input_events) if test x$use_input_events = xyes; then AC_DEFINE(SDL_INPUT_LINUXEV, 1, [ ]) + SUMMARY_input="${SUMMARY_input} linuxev" fi } @@ -1922,6 +1994,7 @@ CheckInputKD() AC_MSG_RESULT($use_input_kd) if test x$use_input_kd = xyes; then AC_DEFINE(SDL_INPUT_LINUXKD, 1, [ ]) + SUMMARY_input="${SUMMARY_input} linuxkd" fi } @@ -1984,6 +2057,7 @@ AC_HELP_STRING([--enable-input-tslib], [use the Touchscreen library for input [[ if test x$enable_input_tslib = xyes; then AC_DEFINE(SDL_INPUT_TSLIB, 1, [ ]) EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lts" + SUMMARY_input="${SUMMARY_input} ts" fi fi } @@ -2262,6 +2336,9 @@ AC_HELP_STRING([--enable-directx], [use DirectX for Windows audio/video [[defaul AC_CHECK_HEADER(dinput.h, have_dinput=yes) AC_CHECK_HEADER(xaudio2.h, have_xaudio2=yes) + SUMMARY_video="${SUMMARY_video} directx" + SUMMARY_audio="${SUMMARY_audio} directx" + # FIXME: latest Cygwin finds dinput headers, but we die on other win32 headers. # FIXME: ...so force it off for now. case "$host" in @@ -3076,5 +3153,33 @@ __EOF__ AC_CONFIG_FILES([ Makefile:Makefile.in:Makefile.rules sdl2-config SDL2.spec sdl2.pc ]) +AC_CONFIG_COMMANDS([sdl2_config],[chmod a+x sdl2-config]) + +SUMMARY="SDL2 Configure Summary:\n" +if test x$enable_shared = xyes; then + SUMMARY="${SUMMARY}Building Shared Libraries\n" +fi +if test x$enable_static = xyes; then + SUMMARY="${SUMMARY}Building Static Libraries\n" +fi +SUMMARY="${SUMMARY}Enabled modules :${SUMMARY_modules}\n" +SUMMARY="${SUMMARY}Assembly Math :${SUMMARY_math}\n" +SUMMARY="${SUMMARY}Audio drivers :${SUMMARY_audio}\n" +SUMMARY="${SUMMARY}Video drivers :${SUMMARY_video}\n" +if test x$have_x = xyes; then + SUMMARY="${SUMMARY}X11 libraries :${SUMMARY_video_x11}\n" +fi +SUMMARY="${SUMMARY}Input drivers :${SUMMARY_input}\n" +if test x$enable_libudev = xyes; then + SUMMARY="${SUMMARY}Using libudev : YES\n" +else + SUMMARY="${SUMMARY}Using libudev : NO\n" +fi +if test x$have_dbus_dbus_h_hdr = xyes; then + SUMMARY="${SUMMARY}Using dbus : YES\n" +else + SUMMARY="${SUMMARY}Using dbus : NO\n" +fi +AC_CONFIG_COMMANDS([summary], [echo -en "$SUMMARY"], [SUMMARY="$SUMMARY"]) + AC_OUTPUT -chmod a+x sdl2-config