2 files changed, 7 insertions, 2 deletions
diff --git a/buildconf b/buildconf
index ac2e0d961f..baf5b93589 100755
--- a/buildconf
+++ b/buildconf
@@ -149,5 +149,7 @@ else
     echo "buildconf: created or modified configure"
 fi
 
-(cd libzend; ./buildconf libzend/)
-(cd TSRM; ./buildconf TSRM/)
+if test "$supplied_flag" != "--local"; then
+  (cd libzend; ./buildconf libzend/)
+  (cd TSRM; ./buildconf TSRM/)
+fi
diff --git a/configure.in b/configure.in
index 13887eb562..c9b3f100f3 100644
--- a/configure.in
+++ b/configure.in
@@ -741,6 +741,9 @@ AC_SUBST(PHP_LIBS)
 AC_SUBST(PHP_SAPI)
 AC_SUBST(SAPI_TARGET)
 
+test -d sapi || mkdir sapi
+test -d ext || mkdir ext
+
 #libphp4.module 
 AC_OUTPUT([Makefile php4.spec $PHP_OUTPUT_FILES
            scripts/mkextlib regex/Makefile build-defs.h], [], [