Fixed build in the directory other than $top_srcdir.

diff --git a/acinclude.m4 b/acinclude.m4
index 3c737d2a4bef29a6966bf4570f0c5154a068c8f7..c4f9c26e6bf0e79dc250578c0db82515572e2e85 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 $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

diff --git a/sapi/cli/Makefile.in b/sapi/cli/Makefile.in
index 90f0e0d63a57f7d27514d9e337fdac74cbbc94b1..0a10b9886053c43b0e59494ade37c6529517f864 100644 (file)
--- a/sapi/cli/Makefile.in
+++ b/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)