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         -../aclocal.m4: acx_pthread.m4 dc_shobjs.m4
            1  +../aclocal.m4: acx_pthread.m4 dc_shobjs.m4 dc_pcscheaders.m4
     2      2   	cat $^ > "$@"

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

            1  +AC_DEFUN(DC_PCSC_HEADERS, [
            2  +	SAVE_CFLAGS="${CFLAGS}"
            3  +	SAVE_CPPFLAGS="${CPPFLAGS}"
            4  +	ADD_CFLAGS=""
            5  +	ADD_CPPFLAGS=""
            6  +
            7  +	for headerpath in /usr/include /usr/local/include /usr/cac/include; do
            8  +		for subdir in smartcard PCSC pcsc pcsclite ""; do
            9  +			headerdir="${headerpath}/${subdir}"
           10  +			CFLAGS="${SAVE_CFLAGS} -I${headerdir}"
           11  +			CPPFLAGS="${SAVE_CPPFLAGS} -I${headerdir}"
           12  +
           13  +			unset ac_cv_header_pcsclite_h
           14  +
           15  +			AC_CHECK_HEADER(pcsclite.h, [
           16  +				AC_DEFINE(HAVE_PCSCLITE_H, [1], [Define if you have the PCSC-Lite header file (you should)])
           17  +
           18  +				ADD_CFLAGS=" -I${headerdir}"
           19  +				ADD_CPPFLAGS=" -I${headerdir}"
           20  +
           21  +				break
           22  +			])
           23  +		done
           24  +
           25  +		if test -n "${ADD_CFLAGS}" -o -n "${ADD_CPPFLAGS}"; then
           26  +			break
           27  +		fi
           28  +	done
           29  +
           30  +	CFLAGS="${SAVE_CFLAGS}${ADD_CFLAGS}"
           31  +	CPPFLAGS="${SAVE_CPPFLAGS}${ADD_CPPFLAGS}"
           32  +])

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

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

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

    58     58   #ifdef HAVE_UNISTD_H
    59     59   #  include <unistd.h>
    60     60   #endif
    61     61   #ifdef HAVE_PTHREAD_H
    62     62   #  include <pthread.h>
    63     63   #endif
    64     64   ])
           65  +
           66  +dnl Check for PC/SC headers
           67  +DC_PCSC_HEADERS
    65     68   
    66     69   dnl Upate LDFLAGS to include setting the run-time linker path to the same as our compile-time linker
    67     70   DC_SYNC_RPATH
    68     71   
    69     72   dnl If we updated LIBOBJS, update SHLIBOBJS -- must be last.
    70     73   DC_SYNC_SHLIBOBJS
    71     74   
    72     75   dnl Produce Makefile
    73     76   AC_OUTPUT(Makefile)