This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/xawtv3.git tree:
Subject: Auto-detect libquicktime include directory Author: Mauro Carvalho Chehab <[email protected]> Date: Wed Feb 2 18:58:22 2011 -0200 Uses pkg-config to detect it, falling back to /usr/include/quicktime, if it fails. Signed-off-by: Mauro Carvalho Chehab <[email protected]> Makefile.in | 2 ++ configure.ac | 5 +++++ libng/plugins/read-qt.c | 6 +++--- libng/plugins/write-qt.c | 6 +++--- 4 files changed, 13 insertions(+), 6 deletions(-) --- http://git.linuxtv.org/xawtv3.git?a=commitdiff;h=57cf8e45c72d2749cf2597b7215403527f91b694 diff --git a/Makefile.in b/Makefile.in index e8d533e..c7e0b01 100644 --- a/Makefile.in +++ b/Makefile.in @@ -47,6 +47,7 @@ OSS_LIBS := @LIBOSS@ ALSA_LIBS := @LIBALSA@ AA_LIBS := @AALIBS@ QT_LIBS := @QTLIBS@ +QT_FLAGS := @QTFLAGS@ VBI_LIBS := @LIBZVBI@ GL_LIBS := @LIBGL@ DV_LIBS := @LIBDV@ @@ -72,6 +73,7 @@ CFLAGS += $(WARN_FLAGS) CFLAGS += $(LFS_FLAGS) CFLAGS += $(X11_FLAGS) CFLAGS += $(LIB_FLAGS) +CFLAGS += $(QT_FLAGS) CFLAGS += -DCONFIGFILE='"$(config)"' CFLAGS += -DLIBDIR='"$(libdir)"' CFLAGS += -DDATADIR='"$(datadir)"' diff --git a/configure.ac b/configure.ac index ee2c80b..79dd68c 100644 --- a/configure.ac +++ b/configure.ac @@ -253,9 +253,14 @@ else fi QTLIBS="" if test "$FOUND_LQT" = "yes"; then + QTFLAGS="`pkg-config libquicktime --cflags-only-I`" + if test "$QTFLAGS" = ""; then + QTFLAGS= "-I/usr/include/quicktime" + fi QTLIBS="-lquicktime $DLFLAGS $dashlglib -lm" fi AC_SUBST(QTLIBS) +AC_SUBST(QTFLAGS) if test "$enable_xfree_ext" != "no"; then AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension,,, diff --git a/libng/plugins/read-qt.c b/libng/plugins/read-qt.c index b114823..db9e716 100644 --- a/libng/plugins/read-qt.c +++ b/libng/plugins/read-qt.c @@ -4,9 +4,9 @@ #include <stdio.h> #include <string.h> #include <pthread.h> -#include <quicktime/quicktime.h> -#include <quicktime/colormodels.h> -#include <quicktime/lqt.h> +#include <quicktime.h> +#include <colormodels.h> +#include <lqt.h> #include "grab-ng.h" diff --git a/libng/plugins/write-qt.c b/libng/plugins/write-qt.c index b2113ad..a2e3c98 100644 --- a/libng/plugins/write-qt.c +++ b/libng/plugins/write-qt.c @@ -4,9 +4,9 @@ #include <stdio.h> #include <string.h> #include <pthread.h> -#include <quicktime/quicktime.h> -#include <quicktime/colormodels.h> -#include <quicktime/lqt.h> +#include <quicktime.h> +#include <colormodels.h> +#include <lqt.h> #include "grab-ng.h" _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
