[Telepathy-commits] [telepathy-qt4/master] Find rcc even if it isn't in $PATH

[Olli Salli]

---
 configure.ac                |   11 +++++++++++
 tests/prototype/Makefile.am |    2 +-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index d60ee62..c4b8922 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,6 +124,17 @@ AC_SUBST(QTCORE_LIBS)
 MOC=`$PKG_CONFIG --variable=moc_location QtCore`
 AC_SUBST(MOC)
 
+dnl We shouldn't need RCC at all - this is a *library* - but for the short term, let's at least
+dnl make the RCC-using tests compile even when rcc isn't in $PATH.
+pkgconfig_rcc=`pkg-config --variable=rcc_location QtCore`
+if test -n "$pkgconfig_rcc"; then
+    RCC=$pkgconfig_rcc
+else
+    RCC=`dirname $MOC`/rcc
+fi
+
+AC_SUBST(RCC)
+
 dnl Check for QtDBus
 PKG_CHECK_MODULES(QTDBUS, [QtDBus >= 4.5])
 AC_SUBST(QTDBUS_CFLAGS)
diff --git a/tests/prototype/Makefile.am b/tests/prototype/Makefile.am
index d3c4a34..7cb4702 100644
--- a/tests/prototype/Makefile.am
+++ b/tests/prototype/Makefile.am
@@ -22,7 +22,7 @@ test_prototype_SOURCES = prototype.cpp prototype.h _gen/images.hpp
 EXTRA_DIST = images.qrc avatar.png
 
 _gen/images.hpp: images.qrc avatar.png
-	( cd @srcdir@ && rcc images.qrc ) > $@.tmp
+	( cd @srcdir@ && $(RCC) images.qrc ) > $@.tmp
 	mv -f $@.tmp $@
 
 DEP_CFLAGS = \
-- 
1.5.6.5