libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

build fails with GNU TLS, because pcsc.h there is something completely different

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-06-18 14:34:28 +00:00
parent 651b824782
commit d17f48ae1e
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2015-05-22 08:45 marc
* configure.ac: fixed package name for mac ports
2015-05-20 12:12 marc
* ChangeLog, debian/libpcscxx-dev.install: fix in debian build
2015-05-18 09:40 marc 2015-05-18 09:40 marc
* examples/makefile.am, src/makefile.am: cleanup build files * examples/makefile.am, src/makefile.am: cleanup build files

4
configure.ac
View File

@@ -2,7 +2,7 @@
m4_define(x_package_name, libpcscxx) m4_define(x_package_name, libpcscxx)
m4_define(x_major, 3) m4_define(x_major, 3)
m4_define(x_minor, 1) m4_define(x_minor, 2)
m4_include(ax_init_standard_project.m4) m4_include(ax_init_standard_project.m4)
AC_INIT(x_package_name, x_version, x_bugreport, x_package_name) AC_INIT(x_package_name, x_version, x_bugreport, x_package_name)
AM_INIT_AUTOMAKE([1.9 tar-pax]) AM_INIT_AUTOMAKE([1.9 tar-pax])
@@ -42,7 +42,7 @@ CPPFLAGS="${CPPFLAGS} -DQT_NO_KEYWORDS"
AX_PKG_REQUIRE([pcsc], [libpcsclite], [pcsclite.h]) AX_PKG_REQUIRE([pcsc], [libpcsclite], [pcsclite.h])
AX_PKG_REQUIRE([ssl], [libssl], [openssl/crypto.h], [openssl]) AX_PKG_REQUIRE([ssl], [libssl], [openssl/crypto.h], [openssl])
AX_PKG_REQUIRE([mrwcxx], [mrw-c++]) AX_PKG_REQUIRE([mrwcxx], [mrw-c++])
AX_PKG_REQUIRE([pkcs11], [p11-kit-1], [pkcs11.h], [gnutls libpkcs11-helper-1]) AX_PKG_REQUIRE([pkcs11], [p11-kit-1], [pkcs11.h], [libpkcs11-helper-1])
# create output # create output
AC_OUTPUT AC_OUTPUT