diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | unix/Makefile.in | 26 |
2 files changed, 26 insertions, 12 deletions
@@ -1,3 +1,15 @@ +2008-12-21 Daniel Steffen <das@users.sourceforge.net> + + * unix/Makefile.in: Fix broken build of bundled packages when path + to build dir contains spaces by switching to + relative paths to toplevel build dir. + + * unix/configure.in: Preserve configure environment variables for + sub-configures of bundled packages; reuse + configure cache file for sub-configures. + + * unix/configure: autoconf-2.59 + 2008-12-21 Donal K. Fellows <dkf@users.sf.net> *** 8.6b1 TAGGED FOR RELEASE *** diff --git a/unix/Makefile.in b/unix/Makefile.in index 2a68836..7e72acc 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.256 2008/12/20 02:27:55 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.257 2008/12/21 20:55:47 das Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -1609,13 +1609,16 @@ tclOOStubLib.o: $(GENERIC_DIR)/tclOOStubLib.c # Bundled Package targets # -# somehow we need to propagate configure args like --enable-64bit -PKG_CFG_ARGS = @PKG_CFG_ARGS@ -PKG_DIR = ./pkgs +# propagate configure args like --enable-64bit to package configure +PKG_CFG_ARGS = @PKG_CFG_ARGS@ +# if PKG_DIR is changed to a different relative depth to the build dir, +# need to adapt the ../.. relative paths below and at the top of configure.in +# (cannot use absolute paths due to issues in nested configure when path to +# build dir contains spaces). +PKG_DIR = ./pkgs configure-packages: - @builddir="`pwd`"; \ - for i in $(PKGS_DIR)/*; do \ + @for i in $(PKGS_DIR)/*; do \ if [ -d $$i ]; then \ if [ -x $$i/configure ]; then \ pkg=`basename $$i`; \ @@ -1623,7 +1626,7 @@ configure-packages: mkdir -p $(PKG_DIR)/$$pkg; \ if [ ! -f $(PKG_DIR)/$$pkg/Makefile ]; then \ ( cd $(PKG_DIR)/$$pkg; \ - $$i/configure --with-tcl="$${builddir}" \ + $$i/configure --with-tcl=../.. \ --with-tclinclude=$(GENERIC_DIR) \ $(PKG_CFG_ARGS) --libdir=$(PACKAGE_DIR) \ --enable-shared --enable-threads; ) || exit $$?; \ @@ -1656,17 +1659,16 @@ install-packages: packages done test-packages: tcltest packages - @builddir="`pwd`"; \ - for i in $(PKGS_DIR)/*; do \ + @for i in $(PKGS_DIR)/*; do \ if [ -d $$i ]; then \ pkg=`basename $$i`; \ if [ -f $(PKG_DIR)/$$pkg/Makefile ]; then \ echo "Testing package '$$pkg'"; \ ( cd $(PKG_DIR)/$$pkg; $(MAKE) \ - "@LD_LIBRARY_PATH_VAR@=$${builddir}:$${@LD_LIBRARY_PATH_VAR@}" \ + "@LD_LIBRARY_PATH_VAR@=../..:$${@LD_LIBRARY_PATH_VAR@}" \ "TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" \ - "TCLLIBPATH=$${builddir}/pkgs" test \ - "TCLSH_PROG=$${builddir}/tcltest"; ) \ + "TCLLIBPATH=../../pkgs" test \ + "TCLSH_PROG=../../tcltest"; ) \ fi; \ fi; \ done |