Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
bfb5f26f
Commit
bfb5f26f
authored
9 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
configure: Fix the libpulse check for when the library exists but doesn't work.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
8f443077
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure
+7
-7
7 additions, 7 deletions
configure
configure.ac
+3
-4
3 additions, 4 deletions
configure.ac
with
10 additions
and
11 deletions
configure
+
7
−
7
View file @
bfb5f26f
...
...
@@ -654,8 +654,8 @@ OSS4_CFLAGS
ALSA_LIBS
GSTREAMER_LIBS
GSTREAMER_CFLAGS
PULSE_CFLAGS
PULSE_LIBS
PULSE_CFLAGS
GETTEXTPO_LIBS
Z_LIBS
FREETYPE_LIBS
...
...
@@ -12592,10 +12592,6 @@ esac
fi
fi
PULSE_LIBS=""
PULSE_CFLAGS=""
if test "x$with_pulse" != "xno";
then
if ${PULSE_CFLAGS:+false} :; then :
...
...
@@ -12660,8 +12656,12 @@ fi
$as_echo "$ac_cv_lib_pulse_pa_stream_is_corked" >&6; }
if test "x$ac_cv_lib_pulse_pa_stream_is_corked" = xyes; then :
:
else
PULSE_LIBS=""
fi
else
PULSE_LIBS=""
fi
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'`
fi
if test
"$ac_cv_lib_pulse_pa_stream_is_corked" != "yes
"; then :
if test
-z "$PULSE_LIBS
"; then :
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." ;;
xno) ;;
...
...
@@ -17282,8 +17282,8 @@ FREETYPE_CFLAGS = $FREETYPE_CFLAGS
FREETYPE_LIBS = $FREETYPE_LIBS
Z_LIBS = $Z_LIBS
GETTEXTPO_LIBS = $GETTEXTPO_LIBS
PULSE_LIBS = $PULSE_LIBS
PULSE_CFLAGS = $PULSE_CFLAGS
PULSE_LIBS = $PULSE_LIBS
GSTREAMER_CFLAGS = $GSTREAMER_CFLAGS
GSTREAMER_LIBS = $GSTREAMER_LIBS
ALSA_LIBS = $ALSA_LIBS
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
3
−
4
View file @
bfb5f26f
...
...
@@ -1549,15 +1549,14 @@ then
fi
dnl **** Check for PulseAudio ****
AC_SUBST(PULSE_LIBS,"")
AC_SUBST(PULSE_CFLAGS,"")
if test "x$with_pulse" != "xno";
then
WINE_PACKAGE_FLAGS(PULSE,[libpulse],,,,
[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
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.])
dnl **** Check for gstreamer ****
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment