[MERGED] openbsc[master]: Attempt to fix nightly builds

Harald Welte gerrit-no-reply at lists.osmocom.org
Tue Feb 7 00:40:02 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: Attempt to fix nightly builds
......................................................................


Attempt to fix nightly builds

The fix introduced in dac5867af5ff90d4beb70fc30a5743f60f159e3a did not
work because autotools in our OE are too old. Use alternative way to
include custom m4 macros to fix it.

Change-Id: I5fe6d1180c2624cfe1d3673314f6846527a43464
---
M openbsc/Makefile.am
M openbsc/configure.ac
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/openbsc/Makefile.am b/openbsc/Makefile.am
index f7eda56..31a54ea 100644
--- a/openbsc/Makefile.am
+++ b/openbsc/Makefile.am
@@ -1,5 +1,8 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 
+## FIXME: automake >= 1.13 or autoconf >= 2.70 provide better suited AC_CONFIG_MACRO_DIRS for configure.ac
+## remove line below when OE toolchain is updated to version which include those
+ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = \
 	$(all_includes) \
 	-I$(top_srcdir)/include \
diff --git a/openbsc/configure.ac b/openbsc/configure.ac
index 6d373a5..7e244bc 100644
--- a/openbsc/configure.ac
+++ b/openbsc/configure.ac
@@ -9,9 +9,6 @@
 AM_INIT_AUTOMAKE([dist-bzip2])
 AC_CONFIG_TESTDIR(tests)
 
-dnl FIXME: Remove this once we do not need local macro copies anymore (after upgrade to newer OE?)
-AC_CONFIG_MACRO_DIRS([m4])
-
 dnl kernel style compile messages
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5fe6d1180c2624cfe1d3673314f6846527a43464
Gerrit-PatchSet: 2
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder


More information about the gerrit-log mailing list