svn: /php/php-src/branches/PHP_5_3_FPM/ configure.in
| From: | Antony Dovgal | Date: | Tue, 15 Dec 2009 12:44:15 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3_FPM/ configure.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-61297@lists.php.net to get a copy of this message | ||
tony2001 Tue, 15 Dec 2009 12:44:15 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=292163
Log:
merge from the main tree
Changed paths:
U php/php-src/branches/PHP_5_3_FPM/configure.in
Modified: php/php-src/branches/PHP_5_3_FPM/configure.in
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/configure.in 2009-12-15 12:34:12 UTC (rev 292162)
+++ php/php-src/branches/PHP_5_3_FPM/configure.in 2009-12-15 12:44:15 UTC (rev 292163)
@@ -1157,6 +1157,7 @@
EXPANDED_EXTENSION_DIR=
eval echo $EXTENSION_DIR
EXPANDED_LOCALSTATEDIR=eval echo $localstatedir
EXPANDED_BINDIR=eval echo $bindir
+EXPANDED_SBINDIR=eval echo $sbindir
EXPANDED_LIBDIR=$libdir
EXPANDED_SYSCONFDIR=eval echo $sysconfdir
EXPANDED_DATADIR=$datadir
@@ -1172,6 +1173,7 @@
AC_SUBST(EXPANDED_PEAR_INSTALLDIR)
AC_SUBST(EXPANDED_EXTENSION_DIR)
AC_SUBST(EXPANDED_BINDIR)
+AC_SUBST(EXPANDED_SBINDIR)
AC_SUBST(EXPANDED_LIBDIR)
AC_SUBST(EXPANDED_DATADIR)
AC_SUBST(EXPANDED_SYSCONFDIR)
@@ -1240,6 +1242,7 @@
PHP_SUBST_OLD(php_abs_top_srcdir)
PHP_SUBST(bindir)
+PHP_SUBST(sbindir)
PHP_SUBST(exec_prefix)
PHP_SUBST_OLD(program_prefix)
PHP_SUBST_OLD(program_suffix)