This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-utils.git tree:
Subject: buildsystem: Query Qt rcc tool location and fall back to rcc if not available (like on RHEL5) Author: Gregor Jasny <[email protected]> Date: Sun Oct 14 14:59:21 2012 +0200 Signed-off-by: Gregor Jasny <[email protected]> configure.ac | 5 +++++ utils/qv4l2/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=cb69289f6f8e13f5c5c20bcdf9fe73e066f23032 diff --git a/configure.ac b/configure.ac index ba6cd50..82fa226 100644 --- a/configure.ac +++ b/configure.ac @@ -107,8 +107,13 @@ if test "x$qt_pkgconfig" = "xtrue"; then AC_SUBST(QT_LIBS) MOC=`$PKG_CONFIG --variable=moc_location QtCore` UIC=`$PKG_CONFIG --variable=uic_location QtCore` + RCC=`$PKG_CONFIG --variable=rcc_location QtCore` + if test -z "$RCC"; then + RCC="rcc" + fi AC_SUBST(MOC) AC_SUBST(UIC) + AC_SUBST(RCC) else AC_MSG_WARN(Qt4 is not available) fi diff --git a/utils/qv4l2/Makefile.am b/utils/qv4l2/Makefile.am index 02d0bcb..86d0285 100644 --- a/utils/qv4l2/Makefile.am +++ b/utils/qv4l2/Makefile.am @@ -29,7 +29,7 @@ moc_capture-win.cpp: $(srcdir)/capture-win.h # Call the Qt resource compiler qrc_qv4l2.cpp: $(srcdir)/qv4l2.qrc - rcc -name qv4l2 -o $@ $(srcdir)/qv4l2.qrc + $(RCC) -name qv4l2 -o $@ $(srcdir)/qv4l2.qrc install-data-local: $(INSTALL_DATA) -D -p "$(srcdir)/qv4l2.desktop" "$(DESTDIR)$(datadir)/applications/qv4l2.desktop" _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
