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

fixed configure check for libnfc

Browse Source 
decouples tests of libnfc from pcsc
This commit is contained in:
Frank Morgner
2017-04-06 16:29:34 +02:00
parent 377774fd65
commit 29142adae3
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pcsc-relay/configure.ac
View File

@@ -75,22 +75,29 @@ PKG_CHECK_EXISTS([libnfc >= 1.6],
saved_CPPFLAGS="$CPPFLAGS" saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $PCSC_CFLAGS $LIBNFC_CFLAGS" saved_LIBS="$LIBS"
CPPFLAGS="$CPPFLAGS $PCSC_CFLAGS"
LIBS="$LIBS $PCSC_LIBS"
AC_CHECK_HEADERS(winscard.h, [], [ AC_MSG_ERROR([winscard.h not found, install PC/SC Lite or similar or use ./configure PCSC_CFLAGS=...]) ]) AC_CHECK_HEADERS(winscard.h, [], [ AC_MSG_ERROR([winscard.h not found, install PC/SC Lite or similar or use ./configure PCSC_CFLAGS=...]) ])
AC_CHECK_HEADERS(reader.h, [AC_DEFINE(HAVE_READER_H, 1, [use reader.h from PC/SC Lite])], []) AC_CHECK_HEADERS(reader.h, [AC_DEFINE(HAVE_READER_H, 1, [use reader.h from PC/SC Lite])], [])
AC_CHECK_HEADERS(wintypes.h, [AC_DEFINE(HAVE_WINTYPES_H, 1, [use wintypes.h from PC/SC Lite])], []) AC_CHECK_HEADERS(wintypes.h, [AC_DEFINE(HAVE_WINTYPES_H, 1, [use wintypes.h from PC/SC Lite])], [])
AC_CHECK_HEADERS(pcsclite.h, [AC_DEFINE(HAVE_PCSCLITE_H, 1, [use pcsclite.h from PC/SC Lite])], []) AC_CHECK_HEADERS(pcsclite.h, [AC_DEFINE(HAVE_PCSCLITE_H, 1, [use pcsclite.h from PC/SC Lite])], [])
AC_CHECK_HEADERS(nfc/nfc.h,, [ have_libnfc="no"])
CPPFLAGS="$saved_CPPFLAGS"
saved_LIBS="$LIBS"
LIBS="$LIBS $PCSC_LIBS $LIBNFC_LIBS"
AC_MSG_CHECKING([for SCardEstablishContext]) AC_MSG_CHECKING([for SCardEstablishContext])
AC_TRY_LINK_FUNC(SCardEstablishContext, [ AC_MSG_RESULT([yes]) ], AC_TRY_LINK_FUNC(SCardEstablishContext, [ AC_MSG_RESULT([yes]) ],
[ AC_MSG_ERROR([libpcsclite not found, use ./configure PCSC_LIBS=...]) ]) [ AC_MSG_ERROR([libpcsclite not found, use ./configure PCSC_LIBS=...]) ])
have_libnfc="yes"
CPPFLAGS="$saved_CPPFLAGS $LIBNFC_CFLAGS"
LIBS="$saved_LIBS $LIBNFC_LIBS"
AC_CHECK_HEADERS(nfc/nfc.h, , [have_libnfc="no"])
AC_MSG_CHECKING([for nfc_initiator_select_passive_target]) AC_MSG_CHECKING([for nfc_initiator_select_passive_target])
AC_TRY_LINK_FUNC(nfc_initiator_select_passive_target, [ AC_MSG_RESULT([yes]) ], AC_TRY_LINK_FUNC(nfc_initiator_select_passive_target,
[ AC_MSG_RESULT([no]) [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
have_libnfc="no" ]) have_libnfc="no" ])
CPPFLAGS="$saved_CPPFLAGS"
LIBS="$saved_LIBS" LIBS="$saved_LIBS"
case "${enable_libnfc}" in case "${enable_libnfc}" in