Modified the build system to always build CLI SAPI.

diff --git a/Makefile.in b/Makefile.in
index e76599ca82a2aac8b99a0c92442d37945a032552..f19c23f79a311b32c64e4bac132ac3f08d7a3e95 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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

diff --git a/acinclude.m4 b/acinclude.m4
index 986a10dc74a52a2b101ded581511834b34881499..3c737d2a4bef29a6966bf4570f0c5154a068c8f7 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -930,7 +930,7 @@ dnl ---------------------------------------------- External Module
   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

diff --git a/configure.in b/configure.in
index f7d364df2b33ae43e5d9187cde4342e9b686f1ec..3f085e6e34c46bbbec16013b3af5322815a53c96 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ 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])

diff --git a/sapi/cli/Makefile.in b/sapi/cli/Makefile.in
index a95b5178378abe157031347cd39c2393bb7a8de4..eccb13ab066599f50611e1e48c8a1158899e9fea 100644 (file)
--- a/sapi/cli/Makefile.in
+++ b/sapi/cli/Makefile.in
@@ -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

diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
index 5fb91a83fd503c095eddf937c848e4fe82434276..a14dabc25e7a5b246fe517e472a422095df6edae 100644 (file)
--- a/sapi/cli/config.m4
+++ b/sapi/cli/config.m4
@@ -2,20 +2,9 @@ dnl
 dnl $Id$
 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)/"
+