From b2406a1750fce6a8c30d6a5103fb0ad6d65a1dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Fri, 28 Mar 2014 13:54:40 +0000
Subject: [PATCH] compile-fix: support Qt4 - cleanup of connection management,
 new major version number 3, use static connection methods; refs #26, refs
 #28, refs #29

---
 configure.in             | 10 ++++++++--
 doc/examples/makefile.am | 11 +++++++----
 src/makefile.am          |  5 +++--
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/configure.in b/configure.in
index 01e4120..06c5bf7 100644
--- a/configure.in
+++ b/configure.in
@@ -96,10 +96,16 @@ PKG_PROG_PKG_CONFIG
 # libraries
 PKG_CHECK_MODULES([QT_GUI], [QtCore QtGui],
    [AC_DEFINE([HAVE_QTGUI], [1], [Use QtGui])],
-   [PKG_CHECK_MODULES([QT_GUI], [Qt5Core Qt5Gui Qt5Widgets])])
+   [PKG_CHECK_MODULES([QT_GUI], [Qt5Core Qt5Gui Qt5Widgets])],
+   [AC_DEFINE([HAVE_QTGUI], [1], [Use QtGui])],
+   [AC_DEFINE([HAVE_QTGUI], [0], [Do not use QtGui])])
 PKG_CHECK_MODULES([QT_NETWORK], [QtNetwork],
    [AC_DEFINE([HAVE_QTNETWORK], [1], [Use QtNetwork])],
-   [PKG_CHECK_MODULES([QT_NETWORK], [Qt5Network])])
+   [PKG_CHECK_MODULES([QT_NETWORK], [Qt5Network])],
+   [AC_DEFINE([HAVE_QTNETWORK], [1], [Use QtNetwork])],
+   [AC_DEFINE([HAVE_QTNETWORK], [0], [Do not use QtNetwork])])
+AM_CONDITIONAL(HAVE_QTGUI, test "$HAVE_QTGUI" = "1")
+AM_CONDITIONAL(HAVE_QTNETWORK, test "$HAVE_QTNETWORK" = "1")
 
 AC_ARG_ENABLE(pedantic,
   [AS_HELP_STRING([--enable-pedantic],
diff --git a/doc/examples/makefile.am b/doc/examples/makefile.am
index 6769f98..136ca19 100644
--- a/doc/examples/makefile.am
+++ b/doc/examples/makefile.am
@@ -3,10 +3,9 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
-noinst_HEADERS = suisse-id-demo.hxx
 noinst_PROGRAMS = pcsc-demo cryptoki-sign-demo cryptoki-demo		\
                   openssl-tcp-demo openssl-ssl-demo			\
-                  openssl-engine-demo suisse-id-demo cardos-demo        \
+                  openssl-engine-demo cardos-demo        \
                   create-files-demo
 
 AM_CPPFLAGS += -I${top_srcdir}/src -I/usr/include/PCSC
@@ -35,11 +34,15 @@ openssl_tcp_demo_SOURCES = openssl-tcp-demo.cxx
 openssl_ssl_demo_SOURCES = openssl-ssl-demo.cxx
 openssl_engine_demo_SOURCES = openssl-engine-demo.cxx
 cardos_demo_SOURCES = cardos-demo.cxx
+create_files_demo_SOURCES = create-files-demo.cxx
+
+if HAVE_QTNETWORK
+noinst_PROGRAMS += suisse-id-demo
+noinst_HEADERS = suisse-id-demo.hxx
 suisse_id_demo_SOURCES = suisse-id-demo.cxx
-# moc_suisse-id-demo.cxx
 suisse_id_demo_CXXFLAGS = ${QT_NETWORK_CFLAGS} -fPIC
 suisse_id_demo_LDADD = ${QT_NETWORK_LIBS}
-create_files_demo_SOURCES = create-files-demo.cxx
+endif
 
 %_ui.hxx: %.ui
 	uic -o $@ $<
diff --git a/src/makefile.am b/src/makefile.am
index 68ffc08..690c7fb 100644
--- a/src/makefile.am
+++ b/src/makefile.am
@@ -31,8 +31,6 @@ pkgconfig2_DATA = $(pkgconfig_DATA)
 
 EXTRA_DIST = $(pkgconfig_DATA).in ${top_srcdir}/src/*.doc
 
-bin_PROGRAMS = cardgui
-
 lib_LTLIBRARIES = libpcscxx.la
 
 libpcscxx_la_SOURCES = cryptoki.cxx cryptoki.hxx pcsc.cxx version.cxx	\
@@ -49,12 +47,15 @@ libpcscxx_la_LIBADD += -lpcsclite
 endif
 endif
 
+if HAVE_QTGUI
+bin_PROGRAMS = cardgui
 cardgui_SOURCES = cardgui.cxx
 nodist_cardgui_SOURCES = cardgui_ui.hxx password_ui.hxx \
                          moc_cardgui.cxx moc_password.cxx moc_cardgui-model.cxx
 BUILT_SOURCES = ${nodist_cardgui_SOURCES}
 cardgui_CXXFLAGS = ${QT_GUI_CFLAGS} -fPIC
 cardgui_LDADD = ${QT_GUI_LIBS} libpcscxx.la ${libpcscxx_la_LIBADD}
+endif
 
 noinst_PROGRAMS = versiontest
 versiontest_SOURCES = versiontest.cxx