[Pcsclite-cvs-commit] r4218 - /trunk/libmusclecard/configure.in

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Wed May 20 18:55:29 2009
New Revision: 4218

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4218
Log:
improve detection of libpcsclite so it can be used on Mac OS X

Modified:
    trunk/libmusclecard/configure.in

Modified: trunk/libmusclecard/configure.in
URL: http://svn.debian.org/wsvn/pcsclite/trunk/libmusclecard/configure.in?rev=4218&op=diff
==============================================================================
--- trunk/libmusclecard/configure.in (original)
+++ trunk/libmusclecard/configure.in Wed May 20 18:55:29 2009
@@ -40,13 +40,17 @@
 AC_CHECK_FUNCS(readdir sprintf strcmp strstr snprintf)
 
 # check pcsc-lite version
-PKG_CHECK_MODULES(PCSCLITE, libpcsclite >= 1.2.9-beta7, [],
-	[ if test -f $prefix/lib/pkgconfig/libpcsclite.pc ; then
-		AC_MSG_ERROR([install pkg-config or set PKG_CONFIG_PATH to pkgconfig directory])
-	  else
-		AC_MSG_WARN([install pcsc-lite 1.2.9-beta7 or later])
-	  fi
-	])
+PCSC_NEEDED_VERSION="1.2.9-beta7"
+PKG_CHECK_EXISTS([libpcsclite],
+	PKG_CHECK_MODULES(PCSCLITE, libpcsclite >= $PCSC_NEEDED_VERSION, [],
+		[ if test -f $prefix/lib/pkgconfig/libpcsclite.pc ; then
+			AC_MSG_ERROR([install pkg-config or set PKG_CONFIG_PATH to pkgconfig directory])
+		  else
+			AC_MSG_WARN([install pcsc-lite $PCSC_NEEDED_VERSION or later])
+		  fi
+		]),
+	[AC_MSG_WARN([libpcsclite not found by pkg-config])]
+)
 OLD_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $PCSCLITE_CFLAGS"
 AC_CHECK_HEADER(winscard.h, [],