Browse Source

Fixed build in the directory other than $top_srcdir.

experimental/ZendEngine2
Edin Kadribasic 25 years ago
parent
commit
2af5118d35
  1. 2
      acinclude.m4
  2. 8
      sapi/cli/Makefile.in

2
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 $abs_srcdir/$ext_builddir/lib$1.la"
EXT_LTLIBS="$EXT_LTLIBS $abs_builddir/$ext_builddir/lib$1.la"
EXT_STATIC="$EXT_STATIC $1"
else
dnl ---------------------------------------------- Shared module

8
sapi/cli/Makefile.in

@ -2,11 +2,11 @@ LTLIBRARY_NAME = libphp4cli.la
LTLIBRARY_SOURCES = php_cli.c getopt.c
LTLIBRARY_DEPENDENCIES = \
$(top_srcdir)/Zend/libZend.la \
$(top_srcdir)/main/libmain.la \
$(top_srcdir)/$(REGEX_LIB) \
$(top_builddir)/Zend/libZend.la \
$(top_builddir)/main/libmain.la \
$(top_builddir)/$(REGEX_LIB) \
$(EXT_LTLIBS) \
$(top_srcdir)/$(TSRM_LIB)
$(top_builddir)/$(TSRM_LIB)
LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)

Loading…
Cancel
Save