jani Tue, 15 Dec 2009 11:17:47 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=292156
Log:
- Make $sbindir be usable in C code as well (like $bindir and co.)
Changed paths:
U php/php-src/branches/PHP_5_2/configure.in
U php/php-src/branches/PHP_5_2/main/build-defs.h.in
U php/php-src/branches/PHP_5_3/configure.in
U php/php-src/branches/PHP_5_3/main/build-defs.h.in
U php/php-src/trunk/configure.in
U php/php-src/trunk/main/build-defs.h.in
Modified: php/php-src/branches/PHP_5_2/configure.in
===================================================================
--- php/php-src/branches/PHP_5_2/configure.in 2009-12-15 11:10:35 UTC (rev
292155)
+++ php/php-src/branches/PHP_5_2/configure.in 2009-12-15 11:17:47 UTC (rev
292156)
@@ -1141,6 +1141,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
@@ -1156,6 +1157,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)
Modified: php/php-src/branches/PHP_5_2/main/build-defs.h.in
===================================================================
--- php/php-src/branches/PHP_5_2/main/build-defs.h.in 2009-12-15 11:10:35 UTC
(rev 292155)
+++ php/php-src/branches/PHP_5_2/main/build-defs.h.in 2009-12-15 11:17:47 UTC
(rev 292156)
@@ -80,6 +80,7 @@
#define PHP_EXTENSION_DIR "@EXPANDED_EXTENSION_DIR@"
#define PHP_PREFIX "@prefix@"
#define PHP_BINDIR "@EXPANDED_BINDIR@"
+#define PHP_SBINDIR "@EXPANDED_SBINDIR@"
#define PHP_LIBDIR "@EXPANDED_LIBDIR@"
#define PHP_DATADIR "@EXPANDED_DATADIR@"
#define PHP_SYSCONFDIR "@EXPANDED_SYSCONFDIR@"
Modified: php/php-src/branches/PHP_5_3/configure.in
===================================================================
--- php/php-src/branches/PHP_5_3/configure.in 2009-12-15 11:10:35 UTC (rev
292155)
+++ php/php-src/branches/PHP_5_3/configure.in 2009-12-15 11:17:47 UTC (rev
292156)
@@ -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)
Modified: php/php-src/branches/PHP_5_3/main/build-defs.h.in
===================================================================
--- php/php-src/branches/PHP_5_3/main/build-defs.h.in 2009-12-15 11:10:35 UTC
(rev 292155)
+++ php/php-src/branches/PHP_5_3/main/build-defs.h.in 2009-12-15 11:17:47 UTC
(rev 292156)
@@ -80,6 +80,7 @@
#define PHP_EXTENSION_DIR "@EXPANDED_EXTENSION_DIR@"
#define PHP_PREFIX "@prefix@"
#define PHP_BINDIR "@EXPANDED_BINDIR@"
+#define PHP_SBINDIR "@EXPANDED_SBINDIR@"
#define PHP_LIBDIR "@EXPANDED_LIBDIR@"
#define PHP_DATADIR "@EXPANDED_DATADIR@"
#define PHP_SYSCONFDIR "@EXPANDED_SYSCONFDIR@"
Modified: php/php-src/trunk/configure.in
===================================================================
--- php/php-src/trunk/configure.in 2009-12-15 11:10:35 UTC (rev 292155)
+++ php/php-src/trunk/configure.in 2009-12-15 11:17:47 UTC (rev 292156)
@@ -1096,6 +1096,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
@@ -1110,6 +1111,7 @@
AC_SUBST(INCLUDE_PATH)
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)
Modified: php/php-src/trunk/main/build-defs.h.in
===================================================================
--- php/php-src/trunk/main/build-defs.h.in 2009-12-15 11:10:35 UTC (rev
292155)
+++ php/php-src/trunk/main/build-defs.h.in 2009-12-15 11:17:47 UTC (rev
292156)
@@ -79,6 +79,7 @@
#define PHP_EXTENSION_DIR "@EXPANDED_EXTENSION_DIR@"
#define PHP_PREFIX "@prefix@"
#define PHP_BINDIR "@EXPANDED_BINDIR@"
+#define PHP_SBINDIR "@EXPANDED_SBINDIR@"
#define PHP_LIBDIR "@EXPANDED_LIBDIR@"
#define PHP_DATADIR "@EXPANDED_DATADIR@"
#define PHP_SYSCONFDIR "@EXPANDED_SYSCONFDIR@"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
