[MERGED] osmo-pcu[master]: lc15: fix configure.ac variable substitution causing compile...

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Sun Jun 11 08:48:56 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: lc15: fix configure.ac variable substitution causing compile error
......................................................................


lc15: fix configure.ac variable substitution causing compile error

When "--enable-lc15bts-phy" is passed to './configure' without specifying
an explicit header file path using "--with-litecell15=", we ended up
generating an empty string as LITECELL15_INCDIR and rendered something
like "-DENABLE_DIRECT_PHY  -I -I../../git/src/osmo-bts-litecell15" as
part of the compiler invocation, where the -I with no argument will hide
the second -I, as the second one is supposed to be the optarg for the
first include.

This in turn made the "#include <lc15_l1_if.h>" fail, when using
separate source and build directories.

This patch fixes the configur script to use $includedir, rather than the
non-existant $incdir as default for LITECELL15_INCDIR

Change-Id: I483e62f8331e7867a92f8055c4d450fdd5288cb6
---
M configure.ac
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/configure.ac b/configure.ac
index 54c70ca..7b7f9c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@
                                 [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="$incdir"])
+			 [litecell15_incdir="$withval"],[litecell15_incdir="$includedir"])
 AC_SUBST([LITECELL15_INCDIR], $litecell15_incdir)
 AC_MSG_RESULT([$enable_lc15bts_phy])
 AM_CONDITIONAL(ENABLE_LC15BTS_PHY, test "x$enable_lc15bts_phy" = "xyes")

-- 
To view, visit https://gerrit.osmocom.org/2873
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I483e62f8331e7867a92f8055c4d450fdd5288cb6
Gerrit-PatchSet: 1
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list