diff options
| author | Max <msuraev@sysmocom.de> | 2018-01-15 16:43:22 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-02-27 22:20:46 +0100 |
| commit | 9d4bdee4577a0b4828fd83490e246dfcc3eef9af (patch) | |
| tree | a13f513ecb111f1374f0daaea265165ec5c53ac1 | |
| parent | 2141962baf95bfaf11f19dacd59f7b8ac8d49ca3 (diff) | |
Allow specifying sysmocom headers explicitly
The headers for LC1.5 are specified explicitly. Add corresponding option
to specify sysmoBTS headers location and use it in jenkins build. While
at it, unify header fixup code with the one used in OsmoBTS.
Change-Id: I5248e8b389fd240b4d5a0bcf6c954d6115262462
| -rw-r--r-- | configure.ac | 11 | ||||
| -rwxr-xr-x | contrib/jenkins.sh | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 56e20577..3706b6c4 100644 --- a/configure.ac +++ b/configure.ac @@ -65,8 +65,19 @@ AC_ARG_ENABLE(sysmocom-dsp, AC_HELP_STRING([--enable-sysmocom-dsp], [enable code for sysmocom DSP [default=no]]), [enable_sysmocom_dsp="$enableval"],[enable_sysmocom_dsp="no"]) +AC_ARG_WITH([sysmobts], [AS_HELP_STRING([--with-sysmobts=INCLUDE_DIR], [Location of the sysmobts API header files])], + [sysmobts_incdir="$withval"],[sysmobts_incdir="$incdir"]) +AC_SUBST([SYSMOBTS_INCDIR], $sysmobts_incdir) AC_MSG_RESULT([$enable_sysmocom_dsp]) AM_CONDITIONAL(ENABLE_SYSMODSP, test "x$enable_sysmocom_dsp" = "xyes") +if test "$enable_sysmocom_bts" = "yes"; then + oldCPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$SYSMOBTS_INCDIR -I$srcdir/include $LIBOSMOCORE_CFLAGS" + AC_CHECK_HEADER([sysmocom/femtobts/superfemto.h],[], + [AC_MSG_ERROR([sysmocom/femtobts/superfemto.h can not be found in $sysmobts_incdir])], + [#include <sysmocom/femtobts/superfemto.h>]) + CPPFLAGS=$oldCPPFLAGS +fi AC_MSG_CHECKING([whether to enable direct PHY access for PDCH of NuRAN Wireless Litecell 1.5 BTS]) AC_ARG_ENABLE(lc15bts-phy, diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index b7cfc3d7..af25c691 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -26,15 +26,13 @@ mkdir "$deps" || true # Collect configure options for osmo-pcu PCU_CONFIG="" if [ "$with_dsp" = sysmo ]; then - PCU_CONFIG="$PCU_CONFIG --enable-sysmocom-dsp" + PCU_CONFIG="$PCU_CONFIG --enable-sysmocom-dsp --with-sysmobts=$inst/include/" # For direct sysmo DSP access, provide the SysmoBTS Layer 1 API cd "$deps" osmo-layer1-headers.sh sysmo - cd layer1-headers - api_incl="$inst/include/sysmocom/femtobts/" - mkdir -p "$api_incl" - cp include/*.h "$api_incl" + mkdir -p "$inst/include/sysmocom/femtobts" + ln -s $deps/layer1-headers/include/* "$inst/include/sysmocom/femtobts/" cd "$base" elif [ "$with_dsp" = lc15 ]; then diff --git a/src/Makefile.am b/src/Makefile.am index a6e98e5d..7d2a62e1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -103,7 +103,7 @@ nobase_include_HEADERS = osmo_pcu_SOURCES = pcu_main.cpp if ENABLE_SYSMODSP -AM_CPPFLAGS += -I$(srcdir)/osmo-bts-sysmo +AM_CPPFLAGS += -I$(srcdir)/osmo-bts-sysmo -I$(SYSMOBTS_INCDIR) EXTRA_DIST = \ osmo-bts-sysmo/sysmo_l1_if.c \ |