From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 26 Aug 2015 22:50:58 +0000 (+0000)
Subject: build: fix -I options
X-Git-Tag: v4.11~249
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf3ecbdd5f275de44be05669dc59ab1ccec337cb;p=strace

build: fix -I options

* configure.ac (AM_INIT_AUTOMAKE): Add nostdinc.
* Makefile.am (AM_CPPFLAGS): Append -I$(builddir) and -I$(srcdir).
* tests/Makefile.am (AM_CPPFLAGS): Likewise.
---

diff --git a/Makefile.am b/Makefile.am
index f70f6d2b..9800a3a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,9 @@ AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS = -I$(builddir)/$(OS)/$(ARCH) \
 	      -I$(srcdir)/$(OS)/$(ARCH) \
 	      -I$(builddir)/$(OS) \
-	      -I$(srcdir)/$(OS)
+	      -I$(srcdir)/$(OS) \
+	      -I$(builddir) \
+	      -I$(srcdir)
 
 include xlat/Makemodule.am
 
diff --git a/configure.ac b/configure.ac
index 2f43b188..eeb618e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_INIT([strace],
 AC_CONFIG_SRCDIR([strace.c])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules parallel-tests])
+AM_INIT_AUTOMAKE([foreign nostdinc dist-xz no-dist-gzip silent-rules parallel-tests])
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9b1703cc..7b2986fb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,7 +6,9 @@ AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS = -I$(top_builddir)/$(OS)/$(ARCH) \
 	      -I$(top_srcdir)/$(OS)/$(ARCH) \
 	      -I$(top_builddir)/$(OS) \
-	      -I$(top_srcdir)/$(OS)
+	      -I$(top_srcdir)/$(OS) \
+	      -I$(top_builddir) \
+	      -I$(top_srcdir)
 
 check_PROGRAMS = \
 	aio \