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
This commit is contained in:
parent
368146cbd5
commit
1861b55516
19
configure.ac
19
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(LIBOSMOSIGTRAN, libosmo-sigtran) # TODO version?
|
||||||
PKG_CHECK_MODULES(LIBCRYPTO, libcrypto >= 0.9.5)
|
PKG_CHECK_MODULES(LIBCRYPTO, libcrypto >= 0.9.5)
|
||||||
PKG_CHECK_MODULES(LIBOSMOLEGACYMGCP, libosmo-legacy-mgcp >= 0.0.1)
|
PKG_CHECK_MODULES(LIBOSMOLEGACYMGCP, libosmo-legacy-mgcp >= 0.0.1)
|
||||||
|
PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.2)
|
||||||
# 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)
|
|
||||||
|
|
||||||
# Enable/disable smpp support in the msc?
|
# Enable/disable smpp support in the msc?
|
||||||
AC_ARG_ENABLE([smpp], [AS_HELP_STRING([--enable-smpp], [Build the SMPP interface])],
|
AC_ARG_ENABLE([smpp], [AS_HELP_STRING([--enable-smpp], [Build the SMPP interface])],
|
||||||
|
|
|
@ -47,11 +47,11 @@ set -x
|
||||||
|
|
||||||
cd "$base"
|
cd "$base"
|
||||||
autoreconf --install --force
|
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
|
$MAKE $PARALLEL_MAKE
|
||||||
LD_LIBRARY_PATH="$inst/lib" $MAKE check \
|
LD_LIBRARY_PATH="$inst/lib" $MAKE check \
|
||||||
|| cat-testlogs.sh
|
|| cat-testlogs.sh
|
||||||
LD_LIBRARY_PATH="$inst/lib" \
|
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 \
|
$MAKE distcheck \
|
||||||
|| cat-testlogs.sh
|
|| cat-testlogs.sh
|
||||||
|
|
|
@ -44,7 +44,6 @@
|
||||||
%:
|
%:
|
||||||
dh $@ --with autoreconf
|
dh $@ --with autoreconf
|
||||||
|
|
||||||
CONFIGURE_FLAGS += --enable-osmo-bsc
|
|
||||||
override_dh_auto_configure:
|
override_dh_auto_configure:
|
||||||
dh_auto_configure -- $(CONFIGURE_FLAGS)
|
dh_auto_configure -- $(CONFIGURE_FLAGS)
|
||||||
#
|
#
|
||||||
|
|
|
@ -32,17 +32,6 @@ SUBDIRS = \
|
||||||
SUBDIRS += \
|
SUBDIRS += \
|
||||||
utils \
|
utils \
|
||||||
ipaccess \
|
ipaccess \
|
||||||
$(NULL)
|
osmo-bsc \
|
||||||
|
|
||||||
# Conditional Programs
|
|
||||||
if BUILD_NAT
|
|
||||||
SUBDIRS += \
|
|
||||||
osmo-bsc_nat \
|
osmo-bsc_nat \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
|
||||||
|
|
||||||
if BUILD_BSC
|
|
||||||
SUBDIRS += \
|
|
||||||
osmo-bsc \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
|
@ -1,23 +1,14 @@
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
|
bsc \
|
||||||
gsm0408 \
|
gsm0408 \
|
||||||
channel \
|
channel \
|
||||||
abis \
|
abis \
|
||||||
trau \
|
trau \
|
||||||
subscr \
|
subscr \
|
||||||
nanobts_omlattr \
|
nanobts_omlattr \
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
if BUILD_NAT
|
|
||||||
SUBDIRS += \
|
|
||||||
bsc-nat \
|
bsc-nat \
|
||||||
bsc-nat-trie \
|
bsc-nat-trie \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
|
||||||
if BUILD_BSC
|
|
||||||
SUBDIRS += \
|
|
||||||
bsc \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
# The `:;' works around a Bash 3.2 bug when the output is not writeable.
|
# The `:;' works around a Bash 3.2 bug when the output is not writeable.
|
||||||
$(srcdir)/package.m4: $(top_srcdir)/configure.ac
|
$(srcdir)/package.m4: $(top_srcdir)/configure.ac
|
||||||
|
|
Loading…
Reference in New Issue