Module: wine Branch: master Commit: 98cb21f74328ac5d893ba8302158eaffbec7836b URL: http://source.winehq.org/git/wine.git/?a=commit;h=98cb21f74328ac5d893ba83021...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Mar 17 11:42:17 2011 +0100
configure: Don't build winmm drivers when their backend library is missing.
---
configure | 10 ++++++++++ configure.ac | 11 +++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/configure b/configure index 8790041..09cc4aa 100755 --- a/configure +++ b/configure @@ -12070,6 +12070,16 @@ _ACEOF
fi
+test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} +test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} +test -n "$NASLIBS" || enable_winenas_drv=${enable_winenas_drv:-no} +test -n "$ESDLIBS" || enable_wineesd_drv=${enable_wineesd_drv:-no} +test -n "$ac_cv_lib_soname_jack" || enable_winejack_drv=${enable_winejack_drv:-no} +test "$ac_cv_header_sys_soundcard_h" = "yes" -o \ + "$ac_cv_header_machine_soundcard_h" = "yes" -o \ + "$ac_cv_header_soundcard_h" = "yes" || enable_wineoss_drv=${enable_wineoss_drv:-no} +test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} + if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \ "$ac_cv_header_sys_soundcard_h" != "yes" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ diff --git a/configure.ac b/configure.ac index b16b9e9..448975e 100644 --- a/configure.ac +++ b/configure.ac @@ -1660,6 +1660,17 @@ fi dnl **** Check for libodbc **** WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])
+dnl **** Disable unsupported winmm drivers **** +test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} +test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} +test -n "$NASLIBS" || enable_winenas_drv=${enable_winenas_drv:-no} +test -n "$ESDLIBS" || enable_wineesd_drv=${enable_wineesd_drv:-no} +test -n "$ac_cv_lib_soname_jack" || enable_winejack_drv=${enable_winejack_drv:-no} +test "$ac_cv_header_sys_soundcard_h" = "yes" -o \ + "$ac_cv_header_machine_soundcard_h" = "yes" -o \ + "$ac_cv_header_soundcard_h" = "yes" || enable_wineoss_drv=${enable_wineoss_drv:-no} +test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} + dnl **** Check for any sound system **** if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \ "$ac_cv_header_sys_soundcard_h" != "yes" -a \