aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2017-02-06 14:14:28 +0100
committerHarald Welte <laforge@gnumonks.org>2017-02-07 00:40:02 +0000
commitd09b26d4874da27bd58d87f69d78c6c9f4b57d15 (patch)
tree44239f965dca53e2620fad6e4402cfcaae1a3a8f
parent89837d422e555320147fc7c305cf642e523ade27 (diff)
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
-rw-r--r--openbsc/Makefile.am3
-rw-r--r--openbsc/configure.ac3
2 files changed, 3 insertions, 3 deletions
diff --git a/openbsc/Makefile.am b/openbsc/Makefile.am
index f7eda567a..31a54ea06 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 6d373a5a4..7e244bc65 100644
--- a/openbsc/configure.ac
+++ b/openbsc/configure.ac
@@ -9,9 +9,6 @@ AC_CONFIG_AUX_DIR([.])
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])])