From 29142adae3712918c0b11786839f787ec41cd641 Mon Sep 17 00:00:00 2001 From: Frank Morgner Date: Thu, 6 Apr 2017 16:29:34 +0200 Subject: [PATCH] fixed configure check for libnfc decouples tests of libnfc from pcsc --- pcsc-relay/configure.ac | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pcsc-relay/configure.ac b/pcsc-relay/configure.ac index 8ff84fe..0700f01 100644 --- a/pcsc-relay/configure.ac +++ b/pcsc-relay/configure.ac @@ -75,22 +75,29 @@ PKG_CHECK_EXISTS([libnfc >= 1.6], 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(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(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_TRY_LINK_FUNC(SCardEstablishContext, [ AC_MSG_RESULT([yes]) ], [ 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_TRY_LINK_FUNC(nfc_initiator_select_passive_target, [ AC_MSG_RESULT([yes]) ], - [ AC_MSG_RESULT([no]) - have_libnfc="no" ]) +AC_TRY_LINK_FUNC(nfc_initiator_select_passive_target, + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + have_libnfc="no" ]) + +CPPFLAGS="$saved_CPPFLAGS" LIBS="$saved_LIBS" case "${enable_libnfc}" in