diff options
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/cli/Makefile.in | 26 | ||||
| -rw-r--r-- | sapi/cli/config.m4 | 21 |
2 files changed, 28 insertions, 19 deletions
diff --git a/sapi/cli/Makefile.in b/sapi/cli/Makefile.in index a95b517837..eccb13ab06 100644 --- 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 5fb91a83fd..a14dabc25e 100644 --- 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)/" + |