blob: 23950b67f2a24cb9497cdb0a3bfc1d60fce16b7c [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 7ffa6e3d00e1d8a060f3f4c2bb9a72691af05d79 Mon Sep 17 00:00:00 2001
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05002From: Andre McCurdy <armccurdy@gmail.com>
3Date: Wed, 20 Jan 2016 13:00:00 -0800
4Subject: [PATCH] make gio_unix_2_0 dependency configurable
5
6Prior to 1.7.1, gst-plugins-base accepted a configure option to
7disable gio_unix_2_0, however it was implemented incorrectly using
8AG_GST_CHECK_FEATURE. That was fixed in 1.7.1 by making the
9dependency unconditional.
10
11 http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=aadefefba88afe4acbe64454650f24e7ce7c8d70
12
13To make builds deterministic, re-instate support for
14--disable-gio_unix_2_0, but implement it using the AC_ARG_ENABLE
15instead of AG_GST_CHECK_FEATURE.
16
17Upstream-Status: Pending
18
19Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080020
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050021---
22 configure.ac | 7 +++++++
23 1 file changed, 7 insertions(+)
24
25diff --git a/configure.ac b/configure.ac
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080026index 12807bc..35a0bf3 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050027--- a/configure.ac
28+++ b/configure.ac
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080029@@ -806,9 +806,16 @@ AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes")
30 AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes")
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050031
32 dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c ***
33+AC_ARG_ENABLE([gio_unix_2_0],
34+ [AS_HELP_STRING([--disable-gio_unix_2_0],[disable use of gio_unix_2_0])],
35+ [],
36+ [enable_gio_unix_2_0=yes])
37+
38+if test "x${enable_gio_unix_2_0}" != "xno"; then
39 PKG_CHECK_MODULES(GIO_UNIX_2_0, gio-unix-2.0 >= 2.24,
40 HAVE_GIO_UNIX_2_0="yes",
41 HAVE_GIO_UNIX_2_0="no")
42+fi
43 AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = "xyes")
44
45 dnl *** finalize CFLAGS, LDFLAGS, LIBS