summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Bakken <ssb@php.net>1999-12-03 13:31:41 +0000
committerStig Bakken <ssb@php.net>1999-12-03 13:31:41 +0000
commita8f71d621f484833f0784b9636f95d1eb46789c0 (patch)
tree8c93638b828775d289b5021f8f93025cb07c9173
parent992eb497bf186e8931fa686d584df157ed07580f (diff)
downloadphp-git-a8f71d621f484833f0784b9636f95d1eb46789c0.tar.gz
Add configure command to phpinfo() output (Stig)
-rw-r--r--build-defs.h.in4
-rw-r--r--configure.in6
-rw-r--r--ext/standard/info.c2
3 files changed, 9 insertions, 3 deletions
diff --git a/build-defs.h.in b/build-defs.h.in
index 3095d6e874..fd9f697597 100644
--- a/build-defs.h.in
+++ b/build-defs.h.in
@@ -23,10 +23,11 @@
| If you did not, or have any questions about PHP licensing, please |
| contact core@php.net. |
+----------------------------------------------------------------------+
- | Authors: Stig Sæther Bakken <ssb@guardian.no> |
+ | Authors: Stig Sæther Bakken <ssb@fast.no> |
+----------------------------------------------------------------------+
*/
+#define CONFIGURE_COMMAND "@CONFIGURE_COMMAND@"
#define PHP_ADA_INCLUDE ""
#define PHP_ADA_LFLAGS ""
#define PHP_ADA_LIBS ""
@@ -87,4 +88,3 @@
#define PHP_LDAP_LIBS ""
#define PHP_VELOCIS_INCLUDE ""
#define PHP_VELOCIS_LIBS ""
-
diff --git a/configure.in b/configure.in
index 0157c1d7cb..38aff64191 100644
--- a/configure.in
+++ b/configure.in
@@ -16,6 +16,12 @@ fi
cwd=`pwd`
passthru="$@"
+CONFIGURE_COMMAND=$0
+for arg in "$@"; do
+ CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$arg'"
+done
+AC_SUBST(CONFIGURE_COMMAND)
+
dnl ## Diversion 1 is the initial checking of OS features, programs,
dnl ## libraries and so on.
diff --git a/ext/standard/info.c b/ext/standard/info.c
index 8f4b455ddb..3063f9259e 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -95,8 +95,8 @@ PHPAPI void php_print_info(int flag)
PUTS("?=PHPE9568F34-D428-11d2-A769-00AA001ACF42\" border=\"0\" align=\"right\"></a>\n");
}
php_printf("System: %s<br>Build Date: %s\n<br>", php3_uname, __DATE__);
+ php_printf("Configure command: %s<br>\n", CONFIGURE_COMMAND);
php_printf("php.ini path: %s<br>\n", CONFIGURATION_FILE_PATH);
-
php_printf("ZEND_DEBUG=%d<br>\n", ZEND_DEBUG);
#ifdef ZTS
php_printf("ZTS is defined");