From 8ef29e4e0ca45ddf0d7fc788e0af4fbe5c48e839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 5 Mar 2015 13:21:20 +0000
Subject: [PATCH] don't stop if qt is not found; more elegant way for adding qt
 rules

---
 m4/ax_check_qt.m4 | 9 ++++++++-
 src/makefile.am   | 6 ------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/m4/ax_check_qt.m4 b/m4/ax_check_qt.m4
index 2141098..c18d049 100644
--- a/m4/ax_check_qt.m4
+++ b/m4/ax_check_qt.m4
@@ -79,9 +79,16 @@ AC_DEFUN([AX_CXX_CHECK_QT], [
       AM_CPPFLAGS+=" ${$1_CFLAGS}"
       AM_CXXFLAGS+=" ${$1_CFLAGS}"
       LIBS+=" ${$1_LIBS}"
-    ])
+    ], [HAVE_$1=0])
   ])
   AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1)
   AC_SUBST(AM_CPPFLAGS)
   AC_SUBST(AM_CXXFLAGS)
+  AM_QT_RULES='
+%_ui.hxx: %.ui
+	${UIC} -o [$][@] $<
+
+moc_%.cxx: %.hxx
+	${MOC} -o [$][@] $<'
+  AC_SUBST(QT_RULES)
 ])
diff --git a/src/makefile.am b/src/makefile.am
index fbbb68f..f107f9a 100644
--- a/src/makefile.am
+++ b/src/makefile.am
@@ -58,12 +58,6 @@ endif
 noinst_PROGRAMS = versiontest
 versiontest_SOURCES = versiontest.cxx
 
-%_ui.hxx: %.ui
-	@UIC@ -o $@ $<
-
-moc_%.cxx: %.hxx
-	@MOC@ -o $@ $<
-
 clean-local:
 	-rm -r ${QMAKE_TARGET}.app