sniper Fri Jun 10 08:35:21 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/scripts phpize.in
Log:
MFH
http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.15.2.6&r2=1.15.2.7&ty=u
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.15.2.6 php-src/scripts/phpize.in:1.15.2.7
--- php-src/scripts/phpize.in:1.15.2.6 Tue Jun 7 17:57:06 2005
+++ php-src/scripts/phpize.in Fri Jun 10 08:35:21 2005
@@ -1,9 +1,11 @@
#!/bin/sh
# Variable declaration
+EGREP='@EGREP@'
prefix='@prefix@'
-phpdir="@libdir@/build"
-includedir="@includedir@/php"
+exec_prefix="`eval echo @[EMAIL PROTECTED]"
+phpdir="`eval echo @[EMAIL PROTECTED]/build"
+includedir="`eval echo @[EMAIL PROTECTED]/php"
builddir="`pwd`"
FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
@@ -50,9 +52,9 @@
phpize_get_api_numbers()
{
# extracting API NOs:
- PHP_API_VERSION=`egrep '#define PHP_API_VERSION' $includedir/main/php.h|sed
's/#define PHP_API_VERSION//'`
- ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO'
$includedir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO//'`
- ZEND_EXTENSION_API_NO=`egrep '#define ZEND_EXTENSION_API_NO'
$includedir/Zend/zend_extensions.h|sed 's/#define ZEND_EXTENSION_API_NO//'`
+ PHP_API_VERSION=`$EGREP '#define PHP_API_VERSION' $includedir/main/php.h|sed
's/#define PHP_API_VERSION//'`
+ ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO'
$includedir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO//'`
+ ZEND_EXTENSION_API_NO=`$EGREP '#define ZEND_EXTENSION_API_NO'
$includedir/Zend/zend_extensions.h|sed 's/#define ZEND_EXTENSION_API_NO//'`
}
phpize_print_api_numbers()
@@ -64,13 +66,15 @@
echo "Zend Extension Api No: "$ZEND_EXTENSION_API_NO
}
-phpize_no_shtool()
+phpize_check_build_files()
{
- cat <<EOF
-shtool at '$builddir/build/shtool' not executable.
-Make sure that the file exists and is executable and then rerun this script.
+ if test ! -d "$phpdir"; then
+ cat <<EOF
+Cannot find build files at '$phpdir'. Please check your PHP installation.
EOF
+ exit 1
+ fi
}
phpize_check_shtool()
@@ -78,7 +82,11 @@
test -x "$builddir/build/shtool" || chmod +x "$builddir/build/shtool"
if test ! -x "$builddir/build/shtool"; then
- phpize_no_shtool
+ cat <<EOF
+shtool at '$builddir/build/shtool' does not exist or is not executable.
+Make sure that the file exists and is executable and then rerun this script.
+
+EOF
exit 1
else
php_shtool=$builddir/build/shtool
@@ -156,6 +164,8 @@
*)
phpize_check_configm4 0
+ phpize_check_build_files
+
phpize_print_api_numbers
phpize_copy_files
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
