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

5 files changed, 5 insertions, 43 deletions

diff --git a/configure.ac b/configure.ac
index 1050f3d08..e7f0546b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,24 +48,7 @@ PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.1)
 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/contrib/jenkins.sh b/contrib/jenkins.sh
index a7313c501..cb0f8b1b6 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -47,11 +47,11 @@ set -x
 
 cd "$base"
 autoreconf --install --force
-./configure --enable-osmo-bsc --enable-nat $SMPP $MGCP $IU --enable-vty-tests --enable-external-tests
+./configure $SMPP $MGCP $IU --enable-vty-tests --enable-external-tests
 $MAKE $PARALLEL_MAKE
 LD_LIBRARY_PATH="$inst/lib" $MAKE check \
   || cat-testlogs.sh
 LD_LIBRARY_PATH="$inst/lib" \
-  DISTCHECK_CONFIGURE_FLAGS="--enable-osmo-bsc --enable-nat $SMPP $MGCP $IU --enable-vty-tests --enable-external-tests" \
+  DISTCHECK_CONFIGURE_FLAGS="$SMPP $MGCP $IU --enable-vty-tests --enable-external-tests" \
   $MAKE distcheck \
   || cat-testlogs.sh
diff --git a/debian/rules b/debian/rules
index 72a7d1828..7fe538a00 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 9a26a7b9e..d04f02573 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,17 +32,6 @@ SUBDIRS = \
 SUBDIRS += \
 	utils \
 	ipaccess \
-	$(NULL)
-
-# Conditional Programs
-if BUILD_NAT
-SUBDIRS += \
-	osmo-bsc_nat \
-	$(NULL)
-endif
-
-if BUILD_BSC
-SUBDIRS += \
 	osmo-bsc \
+	osmo-bsc_nat \
 	$(NULL)
-endif
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fc7fc570d..aff05bb44 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