[Pcsclite-cvs-commit] Drivers/ccid configure.in,1.17,1.18
rousseau@haydn.debian.org
rousseau@haydn.debian.org
Update of /cvsroot/pcsclite/Drivers/ccid
In directory haydn:/tmp/cvs-serv22886
Modified Files:
configure.in
Log Message:
check that pkg-config command is present before using it
Index: configure.in
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/configure.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- configure.in 14 May 2004 09:07:29 -0000 1.17
+++ configure.in 14 May 2004 14:14:38 -0000 1.18
@@ -30,6 +30,7 @@
AC_PROG_MAKE_SET
AC_PROG_LN_S
AM_PROG_LEX
+AC_CHECK_PROG([PKGCONFIG], [pkg-config], [yes])
AC_CHECK_FUNCS(strerror)
AC_CHECK_FUNCS(strncpy)
@@ -153,7 +154,11 @@
[usbdropdir="${enableval}"], [usbdropdir=false])
if test "${usbdropdir}" = false ; then
if test "$prefix" = NONE ; then
- usbdropdir=`pkg-config libpcsclite --variable=usbdropdir`
+ if test "$PKGCONFIG" = yes ; then
+ usbdropdir=`pkg-config libpcsclite --variable=usbdropdir`
+ else
+ usbdropdir=""
+ fi
if test -z "$usbdropdir" ; then
usbdropdir="$ac_default_prefix/pcsc/drivers"
fi
@@ -171,7 +176,12 @@
[ccidtwindir="${enableval}"], [ccidtwindir=false])
if test "${ccidtwindir}" = false ; then
if test "$prefix" = NONE ; then
- ccidtwindir=`pkg-config libpcsclite --variable=usbdropdir`
+ if test "$PKGCONFIG" = yes ; then
+ ccidtwindir=`pkg-config libpcsclite --variable=usbdropdir`
+ else
+ AC_MSG_RESULT([You should install pkg-config to get this configured automatically from pcsc-lite installation])
+ ccidtwindir=""
+ fi
if test -z "$ccidtwindir" ; then
ccidtwindir="$ac_default_prefix/pcsc/drivers"
fi