From 1495434f567436390855258c6abb4c018045b9d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Wed, 4 Mar 2015 14:40:29 +0000
Subject: [PATCH] =?UTF-8?q?fix=20=C2=ABHAVE=5FQTNETWORK=20does=20not=20app?=
 =?UTF-8?q?ear=20in=20AM=5FCONDITIONAL=C2=BB=20when=20there=20is=20no=20qt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 configure.ac      | 3 +++
 m4/ax_check_qt.m4 | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 5faf172..74b4554 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,9 @@
 # $Id$
 AC_CONFIG_MACRO_DIR([m4])
 
+# prevent HAVE_QTxxx does not appear in AM_CONDITIONAL
+m4_include(m4/ax_check_qt.m4)
+
 m4_define(x_package_name, libpcscxx)
 m4_define(x_major, 3)
 m4_define(x_minor, 1)
diff --git a/m4/ax_check_qt.m4 b/m4/ax_check_qt.m4
index e503a9c..19383c6 100644
--- a/m4/ax_check_qt.m4
+++ b/m4/ax_check_qt.m4
@@ -73,7 +73,7 @@ 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)