* win/configure.in:

* win/Makefile.in: Added build of packages in the 'pkgs/' directory.
* win/configure: Autoconf 2.59

1 files changed, 92 insertions, 11 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index 0a14f8e..a242720 100644
--- a/win/Makefile.in
+++ b/win/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.141 2008/12/18 22:47:57 dkf Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.142 2008/12/19 02:46:07 kennykb Exp $
 
 VERSION = @TCL_VERSION@
 
@@ -95,10 +95,12 @@ MAN2TCLFLAGS =		@MAN2TCLFLAGS@
 
 SRC_DIR			= @srcdir@
 ROOT_DIR		= @srcdir@/..
-GENERIC_DIR		= @srcdir@/../generic
-TOMMATH_DIR		= @srcdir@/../libtommath
-WIN_DIR			= @srcdir@
-COMPAT_DIR		= @srcdir@/../compat
+TOP_DIR			= $(shell cd @srcdir@/..; pwd)
+GENERIC_DIR		= $(TOP_DIR)/generic
+TOMMATH_DIR		= $(TOP_DIR)/libtommath
+WIN_DIR			= $(TOP_DIR)/win
+COMPAT_DIR		= $(TOP_DIR)/compat
+PKGS_DIR		= $(TOP_DIR)/pkgs
 ZLIB_DIR		= $(COMPAT_DIR)/zlib/
 
 # Converts a POSIX path to a Windows native path.
@@ -386,7 +388,7 @@ TCL_OBJS = ${GENERIC_OBJS} $(TOMMATH_OBJS) ${WIN_OBJS}
 
 TCL_DOCS = "$(ROOT_DIR_NATIVE)"/doc/*.[13n]
 
-all: binaries libraries doc
+all: binaries libraries doc packages
 
 tcltest: $(TCLTEST)
 
@@ -551,7 +553,7 @@ gentommath_h:
 		"$(TOMMATH_DIR_NATIVE)\tommath.h" \
 		> "$(GENERIC_DIR_NATIVE)\tclTomMath.h"
 
-install: all install-binaries install-libraries install-doc
+install: all install-binaries install-libraries install-doc install-packages
 
 install-binaries: binaries
 	@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" ; \
@@ -702,7 +704,7 @@ install-private-headers: libraries
 # tcltest, i.e.:
 #	% make test TESTFLAGS="-verbose bps -file fileName.test"
 
-test: binaries $(TCLTEST)
+test: binaries $(TCLTEST) test-packages
 	TCL_LIBRARY="$(LIBRARY_DIR)"; export TCL_LIBRARY; \
 	./$(TCLTEST) "$(ROOT_DIR_NATIVE)/tests/all.tcl" $(TESTFLAGS) \
 	-load "set ::ddelib [file normalize ${DDE_DLL_FILE}]; \
@@ -734,16 +736,95 @@ Makefile: $(SRC_DIR)/Makefile.in
 cleanhelp:
 	$(RM) *.hlp *.cnt *.GID *.rtf man2tcl.exe
 
-clean: cleanhelp
+clean: cleanhelp clean-packages
 	$(RM) *.lib *.a *.exp *.dll *.$(RES) *.${OBJEXT} *~ \#* TAGS a.out
 	$(RM) $(TCLSH) $(TCLTEST) $(CAT32)
 	$(RM) *.pch *.ilk *.pdb
+	${MAKE} -C ${ZLIB_DIR} clean
 
-distclean: clean
+distclean: distclean-packages clean
 	$(RM) Makefile config.status config.cache config.log tclConfig.sh \
 		tcl.hpj config.status.lineno
 
 #
+# Bundled package targets
+#
+
+PKG_CFG_ARGS		= @PKG_CFG_ARGS@
+PKG_DIR			= ./pkgs
+
+packages:
+	@builddir=`pwd`; \
+	for i in $(PKGS_DIR)/*; do \
+	  if [ -d $$i ] ; then \
+	    if [ -x $$i/configure ] ; then \
+	      pkg=`basename $$i`; \
+	      mkdir -p $(PKG_DIR)/$$pkg; \
+	      if [ ! -f $(PKG_DIR)/$$pkg/Makefile ]; then \
+	        ( cd $(PKG_DIR)/$$pkg; \
+	          echo "Configuring package '$$i' wd = `pwd`"; \
+	          $$i/configure --with-tcl=$(PWD) --with-tclinclude=$(GENERIC_DIR) $(PKG_CFG_ARGS) --enable-shared --enable-threads; ) \
+	      fi ; \
+	      echo "Building package '$$pkg'"; \
+	      ( cd $(PKG_DIR)/$$pkg; $(MAKE); ) \
+	    fi; \
+	  fi; \
+	done; \
+	cd $$builddir
+
+install-packages: packages
+	@builddir=`pwd`; \
+	for i in $(PKGS_DIR)/*; do \
+	  if [ -d $$i ]; then \
+	    pkg=`basename $$i`; \
+	    if [ -f $(PKG_DIR)/$$pkg/Makefile ]; then \
+	        echo "Installing package '$$pkg'"; \
+	        ( cd $(PKG_DIR)/$$pkg; $(MAKE) install "DESTDIR=$(INSTALL_ROOT)"; ) \
+	    fi; \
+	  fi; \
+	done; \
+	cd $$builddir
+
+test-packages: tcltest packages
+	@builddir=`pwd`; \
+	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=$$builddir:${LD_LIBRARY_PATH}" "TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" "TCLLIBPATH=$$builddir/pkgs" test "TCLSH_PROG=$$builddir/tcltest"; ) \
+	    fi; \
+	  fi; \
+	done; \
+	cd $$builddir
+
+clean-packages:
+	@builddir=`pwd`; \
+	for i in $(PKGS_DIR)/*; do \
+	  if [ -d $$i ]; then \
+	    pkg=`basename $$i`; \
+	    if [ -f $(PKG_DIR)/$$pkg/Makefile ]; then \
+	        ( cd $(PKG_DIR)/$$pkg; $(MAKE) clean; ) \
+	    fi; \
+	  fi; \
+	done; \
+	cd $$builddir
+
+distclean-packages:
+	@builddir=`pwd`; \
+	for i in $(PKGS_DIR)/*; do \
+	  if [ -d $$i ]; then \
+	    pkg=`basename $$i`; \
+	    if [ -f $(PKG_DIR)/$$pkg/Makefile ]; then \
+	        ( cd $(PKG_DIR)/$$pkg; $(MAKE) distclean; ) \
+	    fi; \
+	    cd $$builddir; \
+	    rm -rf $(PKG_DIR)/$$pkg; \
+	  fi; \
+	done; \
+	rm -rf $(PKG_DIR)
+
+#
 # Regenerate the stubs files.
 #
 
@@ -757,7 +838,7 @@ genstubs:
 	$(TCL_EXE) "$(ROOT_DIR_NATIVE)\tools\genStubs.tcl" \
 	    "$(GENERIC_DIR_NATIVE)" \
 	    "$(GENERIC_DIR_NATIVE)\tcl.decls" \
-            "$(GENERIC_DIR_NATIVE)\tclInt.decls" \
+	    "$(GENERIC_DIR_NATIVE)\tclInt.decls" \
 	    "$(GENERIC_DIR_NATIVE)\tclTomMath.decls"
 	$(TCL_EXE) "$(ROOT_DIR_NATIVE)\tools\genStubs.tcl" \
 	    "$(GENERIC_DIR_NATIVE)" \