This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Harald Welte gerrit-no-reply at lists.osmocom.orgHello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3767 to look at the new patch set (#4). configure.ac: remove --enable-osmo-bsc, --enable-nat This is the OsmoBSC project. Disabling the build of the BSC would be somewhat odd, so let's remove the option. Also, OsmoBSC depends on libosmo-sccp now, so we must unconditionally depend on it. As a result, we can remove the --enable-nat option, as this was only to avoid a mandatory libosmo-sccp requirement in historical times. Change-Id: Icfee8a904d33b7c13ab8d185d64fb5c2337d8640 --- M configure.ac M debian/rules M src/Makefile.am M tests/Makefile.am 4 files changed, 3 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/67/3767/4 diff --git a/configure.ac b/configure.ac index 1050f3d..e7f0546 100644 --- a/configure.ac +++ b/configure.ac @@ -48,24 +48,7 @@ PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran) # TODO version? PKG_CHECK_MODULES(LIBCRYPTO, libcrypto >= 0.9.5) PKG_CHECK_MODULES(LIBOSMOLEGACYMGCP, libosmo-legacy-mgcp >= 0.0.1) - -# Enabke/disable the NAT? -AC_ARG_ENABLE([nat], [AS_HELP_STRING([--enable-nat], [Build the BSC NAT. Requires SCCP])], - [osmo_ac_build_nat="$enableval"],[osmo_ac_build_nat="no"]) -if test "$osmo_ac_build_nat" = "yes" ; then - PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.2) -fi -AM_CONDITIONAL(BUILD_NAT, test "x$osmo_ac_build_nat" = "xyes") -AC_SUBST(osmo_ac_build_nat) - -# Enable/disable the BSC? -AC_ARG_ENABLE([osmo-bsc], [AS_HELP_STRING([--enable-osmo-bsc], [Build the Osmo BSC])], - [osmo_ac_build_bsc="$enableval"],[osmo_ac_build_bsc="no"]) -if test "$osmo_ac_build_bsc" = "yes" ; then - PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.6) -fi -AM_CONDITIONAL(BUILD_BSC, test "x$osmo_ac_build_bsc" = "xyes") -AC_SUBST(osmo_ac_build_bsc) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.2) # Enable/disable smpp support in the msc? AC_ARG_ENABLE([smpp], [AS_HELP_STRING([--enable-smpp], [Build the SMPP interface])], diff --git a/debian/rules b/debian/rules index 72a7d18..7fe538a 100755 --- a/debian/rules +++ b/debian/rules @@ -44,7 +44,6 @@ %: dh $@ --with autoreconf -CONFIGURE_FLAGS += --enable-osmo-bsc override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) # diff --git a/src/Makefile.am b/src/Makefile.am index 9a26a7b..d04f025 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,17 +32,6 @@ SUBDIRS += \ utils \ ipaccess \ - $(NULL) - -# Conditional Programs -if BUILD_NAT -SUBDIRS += \ + osmo-bsc \ osmo-bsc_nat \ $(NULL) -endif - -if BUILD_BSC -SUBDIRS += \ - osmo-bsc \ - $(NULL) -endif diff --git a/tests/Makefile.am b/tests/Makefile.am index fc7fc57..aff05bb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,23 +1,14 @@ SUBDIRS = \ + bsc \ gsm0408 \ channel \ abis \ trau \ subscr \ nanobts_omlattr \ - $(NULL) - -if BUILD_NAT -SUBDIRS += \ bsc-nat \ bsc-nat-trie \ $(NULL) -endif -if BUILD_BSC -SUBDIRS += \ - bsc \ - $(NULL) -endif # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac -- To view, visit https://gerrit.osmocom.org/3767 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icfee8a904d33b7c13ab8d185d64fb5c2337d8640 Gerrit-PatchSet: 4 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder