From d09b26d4874da27bd58d87f69d78c6c9f4b57d15 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 6 Feb 2017 14:14:28 +0100 Subject: [PATCH] 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 --- openbsc/Makefile.am | 3 +++ openbsc/configure.ac | 3 --- 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])])