diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-11-14 15:06:09 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-11-14 15:06:09 +0100 |
| commit | 18bcc8ab6214e92539370eb3c5b601f18def4dde (patch) | |
| tree | 86aa13dfd5b5a8b749c713d289858553d07d91ce | |
| parent | 8497b0a78671e09015ec2cb40f0a21cae7baf5ad (diff) | |
pcsc: Allow to disable the PCSC dependency
* PCSC is enabled by default
* --enable-pcsc is enabling it
* --disable-pcscis disabling it
* Fix the makefile of the utilities to not build pcsc and
use the right header files/libraries.
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | utils/Makefile.am | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 80e2bccb..ef74932b 100644 --- a/configure.ac +++ b/configure.ac @@ -84,13 +84,15 @@ AC_CONFIG_HEADER(config.h) AC_ARG_ENABLE([pcsc], [AS_HELP_STRING([--disable-pcsc], [Build without PC/SC support])], [ - osmo_ac_have_pcsc=$enableval + enable_pcsc=$enableval ], [ - PKG_CHECK_MODULES(PCSC, libpcsclite) - osmo_ac_have_pcsc="yes" + enable_pcsc="yes" ]) -AM_CONDITIONAL(ENABLE_PCSC, test "x$osmo_ac_have_pcsc" = "xyes") +if test "x$enable_pcsc" = "xyes" ; then + PKG_CHECK_MODULES(PCSC, libpcsclite) +fi +AM_CONDITIONAL(ENABLE_PCSC, test "x$enable_pcsc" = "xyes") AC_ARG_ENABLE(talloc, [AS_HELP_STRING( diff --git a/utils/Makefile.am b/utils/Makefile.am index 7d784bd2..41f91f9f 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -3,7 +3,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = -Wall bin_PROGRAMS = osmo-arfcn osmo-auc-gen -noinst_PROGRAMS = osmo-sim-test osmo_arfcn_SOURCES = osmo-arfcn.c osmo_arfcn_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la @@ -11,7 +10,10 @@ osmo_arfcn_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/li osmo_auc_gen_SOURCES = osmo-auc-gen.c osmo_auc_gen_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la +if ENABLE_PCSC +noinst_PROGRAMS = osmo-sim-test osmo_sim_test_SOURCES = osmo-sim-test.c -osmo_sim_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la $(top_builddir)/src/sim/libosmosim.la -lpcsclite -osmo_sim_test_CFLAGS = -I/usr/include/PCSC +osmo_sim_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la $(top_builddir)/src/sim/libosmosim.la $(PCSC_LIBS) +osmo_sim_test_CFLAGS = $(PCSC_CFLAGS) +endif endif |