libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

compile-fix: support Qt4 - cleanup of connection management, new major version number 3, use static connection methods; refs #26, refs #28, refs #29

Browse Source
This commit is contained in:
Marc Wäckerlin
2014-03-28 13:54:40 +00:00
parent 1d03f5c34d
commit b2406a1750
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.in
View File

@@ -96,10 +96,16 @@ PKG_PROG_PKG_CONFIG
# libraries # libraries
PKG_CHECK_MODULES([QT_GUI], [QtCore QtGui], PKG_CHECK_MODULES([QT_GUI], [QtCore QtGui],
[AC_DEFINE([HAVE_QTGUI], [1], [Use 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], PKG_CHECK_MODULES([QT_NETWORK], [QtNetwork],
[AC_DEFINE([HAVE_QTNETWORK], [1], [Use 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, AC_ARG_ENABLE(pedantic,
[AS_HELP_STRING([--enable-pedantic], [AS_HELP_STRING([--enable-pedantic],

11
doc/examples/makefile.am
View File

@@ -3,10 +3,9 @@
## 1 2 3 4 5 6 7 8 ## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
noinst_HEADERS = suisse-id-demo.hxx
noinst_PROGRAMS = pcsc-demo cryptoki-sign-demo cryptoki-demo \ noinst_PROGRAMS = pcsc-demo cryptoki-sign-demo cryptoki-demo \
openssl-tcp-demo openssl-ssl-demo \ openssl-tcp-demo openssl-ssl-demo \
openssl-engine-demo suisse-id-demo cardos-demo \ openssl-engine-demo cardos-demo \
create-files-demo create-files-demo
AM_CPPFLAGS += -I${top_srcdir}/src -I/usr/include/PCSC 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_ssl_demo_SOURCES = openssl-ssl-demo.cxx
openssl_engine_demo_SOURCES = openssl-engine-demo.cxx openssl_engine_demo_SOURCES = openssl-engine-demo.cxx
cardos_demo_SOURCES = cardos-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 suisse_id_demo_SOURCES = suisse-id-demo.cxx
# moc_suisse-id-demo.cxx
suisse_id_demo_CXXFLAGS = ${QT_NETWORK_CFLAGS} -fPIC suisse_id_demo_CXXFLAGS = ${QT_NETWORK_CFLAGS} -fPIC
suisse_id_demo_LDADD = ${QT_NETWORK_LIBS} suisse_id_demo_LDADD = ${QT_NETWORK_LIBS}
create_files_demo_SOURCES = create-files-demo.cxx endif
%_ui.hxx: %.ui %_ui.hxx: %.ui
uic -o $@ $< uic -o $@ $<

5
src/makefile.am
View File

@@ -31,8 +31,6 @@ pkgconfig2_DATA = $(pkgconfig_DATA)
EXTRA_DIST = $(pkgconfig_DATA).in ${top_srcdir}/src/*.doc EXTRA_DIST = $(pkgconfig_DATA).in ${top_srcdir}/src/*.doc
bin_PROGRAMS = cardgui
lib_LTLIBRARIES = libpcscxx.la lib_LTLIBRARIES = libpcscxx.la
libpcscxx_la_SOURCES = cryptoki.cxx cryptoki.hxx pcsc.cxx version.cxx \ libpcscxx_la_SOURCES = cryptoki.cxx cryptoki.hxx pcsc.cxx version.cxx \
@@ -49,12 +47,15 @@ libpcscxx_la_LIBADD += -lpcsclite
endif endif
endif endif
if HAVE_QTGUI
bin_PROGRAMS = cardgui
cardgui_SOURCES = cardgui.cxx cardgui_SOURCES = cardgui.cxx
nodist_cardgui_SOURCES = cardgui_ui.hxx password_ui.hxx \ nodist_cardgui_SOURCES = cardgui_ui.hxx password_ui.hxx \
moc_cardgui.cxx moc_password.cxx moc_cardgui-model.cxx moc_cardgui.cxx moc_password.cxx moc_cardgui-model.cxx
BUILT_SOURCES = ${nodist_cardgui_SOURCES} BUILT_SOURCES = ${nodist_cardgui_SOURCES}
cardgui_CXXFLAGS = ${QT_GUI_CFLAGS} -fPIC cardgui_CXXFLAGS = ${QT_GUI_CFLAGS} -fPIC
cardgui_LDADD = ${QT_GUI_LIBS} libpcscxx.la ${libpcscxx_la_LIBADD} cardgui_LDADD = ${QT_GUI_LIBS} libpcscxx.la ${libpcscxx_la_LIBADD}
endif
noinst_PROGRAMS = versiontest noinst_PROGRAMS = versiontest
versiontest_SOURCES = versiontest.cxx versiontest_SOURCES = versiontest.cxx