marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Fix the libpulse check for when the library exists but doesn't work. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Alexandre Julliard 2015-11-03 10:49:44 +09:00
parent 8f44307741
commit bfb5f26f10
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -654,8 +654,8 @@ OSS4_CFLAGS
ALSA_LIBS ALSA_LIBS
GSTREAMER_LIBS GSTREAMER_LIBS
GSTREAMER_CFLAGS GSTREAMER_CFLAGS
PULSE_CFLAGS
PULSE_LIBS PULSE_LIBS
PULSE_CFLAGS
GETTEXTPO_LIBS GETTEXTPO_LIBS
Z_LIBS Z_LIBS
FREETYPE_LIBS FREETYPE_LIBS
@ -12592,10 +12592,6 @@ esac
fi fi
fi fi
PULSE_LIBS=""
PULSE_CFLAGS=""
if test "x$with_pulse" != "xno"; if test "x$with_pulse" != "xno";
then then
if ${PULSE_CFLAGS:+false} :; then : if ${PULSE_CFLAGS:+false} :; then :
@ -12660,8 +12656,12 @@ fi
$as_echo "$ac_cv_lib_pulse_pa_stream_is_corked" >&6; } $as_echo "$ac_cv_lib_pulse_pa_stream_is_corked" >&6; }
if test "x$ac_cv_lib_pulse_pa_stream_is_corked" = xyes; then : if test "x$ac_cv_lib_pulse_pa_stream_is_corked" = xyes; then :
: :
else
PULSE_LIBS=""
fi fi
else
PULSE_LIBS=""
fi fi
done done
@ -12671,7 +12671,7 @@ test -z "$PULSE_CFLAGS" || PULSE_CFLAGS=`echo " $PULSE_CFLAGS" | sed 's/ -I\([^/
test -z "$PULSE_LIBS" || PULSE_LIBS=`echo " $PULSE_LIBS" | sed 's/ -L\([^/]\)/ -L\$(top_builddir)\/\1/g'` test -z "$PULSE_LIBS" || PULSE_LIBS=`echo " $PULSE_LIBS" | sed 's/ -L\([^/]\)/ -L\$(top_builddir)\/\1/g'`
fi fi
if test "$ac_cv_lib_pulse_pa_stream_is_corked" != "yes"; then : if test -z "$PULSE_LIBS"; then :
case "x$with_pulse" in case "x$with_pulse" in
x) as_fn_append wine_notices "|libpulse ${notice_platform}development files not found or too old, Pulse won't be supported." ;; x) as_fn_append wine_notices "|libpulse ${notice_platform}development files not found or too old, Pulse won't be supported." ;;
xno) ;; xno) ;;
@ -17282,8 +17282,8 @@ FREETYPE_CFLAGS = $FREETYPE_CFLAGS
FREETYPE_LIBS = $FREETYPE_LIBS FREETYPE_LIBS = $FREETYPE_LIBS
Z_LIBS = $Z_LIBS Z_LIBS = $Z_LIBS
GETTEXTPO_LIBS = $GETTEXTPO_LIBS GETTEXTPO_LIBS = $GETTEXTPO_LIBS
PULSE_LIBS = $PULSE_LIBS
PULSE_CFLAGS = $PULSE_CFLAGS PULSE_CFLAGS = $PULSE_CFLAGS
PULSE_LIBS = $PULSE_LIBS
GSTREAMER_CFLAGS = $GSTREAMER_CFLAGS GSTREAMER_CFLAGS = $GSTREAMER_CFLAGS
GSTREAMER_LIBS = $GSTREAMER_LIBS GSTREAMER_LIBS = $GSTREAMER_LIBS
ALSA_LIBS = $ALSA_LIBS ALSA_LIBS = $ALSA_LIBS

7
configure.ac
View File

@ -1549,15 +1549,14 @@ then
fi fi
dnl **** Check for PulseAudio **** dnl **** Check for PulseAudio ****
AC_SUBST(PULSE_LIBS,"")
AC_SUBST(PULSE_CFLAGS,"")
if test "x$with_pulse" != "xno"; if test "x$with_pulse" != "xno";
then then
WINE_PACKAGE_FLAGS(PULSE,[libpulse],,,, WINE_PACKAGE_FLAGS(PULSE,[libpulse],,,,
[AC_CHECK_HEADERS(pulse/pulseaudio.h, [AC_CHECK_HEADERS(pulse/pulseaudio.h,
[AC_CHECK_LIB(pulse, pa_stream_is_corked,[:],,[$PULSE_LIBS])])]) [AC_CHECK_LIB(pulse, pa_stream_is_corked,[:],[PULSE_LIBS=""],[$PULSE_LIBS])],
[PULSE_LIBS=""])])
fi fi
WINE_NOTICE_WITH(pulse, [test "$ac_cv_lib_pulse_pa_stream_is_corked" != "yes"], WINE_NOTICE_WITH(pulse, [test -z "$PULSE_LIBS"],
[libpulse ${notice_platform}development files not found or too old, Pulse won't be supported.]) [libpulse ${notice_platform}development files not found or too old, Pulse won't be supported.])
dnl **** Check for gstreamer **** dnl **** Check for gstreamer ****