sniper Mon Mar 10 09:33:10 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4 acinclude.m4 configure.in
Log:
- MFH: use shtool mkdir always.
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.218.2.8 php4/acinclude.m4:1.218.2.9
--- php4/acinclude.m4:1.218.2.8 Mon Feb 24 10:12:11 2003
+++ php4/acinclude.m4 Mon Mar 10 09:33:10 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.218.2.8 2003/02/24 15:12:11 sniper Exp $
+dnl $Id: acinclude.m4,v 1.218.2.9 2003/03/10 14:33:10 sniper Exp $
dnl
dnl This file contains local autoconf functions.
@@ -28,7 +28,7 @@
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 egrep line itself
@@ -667,21 +667,6 @@
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>
@@ -1274,10 +1259,7 @@
])
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
Index: php4/configure.in
diff -u php4/configure.in:1.396.2.37 php4/configure.in:1.396.2.38
--- php4/configure.in:1.396.2.37 Fri Mar 7 01:18:27 2003
+++ php4/configure.in Mon Mar 10 09:33:10 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.37 2003/03/07 06:18:27 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.38 2003/03/10 14:33:10 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -87,12 +87,12 @@
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
@@ -1177,10 +1177,10 @@
# 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"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
