Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
bfb5f26f
Commit
bfb5f26f
authored
Nov 03, 2015
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email 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
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
11 deletions
+10
-11
configure
configure
+7
-7
configure.ac
configure.ac
+3
-4
No files found.
configure
View file @
bfb5f26f
...
@@ -654,8 +654,8 @@ OSS4_CFLAGS
...
@@ -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
...
@@ -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
...
@@ -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\([^/
...
@@ -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
...
@@ -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
...
...
configure.ac
View file @
bfb5f26f
...
@@ -1549,15 +1549,14 @@ then
...
@@ -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 ****
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment