From 8e97f666d62758dee09092689ea080a0b468d286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Wed, 22 Jul 2015 10:09:13 +0000 Subject: [PATCH] buildsystem updated --- ChangeLog | 28 +++++++++++ ax_init_standard_project.m4 | 2 - bootstrap.sh | 99 +++++++++++++++++++++++++++++++++++-- libpcscxx | 66 +++++++++++++++++++++++++ 4 files changed, 190 insertions(+), 5 deletions(-) create mode 100644 libpcscxx diff --git a/ChangeLog b/ChangeLog index c2f3fcb..ef53007 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2015-07-22 10:04 marc + + * ax_init_standard_project.m4, configure.ac: mingw/windows-build + works + +2015-07-21 08:42 marc + + * ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh, + configure.ac, debian/control.in, mac-create-app-bundle.sh: + pcsclite does not exist on windows + +2015-07-13 16:50 marc + + * configure.ac: libpkcs11-helper-1 is even worse... + +2015-07-13 14:51 marc + + * configure.ac: prefere libpkcs11-helper-1 + +2015-07-13 12:29 marc + + * bootstrap.sh, doc, doc/doxyfile.in, doc/makefile.am: updated docu + +2015-07-13 08:39 marc + + * ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4, + bootstrap.sh: upgrade to newest bootstrap-build + 2015-06-24 09:26 marc * ChangeLog, ax_init_standard_project.m4: even more support for diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index 870b57b..a900722 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -116,7 +116,6 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ esac AM_CONDITIONAL(MINGW, test "$MINGW" = "yes") AM_CONDITIONAL(MAC, test "$MAC" = "yes") - AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_NAME//-/_}'" AX_SUBST(NUMBERS) AX_SUBST(HOME) @@ -198,7 +197,6 @@ AC_DEFUN([AX_USE_CXX], [ AM_DISTCHECK_CONFIGURE_FLAGS="CXXFLAGS='${CXXFLAGS}' CPPFLAGS='${CPPFLAGS}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" AC_SUBST(AM_DISTCHECK_CONFIGURE_FLAGS) - AC_SUBST(AM_CXXFLAGS) AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_LDFLAGS) diff --git a/bootstrap.sh b/bootstrap.sh index 20d76ee..e3155a0 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -122,6 +122,7 @@ GENERATED FILES * debian/${DEFAULT_PROJECT_NAME}-dev.dirs - if you enabled AX_USE_DEBIAN_PACKAGING * debian/rules - if you enabled AX_USE_DEBIAN_PACKAGING * debian/compat - if you enabled AX_USE_DEBIAN_PACKAGING + * ${DEFAULT_PROJECT_NAME}.spec.in - if you enable AX_USE_RPM_PACKAGING * src/${DEFAULT_PROJECT_NAME}.pc.in - if you enabled AX_USE_LIBTOOL REBUILDING FILES @@ -166,6 +167,8 @@ FILE DEPENDENCIES * debian/${DEFAULT_PROJECT_NAME}.dirs depends on AX_USE_LIBTOOL * debian/${DEFAULT_PROJECT_NAME}-dev.install depends on AX_USE_LIBTOOL * debian/${DEFAULT_PROJECT_NAME}-dev.dirs depends on AX_USE_LIBTOOL + * ${DEFAULT_PROJECT_NAME}.spec.in dependson AX_USE_RPM_PACKAGING, + AX_USE_LIBTOOL, AX_CXX_CHECK_QT, AX_CXX_QT, AX_USE_CPPUNIT FILES @@ -192,7 +195,7 @@ FILES * Enable Scripts: AX_USE_SCRIPTS * Enable Doxygen documentation generation: AX_USE_DOXYGEN * Enable Debian packaging by calling "make deb": AX_USE_DEBIAN_PACKAGING - * Not yet implemented: AX_USE_RPM_PACKAGING + * Enable RPM packaging by calling "make rpm": AX_USE_RPM_PACKAGING * Enable C++ testing using CppUnit: AX_USE_CPPUNIT * Enable C++ examples, i.e. for libraries: AX_BUILD_EXAMPLES * Check for C++11 support: AX_CXX_COMPILE_STDCXX_11 (see ax_cxx_compile_stdcxx_11.m4) @@ -298,7 +301,7 @@ to() { mode="u=rw,g=rw,o=r" case "$1" in (--condition) shift # test for a tag, abort if not set - if ! testtag "$1" configure.ac; then + if ! testtag "$1"; then return fi;; (--mode) shift # test for a tag, abort if not set @@ -676,7 +679,7 @@ EOF Source: @PACKAGE_NAME@ Priority: extra Maintainer: @AUTHOR@ -Build-Depends: debhelper, pkg-config, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CXX_CHECK_QT; then echo -n ", qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools"; fi) +Build-Depends: debhelper, subversion, pkg-config, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CXX_CHECK_QT; then echo -n ", qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools"; fi) Package: @PACKAGE_NAME@ Section: $(if testtag AX_USE_LIBTOOL; then echo "libs"; fi) @@ -717,6 +720,96 @@ ${HEADER}%: EOF echo 7 | to debian/compat fi +to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME} <