diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-06-11 11:36:33 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-06-11 11:40:18 +0200 |
| commit | c136be04f7784d245baf0adb2e2537ac0fae206d (patch) | |
| tree | 4b22d3f1dce5d1e1250756b63eb9b52b66eb5b5d | |
| parent | 0fb294a8dd45a86b8f9eb93211b69b6dbf0a6853 (diff) | |
lc15: further fixes regarding --with-litecell15
The fix in 0fb294a8dd45a86b8f9eb93211b69b6dbf0a6853 was only partially
valid, as it unconditionally used $includedir, without any prefix. This
polluted the include path with host include files in cross-compiling
builds.
Let's take a different approach and simply define LITECELL15_CFLAGS
(similar to what pkgconfig does), which makes the "-I" go away if no
--with-litecell15 has been specified.
Change-Id: I63393decfe42a24dab56c7654f716c1580416ab2
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 7b7f9c4a..3b134697 100644 --- a/configure.ac +++ b/configure.ac @@ -51,15 +51,15 @@ AC_ARG_ENABLE(lc15bts-phy, [enable code for Litecell 1.5 PHY [default=no]]), [enable_lc15bts_phy="$enableval"],[enable_lc15bts_phy="no"]) AC_ARG_WITH([litecell15], [AS_HELP_STRING([--with-litecell15=INCLUDE_DIR], [Location of the litecell 1.5 API header files])], - [litecell15_incdir="$withval"],[litecell15_incdir="$includedir"]) -AC_SUBST([LITECELL15_INCDIR], $litecell15_incdir) + [litecell15_cflags="-I$withval"],[litecell15_cflags=""]) +AC_SUBST([LITECELL15_CFLAGS], $litecell15_cflags) AC_MSG_RESULT([$enable_lc15bts_phy]) AM_CONDITIONAL(ENABLE_LC15BTS_PHY, test "x$enable_lc15bts_phy" = "xyes") if test "$enable_litecell15" = "yes"; then oldCPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$LITECELL15_INCDIR -I$srcdir/include $LIBOSMOCORE_CFLAGS" + CPPFLAGS="$CPPFLAGS $LITECELL15_CFLAGS -I$srcdir/include $LIBOSMOCORE_CFLAGS" AC_CHECK_HEADER([nrw/litecell15/litecell15.h],[], - [AC_MSG_ERROR([nrw/litecell15/litecell15.h can not be found in $litecell15_incdir])], + [AC_MSG_ERROR([nrw/litecell15/litecell15.h can not be found using $litecell15_cflags])], [#include <nrw/litecell15/litecell15.h>]) CPPFLAGS=$oldCPPFLAGS fi diff --git a/src/Makefile.am b/src/Makefile.am index 97de06d1..1543851d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -137,7 +137,7 @@ osmo_pcu_remote_LDADD = \ endif if ENABLE_LC15BTS_PHY -AM_CPPFLAGS += -I$(LITECELL15_INCDIR) -I$(srcdir)/osmo-bts-litecell15 +AM_CPPFLAGS += $(LITECELL15_CFLAGS) -I$(srcdir)/osmo-bts-litecell15 EXTRA_DIST = \ osmo-bts-litecell15/lc15_l1_if.c \ |