cvs: php4 / .cvsignore build-defs.h.in configure.in /build build2.mk rules_common.mk /main .cvsignore build-defs.h.in

sas Mon Nov 27 05:27:52 2000 EDT Added files: /php4/main build-defs.h.in Removed files: /php4 build-defs.h.in Modified files: /php4 .cvsignore configure.in /php4/build build2.mk rules_common.mk /php4/main .cvsignore Log: Move build-defs.h(.in) and php_config.h to main Index: php4/.cvsignore diff -u php4/.cvsignore:1.34 php4/.cvsignore:1.35 --- php4/.cvsignore:1.34 Tue Sep 26 04:19:38 2000 +++ php4/.cvsignore Mon Nov 27 05:27:51 2000 @@ -2,7 +2,6 @@ acconfig.h aclocal.m4 bsd_converted -build-defs.h buildmk.stamp buildconf.stamp config.cache @@ -25,8 +24,6 @@ shlibtool php php4.spec -php_config.h -php_config.h.in stamp-h test.php3 *.lo Index: php4/configure.in diff -u php4/configure.in:1.193 php4/configure.in:1.194 --- php4/configure.in:1.193 Mon Nov 13 11:13:41 2000 +++ php4/configure.in Mon Nov 27 05:27:51 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.193 2000/11/13 19:13:41 venaas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.194 2000/11/27 13:27:51 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -65,7 +65,7 @@ rm -f php_version.h.new fi -AM_CONFIG_HEADER(php_config.h) +AM_CONFIG_HEADER(main/php_config.h) AM_MAINTAINER_MODE AC_CANONICAL_HOST @@ -199,7 +199,7 @@ LDFLAGS="$LDFLAGS -L/usr/pkg/lib" fi -INCLUDES="$INCLUDES -I\$(top_builddir)/Zend -I\$(top_srcdir)" +INCLUDES="$INCLUDES -I\$(top_builddir)/Zend" AC_CHECK_LIB(socket, socket, [ @@ -669,7 +669,7 @@ fi if test "$abs_srcdir" != "$abs_builddir"; then - INCLUDES="$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend" + INCLUDES="$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend -I\$(top_srcdir)" INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM" fi @@ -842,7 +842,7 @@ PHP_GEN_CONFIG_VARS -ALL_OUTPUT_FILES="php4.spec Zend/Makefile build-defs.h $PHP_OUTPUT_FILES" +ALL_OUTPUT_FILES="php4.spec Zend/Makefile main/build-defs.h $PHP_OUTPUT_FILES" AC_OUTPUT($ALL_OUTPUT_FILES, [], [ @@ -866,11 +866,11 @@ # if test -d TSRM; then - echo '#include "../php_config.h"' > TSRM/tsrm_config.h + echo '#include "../main/php_config.h"' > TSRM/tsrm_config.h fi cat >Zend/zend_config.h <<FEO -#include "../php_config.h" +#include "../main/php_config.h" #if defined(APACHE) && defined(PHP_API_VERSION) #undef HAVE_DLFCN_H #endif Index: php4/build/build2.mk diff -u php4/build/build2.mk:1.15 php4/build/build2.mk:1.16 --- php4/build/build2.mk:1.15 Sat Aug 19 22:36:07 2000 +++ php4/build/build2.mk Mon Nov 27 05:27:51 2000 @@ -14,7 +14,7 @@ # | Authors: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: build2.mk,v 1.15 2000/08/20 05:36:07 sas Exp $ +# $Id: build2.mk,v 1.16 2000/11/27 13:27:51 sas Exp $ # include generated_lists @@ -26,7 +26,7 @@ makefile_in_files = $(makefile_am_files:.am=.in) makefile_files = $(makefile_am_files:e.am=e) -config_h_in = php_config.h.in +config_h_in = main/php_config.h.in acconfig_h_SOURCES = acconfig.h.in $(config_h_files) Index: php4/build/rules_common.mk diff -u php4/build/rules_common.mk:1.3 php4/build/rules_common.mk:1.4 --- php4/build/rules_common.mk:1.3 Tue Aug 29 02:12:44 2000 +++ php4/build/rules_common.mk Mon Nov 27 05:27:51 2000 @@ -14,7 +14,7 @@ # | Authors: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: rules_common.mk,v 1.3 2000/08/29 09:12:44 ssb Exp $ +# $Id: rules_common.mk,v 1.4 2000/11/27 13:27:51 sas Exp $ # include $(top_builddir)/config_vars.mk @@ -32,7 +32,7 @@ INSTALL = $(top_srcdir)/build/shtool install -c INSTALL_DATA = $(INSTALL) -m 644 -DEFS = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/main +DEFS = -I. -I$(srcdir) -I$(top_builddir)/main moduledir = $(EXTENSION_DIR) Index: php4/main/.cvsignore diff -u php4/main/.cvsignore:1.1 php4/main/.cvsignore:1.2 --- php4/main/.cvsignore:1.1 Mon Jun 12 06:22:11 2000 +++ php4/main/.cvsignore Mon Nov 27 05:27:51 2000 @@ -1,9 +1,12 @@ Makefile +build-defs.h configuration-parser.c configuration-parser.h configuration-parser.output configuration-scanner.c internal_functions.c +php_config.h +php_config.h.in *.lo *.la .libs Index: php4/main/build-defs.h.in +++ php4/main/build-defs.h.in /* -*- C -*- +----------------------------------------------------------------------+ | PHP version 4.0 | +----------------------------------------------------------------------+ | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available at through the world-wide-web at | | http://www.php.net/license/2_02.txt. | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Authors: Stig Sæther Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ /* $Id: build-defs.h.in,v 1.1 2000/11/27 13:27:51 sas Exp $ */ #define CONFIGURE_COMMAND "@CONFIGURE_COMMAND@" #define PHP_ADA_INCLUDE "" #define PHP_ADA_LFLAGS "" #define PHP_ADA_LIBS "" #define PHP_APACHE_INCLUDE "" #define PHP_APACHE_TARGET "" #define PHP_FHTTPD_INCLUDE "" #define PHP_FHTTPD_LIB "" #define PHP_FHTTPD_TARGET "" #define PHP_BINNAME "@BINNAME@" #define PHP_CFLAGS "@CFLAGS@" #define PHP_DBASE_LIB "" #define PHP_BUILD_DEBUG "@DEBUG_CFLAGS@" #define PHP_GDBM_INCLUDE "" #define PHP_HSREGEX "" #define PHP_IBASE_INCLUDE "" #define PHP_IBASE_LFLAGS "" #define PHP_IBASE_LIBS "" #define PHP_IFX_INCLUDE "" #define PHP_IFX_LFLAGS "" #define PHP_IFX_LIBS "" #define PHP_INSTALL_IT "@INSTALL_IT@" #define PHP_IODBC_INCLUDE "" #define PHP_IODBC_LFLAGS "" #define PHP_IODBC_LIBS "" #define PHP_MSQL_INCLUDE "" #define PHP_MSQL_LFLAGS "" #define PHP_MSQL_LIBS "" #define PHP_MYSQL_INCLUDE "" #define PHP_MYSQL_LFLAGS "" #define PHP_MYSQL_LIBS "" #define PHP_ODBC_TYPE "@ODBC_TYPE@" #define PHP_ODBC_INCLUDE "@ODBC_INCLUDE@" #define PHP_ODBC_LFLAGS "@ODBC_LFLAGS@" #define PHP_ODBC_LIBS "@ODBC_LIBS@" #define PHP_OCI8_SHARED_LIBADD "@OCI8_SHARED_LIBADD@" #define PHP_OCI8_DIR "@OCI8_DIR@" #define PHP_OCI8_VERSION "@OCI8_VERSION@" #define PHP_ORACLE_SHARED_LIBADD "@ORACLE_SHARED_LIBADD@" #define PHP_ORACLE_DIR "@ORACLE_DIR@" #define PHP_ORACLE_VERSION "@ORACLE_VERSION@" #define PHP_PGSQL_INCLUDE "" #define PHP_PGSQL_LFLAGS "" #define PHP_PGSQL_LIBS "" #define PHP_PROG_SENDMAIL "@PROG_SENDMAIL@" #define PHP_REGEX_LIB "" #define PHP_SOLID_INCLUDE "" #define PHP_SOLID_LIBS "" #define PHP_EMPRESS_INCLUDE "" #define PHP_EMPRESS_LIBS "" #define PHP_SYBASE_INCLUDE "" #define PHP_SYBASE_LFLAGS "" #define PHP_SYBASE_LIBS "" #define PHP_DBM_TYPE "" #define PHP_DBM_LIB "" #define PHP_LDAP_LFLAGS "" #define PHP_LDAP_INCLUDE "" #define PHP_LDAP_LIBS "" #define PHP_VELOCIS_INCLUDE "" #define PHP_VELOCIS_LIBS "" #define PHP_EXTENSION_DIR "@EXTENSION_DIR@" #define PHP_INCLUDE_PATH "@INCLUDE_PATH@"