diff --git a/configure.ac b/configure.ac index 148c91b..f7cabfb 100644 --- a/configure.ac +++ b/configure.ac @@ -95,8 +95,6 @@ AC_ARG_ENABLE(smartcard, case "$OSTYPE" in darwin*) AC_CHECK_HEADER(PCSC/pcsclite.h, [WITH_SCARD=1], [WITH_SCARD=0]) - AC_DEFINE(PCSC_OSX) - AC_DEFINE(WITH_PCSC120) PCSCLITE_CFLAGS="" PCSCLITE_LIBS="-framework PCSC" ;; @@ -113,6 +111,21 @@ AC_ARG_ENABLE(smartcard, LIBS="$LIBS $PCSCLITE_LIBS" AC_DEFINE(WITH_SCARD) fi + + AC_MSG_CHECKING([for old version of PCSC]) + AC_TRY_LINK([ + #include + #ifdef __APPLE__ + #include + #include + #else + #include + #endif + ], + [SCardControl(NULL, NULL, 0, NULL, NULL);], + [AC_MSG_RESULT(yes) AC_DEFINE(WITH_PCSC120, 1, [old version of PCSC])], + [AC_MSG_RESULT(no)] + ) ]) AC_SUBST(SCARDOBJ) diff --git a/scard.c b/scard.c index 357615d..af596f6 100644 --- a/scard.c +++ b/scard.c @@ -25,7 +25,7 @@ #include #include #ifndef MAKE_PROTO -#ifdef PCSC_OSX +#ifdef __APPLE__ #include #include #include