From 495fe2682c37d7e2ba9d969fa0675e59db461790 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Mon, 10 Sep 2012 16:28:17 +0200
Subject: [PATCH] sim: Use autotools for libpcsc-lite linkage

---
 configure.ac        | 10 ++++++++++
 src/sim/Makefile.am | 12 ++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7fc72fda0..80e2bccb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,16 @@ CHECK_TM_INCLUDES_TM_GMTOFF
 dnl Generate the output
 AC_CONFIG_HEADER(config.h)
 
+AC_ARG_ENABLE([pcsc], [AS_HELP_STRING([--disable-pcsc], [Build without PC/SC support])],
+    [
+        osmo_ac_have_pcsc=$enableval
+    ],
+    [
+        PKG_CHECK_MODULES(PCSC, libpcsclite)
+        osmo_ac_have_pcsc="yes"
+    ])
+AM_CONDITIONAL(ENABLE_PCSC, test "x$osmo_ac_have_pcsc" = "xyes")
+
 AC_ARG_ENABLE(talloc,
 	[AS_HELP_STRING(
 		[--disable-talloc],
diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am
index 53f78bdf3..fe64278d3 100644
--- a/src/sim/Makefile.am
+++ b/src/sim/Makefile.am
@@ -3,14 +3,18 @@
 LIBVERSION=0:0:0
 
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -fPIC -Wall
+AM_CFLAGS = -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(PCSC_CFLAGS)
+AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+
+if ENABLE_PCSC
+# FIXME: only build the PC/SC dependent part conditional, but always build other parts
 
 noinst_HEADERS = sim_int.h gsm_int.h
 
 lib_LTLIBRARIES = libosmosim.la
 
 libosmosim_la_SOURCES = core.c card_fs_sim.c card_fs_usim.c card_fs_uicc.c reader.c reader_pcsc.c
-# FIXME: use autoconf to determine pcsc include path / library name
-libosmosim_la_LDFLAGS = -version-info $(LIBVERSION) -lpcsclite
-libosmosim_la_CFLAGS = -I/usr/include/PCSC
+libosmosim_la_LDFLAGS = -version-info $(LIBVERSION)
+libosmosim_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(PCSC_LIBS)
 
+endif