diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 60 |
1 files changed, 21 insertions, 39 deletions
diff --git a/configure.ac b/configure.ac index 12af7e645..ddd91ab2b 100644 --- a/configure.ac +++ b/configure.ac @@ -34,42 +34,32 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno"; then fi PKG_PROG_PKG_CONFIG([0.20]) -dnl check for AX_CHECK_COMPILE_FLAG -m4_ifdef([AX_CHECK_COMPILE_FLAG], [], [ - AC_MSG_ERROR([Please install autoconf-archive; re-run 'autoreconf -fi' for it to take effect.]) - ]) +dnl use a defined standard across all builds and don't depend on compiler default +CFLAGS="$CFLAGS -std=gnu11" dnl checks for libraries -AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DL="$LIBS";LIBS=""]) -AC_SUBST(LIBRARY_DL) - -AC_SEARCH_LIBS([dlsym], [dl dld], [LIBRARY_DLSYM="$LIBS";LIBS=""]) -AC_SUBST(LIBRARY_DLSYM) - - -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) -PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.9.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.9.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.9.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.9.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.9.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.7.0) +PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.11.0) # 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(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.0.0) + PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.8.0) PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.30) - PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.6.0) + PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 1.5.0) 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) - -PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.5.0) PKG_CHECK_MODULES(LIBCARES, libcares) dnl checks for header files @@ -118,15 +108,8 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])], CFLAGS="$saved_CFLAGS" AC_SUBST(SYMBOL_VISIBILITY) -CPPFLAGS="$CPPFLAGS -Wall" -CFLAGS="$CFLAGS -Wall" - -AX_CHECK_COMPILE_FLAG([-Werror=implicit], [CFLAGS="$CFLAGS -Werror=implicit"]) -AX_CHECK_COMPILE_FLAG([-Werror=maybe-uninitialized], [CFLAGS="$CFLAGS -Werror=maybe-uninitialized"]) -AX_CHECK_COMPILE_FLAG([-Werror=memset-transposed-args], [CFLAGS="$CFLAGS -Werror=memset-transposed-args"]) -AX_CHECK_COMPILE_FLAG([-Wnull-dereference], [CFLAGS="$CFLAGS -Wnull-dereference"]) -AX_CHECK_COMPILE_FLAG([-Werror=sizeof-array-argument], [CFLAGS="$CFLAGS -Werror=sizeof-array-argument"]) -AX_CHECK_COMPILE_FLAG([-Werror=sizeof-pointer-memaccess], [CFLAGS="$CFLAGS -Werror=sizeof-pointer-memaccess"]) +CPPFLAGS="$CPPFLAGS -Wall -Wno-trigraphs" +CFLAGS="$CFLAGS -Wall -Wno-trigraphs" # Coverage build taken from WebKit's configure.in AC_MSG_CHECKING([whether to enable code coverage support]) @@ -172,13 +155,13 @@ AC_ARG_ENABLE([external_tests], [Include the VTY/CTRL tests in make check [default=no]]), [enable_ext_tests="$enableval"],[enable_ext_tests="no"]) if test "x$enable_ext_tests" = "xyes" ; then - AC_CHECK_PROG(PYTHON2_AVAIL,python2,yes) - if test "x$PYTHON2_AVAIL" != "xyes" ; then - AC_MSG_ERROR([Please install python2 to run the VTY/CTRL tests.]) + AC_CHECK_PROG(PYTHON3_AVAIL,python3,yes) + if test "x$PYTHON3_AVAIL" != "xyes" ; then + AC_MSG_ERROR([Please install python3 to run the VTY/CTRL tests.]) fi AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes) if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then - AC_MSG_ERROR([Please install git://osmocom.org/python/osmo-python-tests to run the VTY/CTRL tests.]) + AC_MSG_ERROR([Please install https://gitea.osmocom.org/cellular-infrastructure/osmo-python-tests to run the VTY/CTRL tests.]) fi fi AC_MSG_CHECKING([whether to enable VTY/CTRL tests]) @@ -247,21 +230,20 @@ AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) dnl Generate the output -AM_CONFIG_HEADER(bscconfig.h) +AM_CONFIG_HEADER(config.h) AC_OUTPUT( include/Makefile include/osmocom/Makefile + include/osmocom/gtphub/Makefile include/osmocom/sgsn/Makefile src/Makefile src/gprs/Makefile src/sgsn/Makefile - src/gbproxy/Makefile src/gtphub/Makefile tests/Makefile tests/atlocal tests/gprs/Makefile - tests/gbproxy/Makefile tests/sgsn/Makefile tests/gtphub/Makefile tests/xid/Makefile |