Attempt to fix nightly builds

The fix introduced in dac5867af5 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
This commit is contained in:
Max 2017-02-06 14:14:28 +01:00 committed by Harald Welte
parent 89837d422e
commit d09b26d487
2 changed files with 3 additions and 3 deletions

View File

@ -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 \

View File

@ -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])])