diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-09-03 20:18:27 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2017-09-03 22:57:31 +0200 |
| commit | 85a8398568f421ae00c4340bb653b4c25a2720a3 (patch) | |
| tree | 9950b4dafc56c7ad9d0521ff78dd070158d50422 | |
| parent | 57f5388582825685fb6386a55cb323160e18f447 (diff) | |
configure.ac: Remove --enable-iu
There is no Iu in a BSC, this was from old times with OsmoNITB. This
configure option now lives in osmo-msc.git
Change-Id: I9cf1c430855fe8a59fea1cf0abb3242c38d45cea
| -rw-r--r-- | configure.ac | 12 | ||||
| -rwxr-xr-x | contrib/jenkins.sh | 10 |
2 files changed, 2 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 588d5efaf..03e7cc4b1 100644 --- a/configure.ac +++ b/configure.ac @@ -50,18 +50,6 @@ PKG_CHECK_MODULES(LIBCRYPTO, libcrypto >= 0.9.5) PKG_CHECK_MODULES(LIBOSMOLEGACYMGCP, libosmo-legacy-mgcp >= 0.0.1) PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.2) -# Enable/disable 3G aka IuPS + IuCS support? -AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], - [osmo_ac_iu="$enableval"],[osmo_ac_iu="no"]) -if test "x$osmo_ac_iu" = "xyes" ; then - PKG_CHECK_MODULES(LIBASN1C, libasn1c) # TODO version? - PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap) # TODO version? - AC_DEFINE(BUILD_IU, 1, [Define if we want to build IuPS and IuCS interfaces support]) -fi -AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes") -AC_SUBST(osmo_ac_iu) - - found_libgtp=yes PKG_CHECK_MODULES(LIBGTP, libgtp >= 0.92, , found_libgtp=no) AM_CONDITIONAL(HAVE_LIBGTP, test "$found_libgtp" = yes) diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index cba37bf4f..9f1c4bd8b 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -30,12 +30,6 @@ osmo-build-dep.sh libosmo-sccp osmo-build-dep.sh openggsn osmo-build-dep.sh osmo-mgw -if [ "x$IU" = "x--enable-iu" ]; then - osmo-build-dep.sh libasn1c - #osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in osmo-iuh - osmo-build-dep.sh osmo-iuh -fi - set +x echo echo @@ -46,11 +40,11 @@ set -x cd "$base" autoreconf --install --force -./configure $IU --enable-vty-tests --enable-external-tests +./configure --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="$IU --enable-vty-tests --enable-external-tests" \ + DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests" \ $MAKE distcheck \ || cat-testlogs.sh |