CVS: rdesktop configure.ac, 1.39, 1.40 scard.c, 1.24, 1.25

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15790

Modified Files:
	configure.ac scard.c 
Log Message:
really check for version of pcsclite in configure.ac
this fixes the smartcard-support on OS X 10.5


Index: configure.ac
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/configure.ac,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** configure.ac	13 Jun 2007 14:53:32 -0000	1.39
--- configure.ac	28 Oct 2007 16:49:45 -0000	1.40
***************
*** 96,101 ****
  			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"
--- 96,99 ----
***************
*** 114,117 ****
--- 112,130 ----
  			AC_DEFINE(WITH_SCARD)
  		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)]
+ 		)
               ])
  

Index: scard.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/scard.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** scard.c	3 Jul 2007 14:20:04 -0000	1.24
--- scard.c	28 Oct 2007 16:49:45 -0000	1.25
***************
*** 26,30 ****
  #include <time.h>
  #ifndef MAKE_PROTO
! #ifdef PCSC_OSX
  #include <PCSC/wintypes.h>
  #include <PCSC/pcsclite.h>
--- 26,30 ----
  #include <time.h>
  #ifndef MAKE_PROTO
! #ifdef __APPLE__
  #include <PCSC/wintypes.h>
  #include <PCSC/pcsclite.h>


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/