CVS: rdesktop configure.ac, 1.32, 1.33 scard.c, 1.1, 1.2 scard.h, 1.1, 1.2 types.h, 1.29, 1.30

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

Modified Files:
	configure.ac scard.c scard.h types.h 
Log Message:
Add smartcard support for mac os x


Index: configure.ac
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/configure.ac,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** configure.ac	1 Nov 2006 20:52:00 -0000	1.32
--- configure.ac	1 Nov 2006 21:23:08 -0000	1.33
***************
*** 84,95 ****
  	     ],
               [ 
! 		if test -n "$PKG_CONFIG"; then
! 			PKG_CHECK_MODULES(PCSCLITE, libpcsclite, [WITH_SCARD=1], [WITH_SCARD=0])
! 			if test x"$WITH_SCARD" = "x1"; then
! 				SCARDOBJ="scard.o"
! 				CFLAGS="$CFLAGS $PCSCLITE_CFLAGS"
! 				LIBS="$LIBS $PCSCLITE_LIBS"
! 				AC_DEFINE(WITH_SCARD)
! 			fi
  		fi
               ])
--- 84,107 ----
  	     ],
               [ 
! 	     	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"
! 				;;
! 			*)
! 				if test -n "$PKG_CONFIG"; then
! 					PKG_CHECK_MODULES(PCSCLITE, libpcsclite, [WITH_SCARD=1], [WITH_SCARD=0])
! 				fi
! 				;;
! 		esac
! 
! 		if test x"$WITH_SCARD" = "x1"; then
! 			SCARDOBJ="scard.o"
! 			CFLAGS="$CFLAGS $PCSCLITE_CFLAGS"
! 			LIBS="$LIBS $PCSCLITE_LIBS"
! 			AC_DEFINE(WITH_SCARD)
  		fi
               ])

Index: scard.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/scard.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** scard.c	1 Nov 2006 20:52:00 -0000	1.1
--- scard.c	1 Nov 2006 21:23:08 -0000	1.2
***************
*** 14,19 ****
--- 14,24 ----
  #include <time.h>
  #ifndef MAKE_PROTO
+ #ifdef PCSC_OSX
+ #include <PCSC/pcsclite.h>
+ #include <PCSC/winscard.h>
+ #else
  #include <pcsclite.h>
  #include <winscard.h>
+ #endif /* PCSC_OSX */
  #include "scard.h"
  
***************
*** 2080,2084 ****
  	SERVER_DWORD map[3];
  	SERVER_DWORD dwControlCode;
! 	char *pInBuffer, *pOutBuffer;
  	SERVER_DWORD nInBufferSize, nOutBufferSize, nOutBufferRealSize, nBytesReturned;
  	MYPCSC_DWORD sc_nBytesReturned;
--- 2085,2089 ----
  	SERVER_DWORD map[3];
  	SERVER_DWORD dwControlCode;
! 	unsigned char *pInBuffer, *pOutBuffer;
  	SERVER_DWORD nInBufferSize, nOutBufferSize, nOutBufferRealSize, nBytesReturned;
  	MYPCSC_DWORD sc_nBytesReturned;

Index: scard.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/scard.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** scard.h	1 Nov 2006 20:52:00 -0000	1.1
--- scard.h	1 Nov 2006 21:23:08 -0000	1.2
***************
*** 7,11 ****
  
  #include <pthread.h>
- #include <pcsclite.h>
  #include "proto.h"
  
--- 7,10 ----

Index: types.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/types.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** types.h	1 Nov 2006 20:52:01 -0000	1.29
--- types.h	1 Nov 2006 21:23:08 -0000	1.30
***************
*** 20,24 ****
--- 20,28 ----
  
  #ifdef WITH_SCARD
+ #ifdef PCSC_OSX
+ #include <PCSC/wintypes.h>
+ #else
  #include <wintypes.h>
+ #endif /* PCSC_OSX */
  #else
  typedef int BOOL;


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642