aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-08-12 13:37:11 (GMT)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-08-12 13:37:11 (GMT)
commitf890bcf135a43772c0fa15d3f539bfe3a029c6e0 (patch)
tree3fbfd404b797de0e501481d4ebe2ee51388db42c
parentedfabf9b4fd5a6a9bf75165cfe3c70da4c274139 (diff)
configure.ac: add glib dependencies to X11 flagsHEADmaster
There are more than just qt with depends on it. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--Makefile.in2
-rw-r--r--configure.ac5
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index 3816e5d..4c61d99 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,7 +41,7 @@ WARN_FLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
WARN_FLAGS += $(call cc-option, -Wno-pointer-sign)
LFS_FLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-X11_FLAGS := @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11R6/include/X11/fonts @QT_FLAGS@
+X11_FLAGS := @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11R6/include/X11/fonts @QT_FLAGS@ @GLIB_FLAGS@
LIB_FLAGS := -I. -I./vbistuff -I./x11 \
-I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \
-I$(srcdir)/x11 -I$(srcdir)/structs \
diff --git a/configure.ac b/configure.ac
index edf5d7b..18a1269 100644
--- a/configure.ac
+++ b/configure.ac
@@ -301,6 +301,9 @@ else
echo "*** DV disabled"
fi
+GLIB_FLAGS="`pkg-config --cflags glib-2.0`"
+AC_SUBST(GLIB_FLAGS)
+
quicktime_libs="$DLFLAGS $(pkg-config --libs glib) $LIBPTHREAD"
if test "$enable_quicktime" != "no"; then
AC_CHECK_LIB(quicktime, lqt_query_registry,
@@ -316,8 +319,6 @@ if test "$FOUND_LQT" = "yes"; then
if test "$QT_FLAGS" = ""; then
QT_FLAGS= "-I/usr/include/quicktime"
fi
- QT_FLAGS+="`pkg-config --cflags glib-2.0`"
-
fi
AC_SUBST(QTLIBS)
AC_SUBST(QT_FLAGS)

Privacy Policy