Check-in [8a2230f927]
Overview
Comment:Added checks for PCSC Header

Updated ignores

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:8a2230f9276dd11f569cf6315f80e205acdfb671
User & Date: rkeene on 2010-05-04 18:30:02
Other Links: manifest | tags
Context
2010-05-04
19:04
Copied SSH Agent PKCS11 Provider to CACKey for use as a base check-in: 074f157a6a user: rkeene tags: trunk
18:30
Added checks for PCSC Header

Updated ignores check-in: 8a2230f927 user: rkeene tags: trunk

18:05
Added CACKey project check-in: 5f05cafcb7 user: rkeene tags: trunk
Changes

Modified aclocal/Makefile from [d2222baa13] to [0c585cbc20].

1
2
../aclocal.m4: acx_pthread.m4 dc_shobjs.m4
	cat $^ > "$@"
|

1
2
../aclocal.m4: acx_pthread.m4 dc_shobjs.m4 dc_pcscheaders.m4
	cat $^ > "$@"

Added aclocal/dc_pcscheaders.m4 version [253ee75c46].

































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
AC_DEFUN(DC_PCSC_HEADERS, [
	SAVE_CFLAGS="${CFLAGS}"
	SAVE_CPPFLAGS="${CPPFLAGS}"
	ADD_CFLAGS=""
	ADD_CPPFLAGS=""

	for headerpath in /usr/include /usr/local/include /usr/cac/include; do
		for subdir in smartcard PCSC pcsc pcsclite ""; do
			headerdir="${headerpath}/${subdir}"
			CFLAGS="${SAVE_CFLAGS} -I${headerdir}"
			CPPFLAGS="${SAVE_CPPFLAGS} -I${headerdir}"

			unset ac_cv_header_pcsclite_h

			AC_CHECK_HEADER(pcsclite.h, [
				AC_DEFINE(HAVE_PCSCLITE_H, [1], [Define if you have the PCSC-Lite header file (you should)])

				ADD_CFLAGS=" -I${headerdir}"
				ADD_CPPFLAGS=" -I${headerdir}"

				break
			])
		done

		if test -n "${ADD_CFLAGS}" -o -n "${ADD_CPPFLAGS}"; then
			break
		fi
	done

	CFLAGS="${SAVE_CFLAGS}${ADD_CFLAGS}"
	CPPFLAGS="${SAVE_CPPFLAGS}${ADD_CPPFLAGS}"
])

Modified cackey.c from [5d2cb9e273] to [02188b8075].





1
2
3






#ifdef HAVE_PCSCLITE_H
#include <pcsclite.h>
#endif


>
>
>
>



>
>
1
2
3
4
5
6
7
8
9
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif

#ifdef HAVE_PCSCLITE_H
#include <pcsclite.h>
#endif


Modified configure.ac from [d3c01ad0d4] to [0206db0963].

58
59
60
61
62
63
64



65
66
67
68
69
70
71
72
73
#ifdef HAVE_UNISTD_H
#  include <unistd.h>
#endif
#ifdef HAVE_PTHREAD_H
#  include <pthread.h>
#endif
])




dnl Upate LDFLAGS to include setting the run-time linker path to the same as our compile-time linker
DC_SYNC_RPATH

dnl If we updated LIBOBJS, update SHLIBOBJS -- must be last.
DC_SYNC_SHLIBOBJS

dnl Produce Makefile
AC_OUTPUT(Makefile)







>
>
>









58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
#ifdef HAVE_UNISTD_H
#  include <unistd.h>
#endif
#ifdef HAVE_PTHREAD_H
#  include <pthread.h>
#endif
])

dnl Check for PC/SC headers
DC_PCSC_HEADERS

dnl Upate LDFLAGS to include setting the run-time linker path to the same as our compile-time linker
DC_SYNC_RPATH

dnl If we updated LIBOBJS, update SHLIBOBJS -- must be last.
DC_SYNC_SHLIBOBJS

dnl Produce Makefile
AC_OUTPUT(Makefile)