Changeset 3455 for trunk/configure.ac

Timestamp:

04/02/08 05:44:12 (9 months ago)

Author:

alonbl

Message:

Rename PC/SC library into PC/SC provider.
Sync symbols between configuration and source.
Put default provider in opensc.conf, opensc-tool.

Files:

• trunk/configure.ac (modified) (4 diffs)

trunk/configure.ac

@@ -485 +485 @@
                 case "${host}" in
                         *-*-darwin*)
-                                with_pcsc_provider="${full_usrlibdir}/libpcsclite.so"
+                                DEFAULT_PCSC_PROVIDER="${full_usrlibdir}/libpcsclite.so"
                         ;;
                         *-mingw32*|*-winnt*|*-cygwin*)
-                                with_pcsc_provider="winscard.dll"
+                                DEFAULT_PCSC_PROVIDER="winscard.dll"
                         ;;
                         *)
-                                with_pcsc_provider="${full_usrlibdir}/libpcsclite.so"
+                                DEFAULT_PCSC_PROVIDER="${full_usrlibdir}/libpcsclite.so"
                         ;;
                 esac
-        fi
-        AC_DEFINE_UNQUOTED([PCSC_DEFAULT_LIBRARY_NAME], ["${with_pcsc_provider}"], [Default PC/SC library])
+        else
+                DEFAULT_PCSC_PROVIDER="${with_pcsc_provider}"
+        fi
+        AC_DEFINE_UNQUOTED([DEFAULT_PCSC_PROVIDER], ["${DEFAULT_PCSC_PROVIDER}"], [Default PC/SC provider])
 fi
 
@@ -534 +536 @@
         OPTIONAL_OPENCT_LIBS="${OPENCT_LIBS}"
 fi
-test "${enable_pcsc}" = "yes" && OPENSC_FEATURES="${OPENSC_FEATURES} pcsc"
+test "${enable_pcsc}" = "yes" && OPENSC_FEATURES="${OPENSC_FEATURES} pcsc(${DEFAULT_PCSC_PROVIDER})"
 test "${enable_nsplugin}" = "yes" && OPENSC_FEATURES="${OPENSC_FEATURES} nsplugin"
 
@@ -559 +561 @@
 AC_SUBST([OPENSC_LT_OLDEST])
 AC_SUBST([WIN_LIBPREFIX])
+AC_SUBST([DEFAULT_PCSC_PROVIDER])
 AC_SUBST([OPTIONAL_ZLIB_CFLAGS])
 AC_SUBST([OPTIONAL_ZLIB_LIBS])
@@ -638 +641 @@
 NSPlugin support:        ${enable_nsplugin}
 
-PC/SC default provider:  ${with_pcsc_provider}
+PC/SC default provider:  ${DEFAULT_PCSC_PROVIDER}
 pinentry:                ${with_pinentry}