From d2db6ecd9994210e75fb4362d781ec882ec7238a Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 30 Jan 2019 10:24:44 +0100 Subject: Split the "selfcontained" configure option in two upstream is growing an option to install elf.h. We want to use that. Change-Id: Ica5bf0cdf281eb17ef29e0e1029662a5a9d875b1 Reviewed-by: Christian Kandeler Reviewed-by: Ulf Hermann --- tests/Makefile.am | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index d60d6636..4b88e16d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -608,14 +608,12 @@ next_cfi_LDADD = $(libelf) $(libdw) $(libgnu) elfcopy_LDADD = $(libelf) $(libgnu) addsections_LDADD = $(libelf) $(libgnu) -if SELFCONTAINED -# In self contained mode we cannot expect a system elf header. -# Use our own then -system_elf_libelf_test_CPPFLAGS = -I$(top_srcdir)/libelf -else # We want to test the libelf header against the system elf.h header. -# Don't include any -I CPPFLAGS. +# Don't include any -I CPPFLAGS. Except when we install our own elf.h. +if !INSTALL_ELFH system_elf_libelf_test_CPPFLAGS = +else +system_elf_libelf_test_CPPFLAGS = -I$(top_srcdir)/libelf endif if USE_GNULIB system_elf_libelf_test_CPPFLAGS += -I$(top_srcdir)/libgnu -I$(top_builddir)/libgnu -- cgit v1.2.3