Support building from directories other than the source directory.

Patch contributed by Mo DeJong -- thanks!

This closes SF patch #431340.

diff --git a/expat/configure.in b/expat/configure.in
index f59ec45d2872877bec8a51e4e99b6413daf8a91d..d1f4ce8e4395670c630bb29afda19f93b8fd3a9c 100644 (file)
--- a/expat/configure.in
+++ b/expat/configure.in
@@ -94,13 +94,13 @@ dnl in "embedded distributions", where only part of the Expat sources
 dnl are included in the sources for another project.
 
 OUTPUT="Makefile lib/Makefile lib/expat.h"
-if test -d xmlwf; then
+if test -d ${srcdir}/xmlwf; then
     OUTPUT="$OUTPUT xmlwf/Makefile"
 fi
-if test -d sample; then
+if test -d ${srcdir}/sample; then
     OUTPUT="$OUTPUT sample/Makefile"
 fi
-if test -d examples; then
+if test -d ${srcdir}/examples; then
     OUTPUT="$OUTPUT examples/Makefile"
 fi
 AC_OUTPUT($OUTPUT)

diff --git a/expat/lib/Makefile.in b/expat/lib/Makefile.in
index 3fbf9f6a786efedf2ab83730369e5f8885a5d31d..095f1ae4fec0ed63f4a8e61492232d281303b4ce 100644 (file)
--- a/expat/lib/Makefile.in
+++ b/expat/lib/Makefile.in
@@ -77,7 +77,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
 
-INCLUDES = -I$(srcdir) -I..
+INCLUDES = -I$(srcdir) -I. -I..
 DEFS = @DEFS@ -DPACKAGE='"$(PACKAGE)"' -DVERSION='"$(PACKAGE)_$(VERSION)"'
 
 CPPFLAGS = @CPPFLAGS@