mirror of https://gerrit.osmocom.org/libosmocore
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.
This commit is contained in:
parent
8497b0a786
commit
18bcc8ab62
10
configure.ac
10
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])],
|
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)
|
enable_pcsc="yes"
|
||||||
osmo_ac_have_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,
|
AC_ARG_ENABLE(talloc,
|
||||||
[AS_HELP_STRING(
|
[AS_HELP_STRING(
|
||||||
|
|
|
@ -3,7 +3,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||||
AM_CFLAGS = -Wall
|
AM_CFLAGS = -Wall
|
||||||
|
|
||||||
bin_PROGRAMS = osmo-arfcn osmo-auc-gen
|
bin_PROGRAMS = osmo-arfcn osmo-auc-gen
|
||||||
noinst_PROGRAMS = osmo-sim-test
|
|
||||||
|
|
||||||
osmo_arfcn_SOURCES = osmo-arfcn.c
|
osmo_arfcn_SOURCES = osmo-arfcn.c
|
||||||
osmo_arfcn_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
|
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_SOURCES = osmo-auc-gen.c
|
||||||
osmo_auc_gen_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
|
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_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_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la $(top_builddir)/src/sim/libosmosim.la $(PCSC_LIBS)
|
||||||
osmo_sim_test_CFLAGS = -I/usr/include/PCSC
|
osmo_sim_test_CFLAGS = $(PCSC_CFLAGS)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue