cvs: php4 / Makefile.in acinclude.m4 configure.in /sapi/cli .cvsignore Makefile.in config.m4

edink Sat Jan 12 09:51:55 2002 EDT Modified files: /php4 Makefile.in acinclude.m4 configure.in /php4/sapi/cli .cvsignore Makefile.in config.m4 Log: Modified the build system to always build CLI SAPI. Index: php4/Makefile.in diff -u php4/Makefile.in:1.102 php4/Makefile.in:1.103 --- php4/Makefile.in:1.102 Mon Oct 1 17:03:05 2001 +++ php4/Makefile.in Sat Jan 12 09:51:54 2002 @@ -1,6 +1,6 @@ ZEND_DIR = $(srcdir)/Zend -SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR) +SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . sapi/cli $(PEAR_DIR) LTLIBRARY_NAME = libphp4.la LTLIBRARY_SOURCES = stub.c Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.147 php4/acinclude.m4:1.148 --- php4/acinclude.m4:1.147 Tue Jan 8 22:40:51 2002 +++ php4/acinclude.m4 Sat Jan 12 09:51:54 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.147 2002/01/09 03:40:51 sniper Exp $ +dnl $Id: acinclude.m4,v 1.148 2002/01/12 14:51:54 edink Exp $ dnl dnl This file contains local autoconf functions. @@ -930,7 +930,7 @@ if test "$2" != "shared" && test "$2" != "yes"; then dnl ---------------------------------------------- Static module LIB_BUILD($ext_builddir) - EXT_LTLIBS="$EXT_LTLIBS $ext_builddir/lib$1.la" + EXT_LTLIBS="$EXT_LTLIBS $abs_srcdir/$ext_builddir/lib$1.la" EXT_STATIC="$EXT_STATIC $1" else dnl ---------------------------------------------- Shared module Index: php4/configure.in diff -u php4/configure.in:1.288 php4/configure.in:1.289 --- php4/configure.in:1.288 Tue Jan 8 22:41:48 2002 +++ php4/configure.in Sat Jan 12 09:51:54 2002 @@ -1,11 +1,11 @@ -dnl ## $Id: configure.in,v 1.288 2002/01/09 03:41:48 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.289 2002/01/12 14:51:54 edink Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) AC_INIT(README.CVS-RULES) -PHP_FAST_OUTPUT(sapi/Makefile ext/Makefile Makefile pear/Makefile main/Makefile) +PHP_FAST_OUTPUT(sapi/Makefile ext/Makefile Makefile pear/Makefile main/Makefile sapi/cli/Makefile) if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then AC_MSG_ERROR([--with-shared-apache is not supported. Please refer to the documentation for using APXS]) Index: php4/sapi/cli/.cvsignore diff -u php4/sapi/cli/.cvsignore:1.1 php4/sapi/cli/.cvsignore:1.2 --- php4/sapi/cli/.cvsignore:1.1 Sun Jan 6 09:08:14 2002 +++ php4/sapi/cli/.cvsignore Sat Jan 12 09:51:54 2002 @@ -8,3 +8,5 @@ Release_TS Debug_TS *.plg +php +php.cli Index: php4/sapi/cli/Makefile.in diff -u php4/sapi/cli/Makefile.in:1.1 php4/sapi/cli/Makefile.in:1.2 --- php4/sapi/cli/Makefile.in:1.1 Sun Jan 6 09:08:14 2002 +++ php4/sapi/cli/Makefile.in Sat Jan 12 09:51:54 2002 @@ -1,5 +1,25 @@ +LTLIBRARY_NAME = libphp4cli.la +LTLIBRARY_SOURCES = $(top_srcdir)/stub.c php_cli.c getopt.c -LTLIBRARY_NAME = libsapi.la -LTLIBRARY_SOURCES = php_cli.c getopt.c +LTLIBRARY_DEPENDENCIES = \ + $(top_srcdir)/Zend/libZend.la \ + $(top_srcdir)/main/libmain.la \ + $(top_srcdir)/$(REGEX_LIB) \ + $(EXT_LTLIBS) \ + $(top_srcdir)/$(TSRM_LIB) -include $(top_srcdir)/build/ltlib.mk +LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) +LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS) + + +PROGRAM_NAME = php +PROGRAM_SOURCES = $(top_srcdir)/stub.c +PROGRAM_LDADD = libphp4cli.la $(EXT_PROGRAM_LDADD) +PROGRAM_LDFLAGS = -export-dynamic +PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD) + +targets = $(LTLIBRARY_NAME) $(PROGRAM_NAME) + +include $(top_srcdir)/build/rules.mk +include $(top_srcdir)/build/library.mk +include $(top_srcdir)/build/program.mk Index: php4/sapi/cli/config.m4 diff -u php4/sapi/cli/config.m4:1.1 php4/sapi/cli/config.m4:1.2 --- php4/sapi/cli/config.m4:1.1 Sun Jan 6 09:08:14 2002 +++ php4/sapi/cli/config.m4 Sat Jan 12 09:51:54 2002 @@ -1,21 +1,10 @@ dnl -dnl $Id: config.m4,v 1.1 2002/01/06 14:08:14 edink Exp $ +dnl $Id: config.m4,v 1.2 2002/01/12 14:51:54 edink Exp $ dnl +dnl Just for fun (not actually need) AC_MSG_CHECKING(for CLI build) -AC_ARG_WITH(cli, -[ --with-cli Build PHP as CLI application],[ - if test "$withval" = "yes"; then - CLIPATH=/usr/local - else - CLIPATH=$withval - fi - PHP_SAPI=cli - PHP_PROGRAM=php - INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(bindir)/$PHP_PROGRAM" - RESULT=yes - PHP_SUBST(EXT_PROGRAM_LDADD) -],[ - RESULT=no -]) -AC_MSG_RESULT($RESULT) +AC_MSG_RESULT(yes) + +INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 sapi/cli/php \$(INSTALL_ROOT)\$(bindir)/" +