|
 |
cf37a39 |
diff --git a/configure.ac b/configure.ac
|
|
|
160b0f9 |
index 2e20f24..fe07d5b 100644
|
|
|
cf37a39 |
--- a/configure.ac
|
|
|
cf37a39 |
+++ b/configure.ac
|
|
|
268c264 |
@@ -78,6 +78,7 @@ AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]),
|
|
|
d0dcaba |
[if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi])
|
|
|
d0dcaba |
AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]),
|
|
|
d0dcaba |
[if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi])
|
|
|
d0dcaba |
+AC_ARG_WITH(pulse, AC_HELP_STRING([--without-pulse],[do not use PulseAudio sound support]))
|
|
|
d0dcaba |
AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
|
|
|
299eb80 |
AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF]),
|
|
|
299eb80 |
[if test "x$withval" = "xno"; then ac_cv_header_tiffio_h=no; fi])
|
|
|
160b0f9 |
@@ -1479,6 +1480,30 @@ then
|
|
|
1a96be6 |
CFLAGS="$save_CFLAGS"
|
|
|
1a96be6 |
fi
|
|
|
d0dcaba |
|
|
|
d0dcaba |
+dnl **** Check for PulseAudio ****
|
|
|
d0dcaba |
+AC_SUBST(PULSELIBS,"")
|
|
|
0691f0d |
+AC_SUBST(PULSEINCL,"")
|
|
|
d0dcaba |
+if test "x$with_pulse" != "xno";
|
|
|
d0dcaba |
+then
|
|
|
d0dcaba |
+ ac_save_CPPFLAGS="$CPPFLAGS"
|
|
|
d0dcaba |
+ if test "$PKG_CONFIG" != "false";
|
|
|
d0dcaba |
+ then
|
|
|
d0dcaba |
+ ac_pulse_libs="`$PKG_CONFIG --libs libpulse 2>/dev/null`"
|
|
|
0691f0d |
+ ac_pulse_cflags="`$PKG_CONFIG --cflags-only-I libpulse 2>/dev/null`"
|
|
|
d0dcaba |
+
|
|
|
d0dcaba |
+ CPPFLAGS="$CPPFLAGS $ac_pulse_cflags"
|
|
|
d0dcaba |
+ AC_CHECK_HEADERS(pulse/pulseaudio.h,
|
|
|
d0dcaba |
+ [AC_CHECK_LIB(pulse, pa_stream_is_corked,
|
|
|
d0dcaba |
+ [AC_DEFINE(HAVE_PULSEAUDIO, 1, [Define if you have pulseaudio])
|
|
|
d0dcaba |
+ PULSELIBS="$ac_pulse_libs"
|
|
|
0691f0d |
+ PULSEINCL="$ac_pulse_cflags"],,$ac_pulse_libs)
|
|
|
d0dcaba |
+ ])
|
|
|
d0dcaba |
+ fi
|
|
|
d0dcaba |
+ CPPFLAGS="$ac_save_CPPFLAGS"
|
|
|
d0dcaba |
+fi
|
|
|
d0dcaba |
+WINE_WARNING_WITH(pulse, [test "$ac_cv_lib_pulse_pa_stream_is_corked" != "yes"],
|
|
|
d0dcaba |
+ [libpulse ${notice_platform}development files not found or too old, Pulse won't be supported.])
|
|
|
d0dcaba |
+
|
|
|
1a96be6 |
dnl **** Check for gstreamer ****
|
|
|
1a96be6 |
if test "x$with_gstreamer" != "xno"
|
|
|
1a96be6 |
then
|
|
|
160b0f9 |
@@ -1693,7 +1718,7 @@ test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=$
|
|
|
0e7acd2 |
test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
|
|
|
d0dcaba |
|
|
|
d0dcaba |
dnl **** Check for any sound system ****
|
|
|
1a96be6 |
-if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
|
|
|
1a96be6 |
+if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$PULSELIBS$ac_cv_lib_soname_jack" = "x" -a \
|
|
|
268c264 |
"x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \
|
|
|
cf37a39 |
"x$with_alsa$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnononononono
|
|
|
cf37a39 |
then
|
|
|
160b0f9 |
@@ -2883,6 +2908,7 @@ WINE_CONFIG_DLL(winenas.drv)
|
|
|
d0dcaba |
WINE_CONFIG_DLL(wineoss.drv)
|
|
|
160b0f9 |
WINE_CONFIG_DLL(wineps.drv,,[install-lib])
|
|
|
d0dcaba |
WINE_CONFIG_DLL(wineps16.drv16,enable_win16)
|
|
|
d0dcaba |
+WINE_CONFIG_DLL(winepulse.drv)
|
|
|
5a4e788 |
WINE_CONFIG_DLL(wineqtdecoder)
|
|
|
d0dcaba |
WINE_CONFIG_DLL(winequartz.drv)
|
|
|
d0dcaba |
WINE_CONFIG_DLL(winex11.drv)
|