r3027 - in trunk/libmcrypto: . m4

[erik at minisip.org]

Author: erik
Date: 2006-12-13 00:18:17 +0100 (Wed, 13 Dec 2006)
New Revision: 3027

Modified:
   trunk/libmcrypto/configure.ac
   trunk/libmcrypto/m4/libmcrypto.m4
Log:

 * Compile fix: This should be a proper fix for compilation both with and
   without --enable-scsim.



Modified: trunk/libmcrypto/configure.ac
===================================================================
--- trunk/libmcrypto/configure.ac	2006-12-12 22:55:43 UTC (rev 3026)
+++ trunk/libmcrypto/configure.ac	2006-12-12 23:18:17 UTC (rev 3027)
@@ -28,16 +28,15 @@
 dnl Checks for libraries.
 AM_LIBMCRYPTO_CHECK_OPENSSL
 AM_LIBMCRYPTO_CHECK_GNUTLS
-AM_LIBMCRYPTO_CHECK_SCSIM
 
 AC_ARG_ENABLE(scsim,
     AS_HELP_STRING([--enable-scsim],
         [enables hardware authentication token support]),
     [ if test "${enable_scsim}" = "yes"
       then
+        AM_LIBMCRYPTO_CHECK_SCSIM
         AC_DEFINE(ENABLE_SCSIM, [], [hardware SIM support is enabled])
         ENABLE_SCSIM="yes"
-	SCSIM_LIBS="-lpcsclite"
       fi
       ])
 AM_CONDITIONAL(ENABLE_SCSIM, test "${ENABLE_SCSIM}" = "yes" )

Modified: trunk/libmcrypto/m4/libmcrypto.m4
===================================================================
--- trunk/libmcrypto/m4/libmcrypto.m4	2006-12-12 22:55:43 UTC (rev 3026)
+++ trunk/libmcrypto/m4/libmcrypto.m4	2006-12-12 23:18:17 UTC (rev 3027)
@@ -68,9 +68,11 @@
 #
 
 AC_DEFUN([AM_LIBMCRYPTO_CHECK_SCSIM], [
-#SCSIM_LIBS="-lpcsclite"
+AC_CHECK_LIB([pcsclite], [SCardTransmit],[
+		SCSIM_LIBS="-lpcsclite"
+	],[])
 AC_SUBST(SCSIM_LIBS)
-#LIBS="${SCSIM_LIBS} ${LIBS}"
+LIBS="${SCSIM_LIBS} ${LIBS}"
 ])
 
 # AM_LIBMCRYPTO_CHECK_GNUTLS()