From: Jani Taskinen <jani@php.net>
Date: Tue, 15 Dec 2009 11:17:47 +0000 (+0000)
Subject: - Make $sbindir be usable in C code as well (like $bindir and co.)
X-Git-Tag: php-5.4.0alpha1~191^2~2220
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=daab781751a99e53a2ebcfeb3e9c205e479ddd60;p=php

- Make $sbindir be usable in C code as well (like $bindir and co.)
---

diff --git a/configure.in b/configure.in
index 882bc532f8..2cf7c7b4e3 100644
--- a/configure.in
+++ b/configure.in
@@ -1096,6 +1096,7 @@ dnl Expand all directory names for use in macros/constants
 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 @@ datadir=$old_datadir
 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)
diff --git a/main/build-defs.h.in b/main/build-defs.h.in
index 41bba0d835..64063c6487 100644
--- a/main/build-defs.h.in
+++ b/main/build-defs.h.in
@@ -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@"