really check for version of pcsclite in configure.ac
this fixes the smartcard-support on OS X 10.5 git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1419 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
9866572002
commit
27c360df03
17
configure.ac
17
configure.ac
@ -95,8 +95,6 @@ AC_ARG_ENABLE(smartcard,
|
|||||||
case "$OSTYPE" in
|
case "$OSTYPE" in
|
||||||
darwin*)
|
darwin*)
|
||||||
AC_CHECK_HEADER(PCSC/pcsclite.h, [WITH_SCARD=1], [WITH_SCARD=0])
|
AC_CHECK_HEADER(PCSC/pcsclite.h, [WITH_SCARD=1], [WITH_SCARD=0])
|
||||||
AC_DEFINE(PCSC_OSX)
|
|
||||||
AC_DEFINE(WITH_PCSC120)
|
|
||||||
PCSCLITE_CFLAGS=""
|
PCSCLITE_CFLAGS=""
|
||||||
PCSCLITE_LIBS="-framework PCSC"
|
PCSCLITE_LIBS="-framework PCSC"
|
||||||
;;
|
;;
|
||||||
@ -113,6 +111,21 @@ AC_ARG_ENABLE(smartcard,
|
|||||||
LIBS="$LIBS $PCSCLITE_LIBS"
|
LIBS="$LIBS $PCSCLITE_LIBS"
|
||||||
AC_DEFINE(WITH_SCARD)
|
AC_DEFINE(WITH_SCARD)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([for old version of PCSC])
|
||||||
|
AC_TRY_LINK([
|
||||||
|
#include <stdlib.h>
|
||||||
|
#ifdef __APPLE__
|
||||||
|
#include <PCSC/wintypes.h>
|
||||||
|
#include <PCSC/winscard.h>
|
||||||
|
#else
|
||||||
|
#include <winscard.h>
|
||||||
|
#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)
|
AC_SUBST(SCARDOBJ)
|
||||||
|
2
scard.c
2
scard.c
@ -25,7 +25,7 @@
|
|||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#ifndef MAKE_PROTO
|
#ifndef MAKE_PROTO
|
||||||
#ifdef PCSC_OSX
|
#ifdef __APPLE__
|
||||||
#include <PCSC/wintypes.h>
|
#include <PCSC/wintypes.h>
|
||||||
#include <PCSC/pcsclite.h>
|
#include <PCSC/pcsclite.h>
|
||||||
#include <PCSC/winscard.h>
|
#include <PCSC/winscard.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user