Always add top_srcdir to the header file search path.

diff --git a/build/rules_common.mk b/build/rules_common.mk
index c886ca0f801ff2ee1fa247b6066fd416df8c81b8..32ce8086b51ae467ea031b3d9d20b23b05b46438 100644 (file)
--- a/build/rules_common.mk
+++ b/build/rules_common.mk
@@ -32,7 +32,7 @@ mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
 INSTALL = $(top_srcdir)/build/shtool install -c
 INSTALL_DATA = $(INSTALL) -m 644
 
-DEFS = -I. -I$(srcdir) -I$(top_builddir)/main
+DEFS = -I. -I$(srcdir) -I$(top_builddir)/main -I$(top_srcdir)
 
 moduledir    = $(EXTENSION_DIR)
 

diff --git a/configure.in b/configure.in
index 58432aecbbb927161b407d4a96b43aaf1cd6a004..13f4f61c8321f08aecb86edb1790c5c3c5cedc8f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -669,7 +669,7 @@ else
 fi
 
 if test "$abs_srcdir" != "$abs_builddir"; then
-  INCLUDES="$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend -I\$(top_srcdir)"
+  INCLUDES="$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend"
   INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM"
 fi