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

---
 ChangeLog         | 33 +++++++++++++++++++++++++++++++++
 m4/ax_check_qt.m4 |  4 ++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ef61d8..ad4f1b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2015-03-05 13:21  marc
+
+	* m4/ax_check_qt.m4, src/makefile.am: don't stop if qt is not
+	  found; more elegant way for adding qt rules
+
+2015-03-05 12:02  marc
+
+	* ChangeLog, m4/ax_check_qt.m4: qt tools are optional
+
+2015-03-05 09:05  marc
+
+	* configure.ac: support Qt4 which has no QWidgets - but Qt5 needs
+	  it
+
+2015-03-05 08:34  marc
+
+	* configure.ac: support Qt4 which has no QWidgets
+
+2015-03-04 14:59  marc
+
+	* debian/control.in, doc/doxyfile.in: strange error «sh: 1:
+	  /usr/bindot: not found; on squeeze, there's no qt5»
+
+2015-03-04 14:44  marc
+
+	* configure.ac: fix «HAVE_QTNETWORK does not appear in
+	  AM_CONDITIONAL» when there is no qt
+
+2015-03-04 14:40  marc
+
+	* configure.ac, m4/ax_check_qt.m4: fix «HAVE_QTNETWORK does not
+	  appear in AM_CONDITIONAL» when there is no qt
+
 2015-03-04 13:28  marc
 
 	* m4/ax_check_qt.m4: try to fix «HAVE_QTNETWORK does not appear in
diff --git a/m4/ax_check_qt.m4 b/m4/ax_check_qt.m4
index 588706e..a3ed44c 100644
--- a/m4/ax_check_qt.m4
+++ b/m4/ax_check_qt.m4
@@ -84,11 +84,11 @@ AC_DEFUN([AX_CXX_CHECK_QT], [
   AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1)
   AC_SUBST(AM_CPPFLAGS)
   AC_SUBST(AM_CXXFLAGS)
-  ADDITIONAL_QT_RULES='
+  AX_ADDITIONAL_QT_RULES_HACK='
 %_ui.hxx: %.ui
 	${UIC} -o [$][@] $<
 
 moc_%.cxx: %.hxx
 	${MOC} -o [$][@] $<'
-  AC_SUBST(QT_RULES)
+  AC_SUBST(AX_ADDITIONAL_QT_RULES_HACK)
 ])