VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

adapted to API changes of libnfc 1.6

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@733 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2012-04-08 13:45:22 +00:00
parent ed6062b228
commit e786b161c9
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pcsc-relay/configure.ac
View File

@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.65])
AC_INIT([pcsc-relay], [0.2], [http://sourceforge.net/projects/vsmartcard/support])
AC_INIT([pcsc-relay], [0.3], [http://sourceforge.net/projects/vsmartcard/support])
AC_CONFIG_SRCDIR([src/pcsc-relay.c])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE
@@ -21,9 +21,9 @@ PKG_CHECK_EXISTS([libpcsclite],
[PKG_CHECK_MODULES([PCSC], [libpcsclite])],
[AC_MSG_WARN([libpcsclite not found by pkg-config])])
# Checks for libraries.
PKG_CHECK_EXISTS([libnfc >= 1.5.1],
[PKG_CHECK_MODULES([LIBNFC], [libnfc >= 1.5.1])],
[AC_MSG_WARN([libnfc >= 1.5.1 not found by pkg-config])])
PKG_CHECK_EXISTS([libnfc >= 1.6],
[PKG_CHECK_MODULES([LIBNFC], [libnfc >= 1.6])],
[AC_MSG_WARN([libnfc >= 1.6 not found by pkg-config])])
saved_CPPFLAGS="$CPPFLAGS"
@@ -40,7 +40,7 @@ AC_CHECK_HEADERS(nfc/nfc.h,,
[ AC_MSG_ERROR([nfc/nfc.h not found, install libnfc >= 5.1.9 or use ./configure LIBNFC_CFLAGS=...]) ])
AC_MSG_CHECKING([for nfc_initiator_select_passive_target])
AC_TRY_LINK_FUNC(nfc_initiator_select_passive_target, [ AC_MSG_RESULT([yes]) ],
[ AC_MSG_ERROR([libnfc >= 1.5.1 not found, use ./configure LIBNFC_LIBS=...]) ])
[ AC_MSG_ERROR([libnfc >= 1.6 not found, use ./configure LIBNFC_LIBS=...]) ])
CPPFLAGS="$saved_CPPFLAGS"
LIBS="$saved_LIBS"
@@ -67,7 +67,6 @@ pcsc-relay has been configured with following options:
Version: ${PACKAGE_VERSION}
User binaries: $(eval eval eval echo "${bindir}")
Configuration files: $(eval eval eval echo "${sysconfdir}")
Host: ${host}