sniper Thu Jun 2 17:36:38 2005 EDT
Modified files:
/php-src acinclude.m4
/php-src/build libtool.m4
Log:
- Revert previous change in build/libtool.m4 and make sure
the PATH_SEPARATOR check is only done under autoconf 2.13.
# fixes also the php-gtk buildconf probs
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.313&r2=1.314&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.313 php-src/acinclude.m4:1.314
--- php-src/acinclude.m4:1.313 Mon May 30 06:56:13 2005
+++ php-src/acinclude.m4 Thu Jun 2 17:36:36 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.313 2005/05/30 10:56:13 sniper Exp $
+dnl $Id: acinclude.m4,v 1.314 2005/06/02 21:36:36 sniper Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -2413,7 +2413,6 @@
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.6&r2=1.7&ty=u
Index: php-src/build/libtool.m4
diff -u php-src/build/libtool.m4:1.6 php-src/build/libtool.m4:1.7
--- php-src/build/libtool.m4:1.6 Mon May 30 02:55:20 2005
+++ php-src/build/libtool.m4 Thu Jun 2 17:36:38 2005
@@ -9,12 +9,12 @@
# serial 47 AC_PROG_LIBTOOL
-
+ifdef([AC_ACVERSION],[
+# autoconf 2.13 compatibility
# Set PATH_SEPARATOR variable
# ---------------------------------
# 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
@@ -23,8 +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)
# -----------------------------------------------------------
@@ -96,7 +95,6 @@
# ----------------
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
