cvs: php4 / configure.in /main build-defs.h.in main.c

ssb Fri Jun 7 08:19:28 2002 EDT Modified files: /php4 configure.in /php4/main build-defs.h.in main.c Log: @New constants: PHP_PREFIX and PHP_SHLIB_SUFFIX (Stig) Index: php4/configure.in diff -u php4/configure.in:1.351 php4/configure.in:1.352 --- php4/configure.in:1.351 Fri Jun 7 06:17:25 2002 +++ php4/configure.in Fri Jun 7 08:19:22 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.351 2002/06/07 10:17:25 ssb Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.352 2002/06/07 12:19:22 ssb Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1039,6 +1039,7 @@ PHP_SUBST(TSRM_LIB) PHP_SUBST(WARNING_LEVEL) PHP_SUBST_OLD(YACC) +PHP_SUBST_OLD(SHLIB_SUFFIX_NAME) old_CC=$CC Index: php4/main/build-defs.h.in diff -u php4/main/build-defs.h.in:1.9 php4/main/build-defs.h.in:1.10 --- php4/main/build-defs.h.in:1.9 Mon Mar 4 04:10:32 2002 +++ php4/main/build-defs.h.in Fri Jun 7 08:19:26 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: build-defs.h.in,v 1.9 2002/03/04 09:10:32 imajes Exp $ */ +/* $Id: build-defs.h.in,v 1.10 2002/06/07 12:19:26 ssb Exp $ */ #define CONFIGURE_COMMAND "@CONFIGURE_COMMAND@" #define PHP_ADA_INCLUDE "" @@ -80,9 +80,11 @@ #define PEAR_INSTALLDIR "@EXPANDED_PEAR_INSTALLDIR@" #define PHP_INCLUDE_PATH "@INCLUDE_PATH@" #define PHP_EXTENSION_DIR "@EXPANDED_EXTENSION_DIR@" +#define PHP_PREFIX "@prefix@" #define PHP_BINDIR "@EXPANDED_BINDIR@" #define PHP_LIBDIR "@EXPANDED_LIBDIR@" #define PHP_DATADIR "@EXPANDED_DATADIR@" #define PHP_SYSCONFDIR "@EXPANDED_SYSCONFDIR@" #define PHP_LOCALSTATEDIR "@EXPANDED_LOCALSTATEDIR@" #define PHP_CONFIG_FILE_PATH "@EXPANDED_PHP_CONFIG_FILE_PATH@" +#define PHP_SHLIB_SUFFIX "@SHLIB_SUFFIX_NAME@" Index: php4/main/main.c diff -u php4/main/main.c:1.457 php4/main/main.c:1.458 --- php4/main/main.c:1.457 Sun Jun 2 13:13:48 2002 +++ php4/main/main.c Fri Jun 7 08:19:26 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.457 2002/06/02 17:13:48 mfischer Exp $ */ +/* $Id: main.c,v 1.458 2002/06/07 12:19:26 ssb Exp $ */ /* {{{ includes */ @@ -960,12 +960,14 @@ REGISTER_MAIN_STRINGL_CONSTANT("PEAR_INSTALL_DIR", PEAR_INSTALLDIR, sizeof(PEAR_INSTALLDIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PEAR_EXTENSION_DIR", PHP_EXTENSION_DIR, sizeof(PHP_EXTENSION_DIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_EXTENSION_DIR", PHP_EXTENSION_DIR, sizeof(PHP_EXTENSION_DIR)-1, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT("PHP_PREFIX", PHP_PREFIX, sizeof(PHP_PREFIX)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINDIR", PHP_BINDIR, sizeof(PHP_BINDIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_LIBDIR", PHP_LIBDIR, sizeof(PHP_LIBDIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_DATADIR", PHP_DATADIR, sizeof(PHP_DATADIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_SYSCONFDIR", PHP_SYSCONFDIR, sizeof(PHP_SYSCONFDIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_LOCALSTATEDIR", PHP_LOCALSTATEDIR, sizeof(PHP_LOCALSTATEDIR)-1, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_PATH", PHP_CONFIG_FILE_PATH, sizeof(PHP_CONFIG_FILE_PATH)-1, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX, sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS); php_output_register_constants(TSRMLS_C); if (php_startup_ticks(TSRMLS_C) == FAILURE) {