Move build-defs.h(.in) and php_config.h to main

diff --git a/build/build2.mk b/build/build2.mk
index 39bb9b50e3eb9ec251f99b324fbd4610e5b9db8c..c64fd6540c04c962e966e0e31afaffc99a5a8885 100644 (file)
--- a/build/build2.mk
+++ b/build/build2.mk
@@ -26,7 +26,7 @@ LT_TARGETS = ltconfig ltmain.sh config.guess config.sub
 makefile_in_files = $(makefile_am_files:.am=.in)
 makefile_files    = $(makefile_am_files:e.am=e)
 
-config_h_in = php_config.h.in
+config_h_in = main/php_config.h.in
 
 acconfig_h_SOURCES = acconfig.h.in $(config_h_files)
 

diff --git a/build/rules_common.mk b/build/rules_common.mk
index 6e8cf24d22bee26ce7c546edac78d10e252c791e..c886ca0f801ff2ee1fa247b6066fd416df8c81b8 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) -I$(top_builddir)/main
+DEFS = -I. -I$(srcdir) -I$(top_builddir)/main
 
 moduledir    = $(EXTENSION_DIR)
 

diff --git a/configure.in b/configure.in
index b2b28dc8c1ec3e642c929b63de3be1b1dcb4f8ef..58432aecbbb927161b407d4a96b43aaf1cd6a004 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -65,7 +65,7 @@ else
        rm -f php_version.h.new
 fi
 
-AM_CONFIG_HEADER(php_config.h)
+AM_CONFIG_HEADER(main/php_config.h)
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
 
@@ -199,7 +199,7 @@ if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
        LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
 fi
 
-INCLUDES="$INCLUDES -I\$(top_builddir)/Zend -I\$(top_srcdir)"
+INCLUDES="$INCLUDES -I\$(top_builddir)/Zend"
 
 
 AC_CHECK_LIB(socket, socket, [
@@ -669,7 +669,7 @@ else
 fi
 
 if test "$abs_srcdir" != "$abs_builddir"; then
-  INCLUDES="$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend"
+  INCLUDES="$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend -I\$(top_srcdir)"
   INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM"
 fi
 
@@ -842,7 +842,7 @@ PHP_CONFIGURE_PART(Generating files)
 
 PHP_GEN_CONFIG_VARS
 
-ALL_OUTPUT_FILES="php4.spec Zend/Makefile build-defs.h $PHP_OUTPUT_FILES"
+ALL_OUTPUT_FILES="php4.spec Zend/Makefile main/build-defs.h $PHP_OUTPUT_FILES"
 
 AC_OUTPUT($ALL_OUTPUT_FILES, [], [
 
@@ -866,11 +866,11 @@ fi
 #
 
 if test -d TSRM; then
-  echo '#include "../php_config.h"' > TSRM/tsrm_config.h
+  echo '#include "../main/php_config.h"' > TSRM/tsrm_config.h
 fi
 
 cat >Zend/zend_config.h <<FEO
-#include "../php_config.h"
+#include "../main/php_config.h"
 #if defined(APACHE) && defined(PHP_API_VERSION)
 #undef HAVE_DLFCN_H
 #endif

diff --git a/build-defs.h.in b/main/build-defs.h.in
similarity index 100%
rename from build-defs.h.in
rename to main/build-defs.h.in