<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17480">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">introduce --disable-remsim-client-{st2,ifdhanndler}<br><br>Change-Id: I4aaeeedc9df873f2e7edfbfab587fec2dfad85c4<br>---<br>M configure.ac<br>M src/Makefile.am<br>M src/client/Makefile.am<br>3 files changed, 22 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 586d7ef..7af6801 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -55,20 +55,28 @@</span><br><span> [osmo_ac_build_bankd="$enableval"],[osmo_ac_build_bankd="yes"])</span><br><span> if test "$osmo_ac_build_bankd" = "yes"; then</span><br><span> AC_DEFINE(BUILD_BANKD, 1, [Define if we want to build osmo-remsim-bankd])</span><br><span style="color: hsl(0, 100%, 40%);">- PKG_CHECK_MODULES(OSMOSIM, libosmosim)</span><br><span> PKG_CHECK_MODULES(PCSC, libpcsclite)</span><br><span> fi</span><br><span> AM_CONDITIONAL(BUILD_BANKD, test "x$osmo_ac_build_bankd" = "xyes")</span><br><span> AC_SUBST(BUILD_BANKD)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AC_ARG_ENABLE([remsim-client],[AS_HELP_STRING([--disable-remsim-client], [Build osmo-remsim-client])],</span><br><span style="color: hsl(0, 100%, 40%);">- [osmo_ac_build_client="$enableval"],[osmo_ac_build_client="yes"])</span><br><span style="color: hsl(0, 100%, 40%);">-if test "$osmo_ac_build_client" = "yes"; then</span><br><span style="color: hsl(0, 100%, 40%);">- AC_DEFINE(BUILD_CLIENT, 1, [Define if we want to build osmo-remsim-client])</span><br><span style="color: hsl(0, 100%, 40%);">- PKG_CHECK_MODULES(OSMOSIM, libosmosim)</span><br><span style="color: hsl(120, 100%, 40%);">+AC_ARG_ENABLE([remsim-client-st2],[AS_HELP_STRING([--disable-remsim-client-st2], [Build osmo-remsim-client-st2])],</span><br><span style="color: hsl(120, 100%, 40%);">+ [osmo_ac_build_client_st2="$enableval"],[osmo_ac_build_client_st2="yes"])</span><br><span style="color: hsl(120, 100%, 40%);">+if test "$osmo_ac_build_client_st2" = "yes"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE(BUILD_CLIENT_ST2, 1, [Define if we want to build osmo-remsim-client-st2])</span><br><span> PKG_CHECK_MODULES(OSMOUSB, libosmousb)</span><br><span> PKG_CHECK_MODULES(OSMOSIMTRACE2, libosmo-simtrace2)</span><br><span> PKG_CHECK_MODULES(USB, libusb-1.0)</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CONDITIONAL(BUILD_CLIENT_ST2, test "x$osmo_ac_build_client_st2" = "xyes")</span><br><span style="color: hsl(120, 100%, 40%);">+AC_SUBST(BUILD_CLIENT_ST2)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+AC_ARG_ENABLE([remsim-client-ifdhandler],[AS_HELP_STRING([--disable-remsim-client-ifdhandler],</span><br><span style="color: hsl(120, 100%, 40%);">+ [Build osmo-remsim-client-ifdhandler])],</span><br><span style="color: hsl(120, 100%, 40%);">+ [osmo_ac_build_client_ifdhandler="$enableval"],[osmo_ac_build_client_ifdhandler="yes"])</span><br><span style="color: hsl(120, 100%, 40%);">+if test "$osmo_ac_build_client_ifdhandler" = "yes"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE(BUILD_CLIENT_IFDHANDLER, 1, [Define if we want to build osmo-remsim-client-ifdhandler])</span><br><span style="color: hsl(120, 100%, 40%);">+ PKG_CHECK_MODULES(PCSC, libpcsclite)</span><br><span> </span><br><span> ifd_dropdir=`pkg-config --variable=usbdropdir libpcsclite`</span><br><span> # allow user to override the dropdir for the PCSC driver bundle</span><br><span>@@ -80,8 +88,8 @@</span><br><span> [serialconfdir="${withval}"], [serialconfdir="${_serialconfdir}"])</span><br><span> AC_SUBST(serialconfdir)</span><br><span> fi</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CONDITIONAL(BUILD_CLIENT, test "x$osmo_ac_build_client" = "xyes")</span><br><span style="color: hsl(0, 100%, 40%);">-AC_SUBST(BUILD_CLIENT)</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CONDITIONAL(BUILD_CLIENT_IFDHANDLER, test "x$osmo_ac_build_client_ifdhandler" = "xyes")</span><br><span style="color: hsl(120, 100%, 40%);">+AC_SUBST(BUILD_CLIENT_IFDHANDLER)</span><br><span> </span><br><span> </span><br><span> AC_CONFIG_MACRO_DIR([m4])</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index 5f71df5..9059324 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -5,9 +5,7 @@</span><br><span> if BUILD_SERVER</span><br><span> SUBDIRS += server</span><br><span> endif</span><br><span style="color: hsl(0, 100%, 40%);">-if BUILD_CLIENT</span><br><span> SUBDIRS += client</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span> </span><br><span> AM_CFLAGS = -Wall -I$(top_srcdir)/include -I$(top_builddir)/include \</span><br><span> $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMOABIS_CFLAGS) \</span><br><span>diff --git a/src/client/Makefile.am b/src/client/Makefile.am</span><br><span>index 871221a..b4d5bd5 100644</span><br><span>--- a/src/client/Makefile.am</span><br><span>+++ b/src/client/Makefile.am</span><br><span>@@ -4,7 +4,7 @@</span><br><span> $(OSMOSIMTRACE2_CFLAGS) \</span><br><span> -I$(top_srcdir)/include/osmocom/rspro</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bin_PROGRAMS = osmo-remsim-client-st2 osmo-remsim-client-shell</span><br><span style="color: hsl(120, 100%, 40%);">+bin_PROGRAMS = osmo-remsim-client-shell</span><br><span> </span><br><span> osmo_remsim_client_shell_SOURCES = user_shell.c remsim_client_main.c \</span><br><span> remsim_client.c main_fsm.c ../rspro_client_fsm.c ../debug.c</span><br><span>@@ -12,6 +12,7 @@</span><br><span> osmo_remsim_client_shell_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span> $(top_builddir)/src/libosmo-rspro.la</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+if BUILD_CLIENT_IFDHANDLER</span><br><span> EXTRA_DIST=PkgInfo osmo-remsim-client-reader_conf.in</span><br><span> serialconf_DATA=osmo-remsim-client-reader_conf</span><br><span> bundledir=$(usbdropdir)/libifd-osmo-remsim-client.bundle/Contents</span><br><span>@@ -25,7 +26,10 @@</span><br><span> libifd_remsim_client_la_LDFLAGS = -no-undefined</span><br><span> libifd_remsim_client_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span> $(top_builddir)/src/libosmo-rspro.la</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+if BUILD_CLIENT_ST2</span><br><span style="color: hsl(120, 100%, 40%);">+bin_PROGRAMS += osmo-remsim-client-st2</span><br><span> osmo_remsim_client_st2_SOURCES = user_simtrace2.c remsim_client_main.c \</span><br><span> remsim_client.c main_fsm.c ../rspro_client_fsm.c ../debug.c</span><br><span> osmo_remsim_client_st2_CPPFLAGS = -DUSB_SUPPORT</span><br><span>@@ -34,5 +38,6 @@</span><br><span> $(OSMOUSB_LIBS) $(OSMOSIMTRACE2_LIBS) \</span><br><span> $(USB_LIBS) \</span><br><span> $(top_builddir)/src/libosmo-rspro.la</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span> </span><br><span> noinst_HEADERS = client.h </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17480">change 17480</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-remsim/+/17480"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4aaeeedc9df873f2e7edfbfab587fec2dfad85c4 </div>
<div style="display:none"> Gerrit-Change-Number: 17480 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>