Changeset 542 for branches

Timestamp:

07/19/04 21:03:22 (4 years ago)

Author:

aj

Message:

Try pkg-config for detection, fall back to conventional code.

Location:

branches/openct-0.6

Files:

• configure.ac (modified) (6 diffs)
• src/ifd/Makefile.am (modified) (1 diff)
• src/pcsc/Makefile.am (modified) (1 diff)

branches/openct-0.6/configure.ac

@@ -17 +17 @@
 #   (Interfaces removed:                AGE=0)
 OPENCT_LT_CURRENT=0
-OPENCT_LT_REVISION=1
+OPENCT_LT_REVISION=2
 OPENCT_LT_AGE=0
 
@@ -199 +199 @@
 PCSC_MSG=no
 pcsc_path=/usr
-AC_SUBST(CFLAGS_PCSC)
-AC_SUBST(LIBPCSC)
+AC_SUBST(PCSC_CFLAGS)
+AC_SUBST(PCSC_LIBS)
 
 case "$host" in
 *-*-darwin*)
         PCSC_MSG=yes
-        CFLAGS_PCSC=""
-        LIBPCSC="-Wl,-framework,PCSC"
+        PCSC_CFLAGS=""
+        PCSC_LIBS="-Wl,-framework,PCSC"
         ;;
 esac
@@ -221 +221 @@
 if test "x$pcsc_path" != "xno" -a "x$PCSC_MSG" != "xyes"; then
         AC_MSG_CHECKING(for PC/SC Lite support)
-        for pcscdir in /pcsc ""; do
+        PKG_CHECK_MODULES(PCSC, libpcsclite, [
+                PCSC_MSG="yes" 
+                AC_MSG_RESULT($PCSC_MSG)
+                ], [
+        for pcscdir in "" /pcsc /PCSC; do
                 CPPFLAGS="$saved_CPPFLAGS"
                 LDFLAGS="$saved_LDFLAGS"
                 LIBS="-lpcsclite $saved_LIBS"
-                CFLAGS_PCSC=""
+                PCSC_CFLAGS=""
 
                 for pcsc_libdir in $pcsc_path/lib$pcscdir \
@@ -242 +246 @@
                               $pcsc_path$pcscdir; do
                       if test -d $pcsc_incdir; then
-                                CFLAGS_PCSC="-I${pcsc_incdir}"
+                                PCSC_CFLAGS="-I${pcsc_incdir}"
                                 break;
                       fi
                 done
 
-                CPPFLAGS="${CFLAGS_PCSC} ${CPPFLAGS}"
+                CPPFLAGS="${PCSC_CFLAGS} ${CPPFLAGS}"
                 AC_TRY_LINK([#include <stdlib.h>
 #include <winscard.h>],[SCardEstablishContext(0, NULL, NULL, NULL);], ac_cv_lib_pcsclite_SCardEstablishContext=yes)
@@ -257 +261 @@
                 LDFLAGS="$saved_LDFLAGS"
                 LIBS="$saved_LIBS"
-                CFLAGS_PCSC=""
+                PCSC_CFLAGS=""
         done
         AC_MSG_RESULT($PCSC_MSG)
         if test "x$PCSC_MSG" = "xyes" ; then
-                LIBPCSC="-lpcsclite"
+                PCSC_LIBS="-lpcsclite"
                 CPPFLAGS="$saved_CPPFLAGS"
                 LIBS="$saved_LIBS"
         fi
+        ])
 fi
 AM_CONDITIONAL(HAVE_PCSC, test "x$PCSC_MSG" = "xyes")
@@ -270 +275 @@
         AC_DEFINE(HAVE_PCSC, 1, [Have PC/SC implementation])
 else
-        LIBPCSC=""
-        CFLAGS_PCSC=""
+        PCSC_LIBS=""
+        PCSC_CFLAGS=""
 fi
 

branches/openct-0.6/src/ifd/Makefile.am

@@ -3 +3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src/scdl @CPPFLAGS@ @CFLAGS_PCSC@
+INCLUDES = -I$(top_srcdir)/src/scdl @CPPFLAGS@ @PCSC_CFLAGS@
 
 lib_LTLIBRARIES = libifd.la

branches/openct-0.6/src/pcsc/Makefile.am

@@ -5 +5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src/ctapi @CPPFLAGS@ @CFLAGS_PCSC@
+INCLUDES = -I$(top_srcdir)/src/ctapi @CPPFLAGS@ @PCSC_CFLAGS@
 
 if HAVE_PCSC