mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-19 12:45:54 +00:00
configure: Don't use AG_GST_CHECK_FEATURE for checking for gio-unix-2.0
It's meant to be used for external plugins that can then all be disabled via --disable-external. gio-unix-2.0 however is just an optional dependency for the TCP unit test. Also when using AG_GST_CHECK_FEATURE like this, in the --disable-external part there needs to be an AM_CONDITIONAL for the feature with FALSE.
This commit is contained in:
parent
60bad4815d
commit
aadefefba8
1 changed files with 6 additions and 6 deletions
12
configure.ac
12
configure.ac
|
@ -704,12 +704,6 @@ AG_GST_CHECK_FEATURE(VORBIS, [Xiph Vorbis audio codec], vorbis, [
|
||||||
AG_GST_PKG_CHECK_MODULES(VORBIS, vorbis >= 1.0 vorbisenc >= 1.0)
|
AG_GST_PKG_CHECK_MODULES(VORBIS, vorbis >= 1.0 vorbisenc >= 1.0)
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c ***
|
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_GIO_UNIX_2_0, true)
|
|
||||||
AG_GST_CHECK_FEATURE(GIO_UNIX_2_0, [glib GIO unix], gio-unix-2.0, [
|
|
||||||
AG_GST_PKG_CHECK_MODULES(GIO_UNIX_2_0, gio-unix-2.0 >= 2.24)
|
|
||||||
])
|
|
||||||
|
|
||||||
if test "x$HAVE_VORBIS" = "xyes"; then
|
if test "x$HAVE_VORBIS" = "xyes"; then
|
||||||
ac_cflags_save="$CFLAGS"
|
ac_cflags_save="$CFLAGS"
|
||||||
AC_COMPILE_IFELSE([
|
AC_COMPILE_IFELSE([
|
||||||
|
@ -751,6 +745,12 @@ AM_CONDITIONAL(HAVE_FT2, test "x$HAVE_FT2" = "xyes")
|
||||||
AC_SUBST(FT2_CFLAGS)
|
AC_SUBST(FT2_CFLAGS)
|
||||||
AC_SUBST(FT2_LIBS)
|
AC_SUBST(FT2_LIBS)
|
||||||
|
|
||||||
|
dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c ***
|
||||||
|
PKG_CHECK_MODULES(GIO_UNIX_2_0, gio-unix-2.0 >= 2.24,
|
||||||
|
HAVE_GIO_UNIX_2_0="yes",
|
||||||
|
HAVE_GIO_UNIX_2_0="no")
|
||||||
|
AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = "xyes")
|
||||||
|
|
||||||
dnl *** finalize CFLAGS, LDFLAGS, LIBS
|
dnl *** finalize CFLAGS, LDFLAGS, LIBS
|
||||||
|
|
||||||
dnl Overview:
|
dnl Overview:
|
||||||
|
|
Loading…
Reference in a new issue