|
 |
dc038b9 |
diff --git a/configure.ac b/configure.ac
|
|
|
dc038b9 |
index 57ec39d..2ca94ca 100644
|
|
|
dc038b9 |
--- a/configure.ac
|
|
|
dc038b9 |
+++ b/configure.ac
|
|
|
dc038b9 |
@@ -58,6 +58,7 @@ AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]),
|
|
|
dc038b9 |
[if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi])
|
|
|
dc038b9 |
AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]),
|
|
|
dc038b9 |
[if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi])
|
|
|
dc038b9 |
+AC_ARG_WITH(pulse, AC_HELP_STRING([--without-pulse],[do not use PulseAudio sound support]))
|
|
|
dc038b9 |
AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
|
|
|
dc038b9 |
AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
|
|
|
dc038b9 |
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
|
|
|
dc038b9 |
@@ -1186,6 +1187,24 @@ then
|
|
|
dc038b9 |
CFLAGS="$save_CFLAGS"
|
|
|
dc038b9 |
fi
|
|
|
dc038b9 |
|
|
|
dc038b9 |
+dnl **** Check for PulseAudio ****
|
|
|
dc038b9 |
+if test "x$with_pulse" != "xno"; then
|
|
|
dc038b9 |
+ if test "$PKG_CONFIG" != "false"; then
|
|
|
dc038b9 |
+ AC_MSG_CHECKING([for pulseaudio >= 0.9.8])
|
|
|
dc038b9 |
+ if "$PKG_CONFIG" --atleast-version=0.9.8 libpulse; then
|
|
|
dc038b9 |
+ have_pulseaudio="yes"
|
|
|
dc038b9 |
+ else
|
|
|
dc038b9 |
+ have_pulseaudio="no"
|
|
|
dc038b9 |
+ fi
|
|
|
dc038b9 |
+ AC_MSG_RESULT([$have_pulseaudio])
|
|
|
dc038b9 |
+ if test x"$have_pulseaudio" = xyes; then
|
|
|
dc038b9 |
+ ac_pulse_libs=`$PKG_CONFIG --libs libpulse`
|
|
|
dc038b9 |
+ AC_DEFINE([HAVE_PULSEAUDIO], 1, [define this if you have pulseaudio])
|
|
|
dc038b9 |
+ AC_SUBST(PULSELIBS, "$ac_pulse_libs")
|
|
|
dc038b9 |
+ fi
|
|
|
dc038b9 |
+ fi
|
|
|
dc038b9 |
+fi
|
|
|
dc038b9 |
+
|
|
|
dc038b9 |
dnl **** Check for ALSA 1.x ****
|
|
|
dc038b9 |
AC_SUBST(ALSALIBS,"")
|
|
|
dc038b9 |
if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
|
|
|
dc038b9 |
@@ -1291,7 +1310,7 @@ dnl **** Check for libodbc ****
|
|
|
dc038b9 |
WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])
|
|
|
dc038b9 |
|
|
|
dc038b9 |
dnl **** Check for any sound system ****
|
|
|
dc038b9 |
-if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
|
|
|
dc038b9 |
+if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$PULSELIBS$ac_cv_lib_soname_jack" = "x" -a \
|
|
|
dc038b9 |
"$ac_cv_header_sys_soundcard_h" != "yes" -a \
|
|
|
dc038b9 |
"$ac_cv_header_machine_soundcard_h" != "yes" -a \
|
|
|
dc038b9 |
"$ac_cv_header_soundcard_h" != "yes" -a \
|
|
|
dc038b9 |
@@ -2223,6 +2242,7 @@ WINE_CONFIG_MAKEFILE([dlls/winemp3.acm/Makefile],[dlls/Makedll.rules],[dlls],[AL
|
|
|
dc038b9 |
WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
|
|
|
dc038b9 |
WINE_CONFIG_MAKEFILE([dlls/wineoss.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
|
|
|
dc038b9 |
WINE_CONFIG_MAKEFILE([dlls/wineps.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
|
|
|
dc038b9 |
+WINE_CONFIG_MAKEFILE([dlls/winepulse.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
|
|
|
dc038b9 |
WINE_CONFIG_MAKEFILE([dlls/winequartz.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
|
|
|
dc038b9 |
WINE_CONFIG_MAKEFILE([dlls/winex11.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
|
|
|
dc038b9 |
WINE_CONFIG_MAKEFILE([dlls/wing32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
|