r3081 - in trunk: build.d libmcrypto/m4 libmcrypto/source

[mikma at minisip.org]

Author: mikma
Date: 2007-01-03 20:27:29 +0100 (Wed, 03 Jan 2007)
New Revision: 3081

Modified:
   trunk/build.d/build.conf
   trunk/libmcrypto/m4/libmcrypto.m4
   trunk/libmcrypto/source/Makefile.am
Log:
* Add scsim configure param to build system.
* Check libpcsclite using pkg-config, and add CFLAGS and LIBS where needed.



Modified: trunk/build.d/build.conf
===================================================================
--- trunk/build.d/build.conf	2007-01-03 17:10:06 UTC (rev 3080)
+++ trunk/build.d/build.conf	2007-01-03 19:27:29 UTC (rev 3081)
@@ -65,6 +65,7 @@
 	'fast-aes' => 0,	# enables built-in AES algorithm for testing
 	openssl => undef,	# specifies location of openssl files
 	gnutls => undef,	# specifies location of gnutls files
+	scsim => undef,		# Smart card support based on PCSC lite
 );
 
 my %libzrtp_params = (

Modified: trunk/libmcrypto/m4/libmcrypto.m4
===================================================================
--- trunk/libmcrypto/m4/libmcrypto.m4	2007-01-03 17:10:06 UTC (rev 3080)
+++ trunk/libmcrypto/m4/libmcrypto.m4	2007-01-03 19:27:29 UTC (rev 3081)
@@ -72,11 +72,12 @@
 #
 
 AC_DEFUN([AM_LIBMCRYPTO_CHECK_SCSIM], [
-AC_CHECK_LIB([pcsclite], [SCardTransmit],[
-		SCSIM_LIBS="-lpcsclite"
-	],[])
-AC_SUBST(SCSIM_LIBS)
+PKG_CHECK_MODULES([SCSIM], [libpcsclite])
+
+mcrypto_save_LIBS="${LIBS}"
 LIBS="${SCSIM_LIBS} ${LIBS}"
+AC_CHECK_FUNCS([SCardTransmit],,[AC_MSG_ERROR([PCSC lite not found])])
+LIBS="${mcrypto_save_LIBS}"
 ])
 
 # AM_LIBMCRYPTO_CHECK_GNUTLS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])

Modified: trunk/libmcrypto/source/Makefile.am
===================================================================
--- trunk/libmcrypto/source/Makefile.am	2007-01-03 17:10:06 UTC (rev 3080)
+++ trunk/libmcrypto/source/Makefile.am	2007-01-03 19:27:29 UTC (rev 3081)
@@ -13,7 +13,7 @@
 SUBDIRS = $(BUILD_DIRS) uuid .
 DIST_SUBDIRS = openssl gnutls uuid
 
-AM_CPPFLAGS = $(MINISIP_CFLAGS)
+AM_CPPFLAGS = $(MINISIP_CFLAGS) $(SCSIM_CFLAGS)
 noinst_LTLIBRARIES = \
 		libmcrypto_core.la \
 		libmcrypto_imp.la
@@ -40,6 +40,8 @@
 		uuid.cxx \
 		rijndael-alg-fst.cxx
 
+libmcrypto_core_la_LIBADD = $(SCSIM_LIBS)
+
 libmcrypto_imp_la_SOURCES = # none
 libmcrypto_imp_la_LIBADD = $(BUILD_LIBS)