- Always use the shtool mkdir.

diff --git a/acinclude.m4 b/acinclude.m4
index 0f8cc2ee3045c83d9a0631e4e82a5175b7a2fb34..3603104789ce82b293dd90593326f79717aa13c9 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -28,7 +28,7 @@ AC_DEFUN([PHP_DEFINE],[
 dnl PHP_INIT_BUILD_SYSTEM
 dnl
 AC_DEFUN([PHP_INIT_BUILD_SYSTEM],[
-mkdir include >/dev/null 2>&1
+$php_shtool mkdir include
 > Makefile.objects
 > Makefile.fragments
 dnl We need to play tricks here to avoid matching the grep line itself
@@ -660,21 +660,6 @@ AC_DEFUN([PHP_SUBST_OLD],[
   AC_SUBST($1)
 ])
 
-AC_DEFUN([PHP_MKDIR_P_CHECK],[
-  AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[
-    test -d conftestdir && rm -rf conftestdir
-    mkdir -p conftestdir/somedir >/dev/null 2>&1
-dnl `mkdir -p' must be quiet about creating existing directories
-    mkdir -p conftestdir/somedir >/dev/null 2>&1
-    if test "$?" = "0" && test -d conftestdir/somedir; then
-      ac_cv_mkdir_p=yes
-    else
-      ac_cv_mkdir_p=no
-    fi
-    rm -rf conftestdir
-  ])
-])
-
 AC_DEFUN([PHP_TM_GMTOFF],[
 AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
 [AC_TRY_COMPILE([#include <sys/types.h>
@@ -1267,10 +1252,7 @@ AC_DEFUN([PHP_ADD_BUILD_DIR],[
 ])
 
 AC_DEFUN([PHP_GEN_BUILD_DIRS],[
-  PHP_MKDIR_P_CHECK
-  if test "$ac_cv_mkdir_p" = "yes"; then
-    mkdir -p $BUILD_DIR
-  fi
+  $php_shtool mkdir -p $BUILD_DIR
 ])
 
 dnl

diff --git a/configure.in b/configure.in
index 1bc5e172fd7ba99cafc0e71884a7abe86147817b..bd46c8e96b60161d39eaddc5774762208b740cdd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -87,12 +87,12 @@ dnl -------------------------------------------------------------------------
 
 cwd=`pwd`
 
-PHP_INIT_BUILD_SYSTEM
-
 php_shtool=$srcdir/build/shtool
 T_MD=`$php_shtool echo -n -e %B`
 T_ME=`$php_shtool echo -n -e %b`
 
+PHP_INIT_BUILD_SYSTEM
+
 dnl We want this one before the checks, so the checks can modify CFLAGS.
 test -z "$CFLAGS" && auto_cflags=1
 
@@ -1183,10 +1183,10 @@ fi
 # Create configuration headers
 #
 
-test -d TSRM || mkdir TSRM
+test -d TSRM || $php_shtool mkdir TSRM
 echo '#include "../main/php_config.h"' > TSRM/tsrm_config.h
 
-test -d Zend || mkdir Zend
+test -d Zend || $php_shtool mkdir Zend
 
 cat >Zend/zend_config.h <<FEO
 #include "../main/php_config.h"