Fix VPATH builds

diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
index c6c5e665dd9cc02a8c95cd8135f3e159fcdb1aa0..beb30a91d6b62875b01e8f8b95db00ed263d9134 100644 (file)
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -133,6 +133,7 @@ if test "$PHP_SAPI" = "default"; then
       exit 1
     fi
     if test "$PHP_ENABLE_FASTCGI" = "yes"; then
+      PHP_ADD_BUILD_DIR($abs_builddir/sapi/cgi/libfcgi)
       PHP_FASTCGI=1
       PHP_FCGI_FILES="libfcgi/fcgi_stdio.c libfcgi/fcgiapp.c libfcgi/os_unix.c"
       PHP_FCGI_INCLUDE="-I$PHP_LIBFCGI_DIR/include"

diff --git a/sapi/cgi/libfcgi/include/fcgi_config.h b/sapi/cgi/libfcgi/include/fcgi_config.h
index 22256df3283d34a071c21cb06e393006c49e2384..7ad81663e49a6af283842c531b7fce1344cd597e 100644 (file)
--- a/sapi/cgi/libfcgi/include/fcgi_config.h
+++ b/sapi/cgi/libfcgi/include/fcgi_config.h
@@ -1,7 +1,7 @@
-/* hack workaround for libfcgi configure */
+/*  hack workaround for libfcgi configure */
 #ifdef _WIN32
 #include "fcgi_config_win32.h"
 #else
-#include "main/php_config.h"
+#include "php_config.h"
 #endif