diff --git a/m4/libnfc_check_pcsc.m4 b/m4/libnfc_check_pcsc.m4 index 990a3ff..96c2ece 100644 --- a/m4/libnfc_check_pcsc.m4 +++ b/m4/libnfc_check_pcsc.m4 @@ -5,23 +5,27 @@ dnl libpcsclite is found using pkg-config AC_DEFUN([LIBNFC_CHECK_PCSC], [ if test "x$pcsc_required" = "xyes"; then + PKG_CHECK_MODULES([libpcsclite], [libpcsclite], [HAVE_PCSC=1], [HAVE_PCSC=0]) + if test x"$HAVE_PCSC" = "x1" ; then + if test x"$PKG_CONFIG_REQUIRES" != x""; then + PKG_CONFIG_REQUIRES="$PKG_CONFIG_REQUIRES," + fi + PKG_CONFIG_REQUIRES="$PKG_CONFIG_REQUIRES libpcsclite" + fi case "$host" in *darwin*) - AC_MSG_CHECKING(for PC/SC) - libpcsclite_LIBS="-Wl,-framework,PCSC" - libpcsclite_CFLAGS="-I/System/Library/Frameworks/PCSC.framework/Headers" - HAVE_PCSC=1 - AC_MSG_RESULT(yes: darwin PC/SC framework) + if test x"$HAVE_PCSC" = "x0" ; then + AC_MSG_CHECKING(for PC/SC) + libpcsclite_LIBS="-Wl,-framework,PCSC" + libpcsclite_CFLAGS="-I/System/Library/Frameworks/PCSC.framework/Headers" + HAVE_PCSC=1 + AC_MSG_RESULT(yes: darwin PC/SC framework) + fi ;; *) - PKG_CHECK_MODULES([libpcsclite], [libpcsclite], [HAVE_PCSC=1], [HAVE_PCSC=0]) if test x"$HAVE_PCSC" = "x0" ; then AC_MSG_ERROR([libpcsclite is mandatory.]) fi - if test x"$PKG_CONFIG_REQUIRES" != x""; then - PKG_CONFIG_REQUIRES="$PKG_CONFIG_REQUIRES," - fi - PKG_CONFIG_REQUIRES="$PKG_CONFIG_REQUIRES libpcsclite" ;; esac AC_SUBST(libpcsclite_LIBS)