sniper Mon May 30 02:55:21 2005 EDT
Modified files:
/php-src acinclude.m4
/php-src/build libtool.m4
/php-src/scripts phpize.in
Log:
- Changed the PATH_SEPARATOR check to a macro
- Made sure we're generating aclocal.m4 in same way with both buildconf
and phpize.
# Bug #33177
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.311&r2=1.312&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.311 php-src/acinclude.m4:1.312
--- php-src/acinclude.m4:1.311 Sun May 29 15:28:34 2005
+++ php-src/acinclude.m4 Mon May 30 02:55:19 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.311 2005/05/29 19:28:34 hholzgra Exp $
+dnl $Id: acinclude.m4,v 1.312 2005/05/30 06:55:19 sniper Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -2413,6 +2413,7 @@
dnl Generates the config.nice file
dnl
AC_DEFUN([PHP_CONFIG_NICE],[
+ AC_REQUIRE([LT_AC_PATH_SEPARATOR])
AC_REQUIRE([AC_PROG_EGREP])
AC_REQUIRE([LT_AC_PROG_SED])
PHP_SUBST(EGREP)
http://cvs.php.net/diff.php/php-src/build/libtool.m4?r1=1.5&r2=1.6&ty=u
Index: php-src/build/libtool.m4
diff -u php-src/build/libtool.m4:1.5 php-src/build/libtool.m4:1.6
--- php-src/build/libtool.m4:1.5 Sun May 29 12:34:43 2005
+++ php-src/build/libtool.m4 Mon May 30 02:55:20 2005
@@ -14,6 +14,7 @@
# ---------------------------------
# Find the correct PATH separator. Usually this is :', but
# DJGPP uses ;' like DOS.
+AC_DEFUN([LT_AC_PATH_SEPARATOR], [
if test "X${PATH_SEPARATOR+set}" != Xset; then
UNAME=${UNAME-`uname 2>/dev/null`}
case X$UNAME in
@@ -22,6 +23,7 @@
esac
PATH_SEPARATOR=$lt_cv_sys_path_separator
fi
+]) # LT_AC_PATH_SEPARATOR
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -33,7 +35,6 @@
[ifdef([AC_PROVIDE_$1],
[$2], [$3])])])
-
# AC_PROG_LIBTOOL
# ---------------
AC_DEFUN([AC_PROG_LIBTOOL],
@@ -95,6 +96,7 @@
# ----------------
AC_DEFUN([AC_LIBTOOL_SETUP],
[AC_PREREQ(2.13)dnl
+AC_REQUIRE([LT_AC_PATH_SEPARATOR])dnl
AC_REQUIRE([AC_ENABLE_SHARED])dnl
AC_REQUIRE([AC_ENABLE_STATIC])dnl
AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.20&r2=1.21&ty=u
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.20 php-src/scripts/phpize.in:1.21
--- php-src/scripts/phpize.in:1.20 Thu Apr 7 18:03:02 2005
+++ php-src/scripts/phpize.in Mon May 30 02:55:20 2005
@@ -114,7 +114,7 @@
(cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
(cd "$phpdir" && cp $FILES "$builddir")
- (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4)
+ (cd "$builddir" && cat ./build/libtool.m4 acinclude.m4 > aclocal.m4)
}
phpize_replace_prefix()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
