svn: /php/php-src/ branches/PHP_5_2/build/libtool.m4 branches/PHP_5_3/build/libtool.m4 trunk/build/libtool.m4
| From: | Jani Taskinen | Date: | Sat, 28 Nov 2009 00:06:54 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/build/libtool.m4 branches/PHP_5_3/build/libtool.m4 trunk/build/libtool.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-61042@lists.php.net to get a copy of this message | ||
jani Sat, 28 Nov 2009 00:06:54 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291367
Log:
- Fix bad merge (Sorry Ilia..)
Changed paths:
U php/php-src/branches/PHP_5_2/build/libtool.m4
U php/php-src/branches/PHP_5_3/build/libtool.m4
U php/php-src/trunk/build/libtool.m4
Modified: php/php-src/branches/PHP_5_2/build/libtool.m4
===================================================================
--- php/php-src/branches/PHP_5_2/build/libtool.m4 2009-11-27 23:45:33 UTC (rev 291366)
+++ php/php-src/branches/PHP_5_2/build/libtool.m4 2009-11-28 00:06:54 UTC (rev 291367)
@@ -2871,12 +2871,12 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
- $as_unset lt_cv_prog_gnu_ld
+ unset lt_cv_prog_gnu_ld
fi
if test -n "${lt_cv_path_LDCXX+set}"; then
lt_cv_path_LD=$lt_cv_path_LDCXX
else
- $as_unset lt_cv_path_LD
+ unset lt_cv_path_LD
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
Modified: php/php-src/branches/PHP_5_3/build/libtool.m4
===================================================================
--- php/php-src/branches/PHP_5_3/build/libtool.m4 2009-11-27 23:45:33 UTC (rev 291366)
+++ php/php-src/branches/PHP_5_3/build/libtool.m4 2009-11-28 00:06:54 UTC (rev 291367)
@@ -2871,12 +2871,12 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
- $as_unset lt_cv_prog_gnu_ld
+ unset lt_cv_prog_gnu_ld
fi
if test -n "${lt_cv_path_LDCXX+set}"; then
lt_cv_path_LD=$lt_cv_path_LDCXX
else
- $as_unset lt_cv_path_LD
+ unset lt_cv_path_LD
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
Modified: php/php-src/trunk/build/libtool.m4
===================================================================
--- php/php-src/trunk/build/libtool.m4 2009-11-27 23:45:33 UTC (rev 291366)
+++ php/php-src/trunk/build/libtool.m4 2009-11-28 00:06:54 UTC (rev 291367)
@@ -2871,12 +2871,12 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
- $as_unset lt_cv_prog_gnu_ld
+ unset lt_cv_prog_gnu_ld
fi
if test -n "${lt_cv_path_LDCXX+set}"; then
lt_cv_path_LD=$lt_cv_path_LDCXX
else
- $as_unset lt_cv_path_LD
+ unset lt_cv_path_LD
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}