--- /var/tmp/portage/app-emulation/wine-1.1.30/work/wine-1.1.30/configure.ac 2009-09-25 09:53:43.000000000 -0700 +++ /home/oddfox/winepatched-1.1.30/configure.ac 2010-01-09 18:31:44.704108541 -0800 @@ -64,6 +64,7 @@ [if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi]) AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) +AC_ARG_WITH(pulse, AC_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi]) @@ -1296,6 +1297,29 @@ CFLAGS="$save_CFLAGS" fi +dnl **** Check for PulseAudio **** +if test "x$with_pulse" != "xno"; then + if test "$PKG_CONFIG" != "false"; then + AC_MSG_CHECKING([for pulseaudio >= 0.9.14]) + if "$PKG_CONFIG" --atleast-version=0.9.14 libpulse; then + have_pulseaudio="yes" + else + have_pulseaudio="no" + fi + AC_MSG_RESULT([$have_pulseaudio]) + if test x"$have_pulseaudio" = xyes; then + ac_pulse_libs=`$PKG_CONFIG --libs libpulse` + AC_DEFINE([HAVE_PULSEAUDIO], 1, [define this if you have pulseaudio]) + AC_SUBST(PULSELIBS, "$ac_pulse_libs") + else + dnl This warning should be removed if ever commited. + dnl Only useful to show that the problem wasn't the patch. + WINE_WARNING([libpulse not found or too old. Pulseaudio support will NOT be built.]) + fi + fi +fi + + dnl **** Check for ALSA 1.x **** AC_SUBST(ALSALIBS,"") if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes" @@ -1448,7 +1472,7 @@ WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])]) dnl **** Check for any sound system **** -if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \ +if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$PULSELIBS$ac_cv_lib_soname_jack" = "x" -a \ "$ac_cv_header_sys_soundcard_h" != "yes" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_soundcard_h" != "yes" -a \ @@ -2494,6 +2518,7 @@ WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wineoss.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wineps.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/winepulse.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/winequartz.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/winex11.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/wing32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])