Subject: Add Static library link instructions to tclConfig.sh

From: hypnotoad <[email-masked]>
Date: Tue, 9 Sep 2014 13:59:09 +0000

---
 unix/Makefile.in     |  6 ------
 unix/configure       | 46 +++++++++++++++++++++++++++++++++++++++-------
 unix/configure.in    | 41 ++++++++++++++++++++++++++++++++++-------
 unix/tclConfig.sh.in | 28 ++++++++++++++++++++++++++++
 4 files changed, 101 insertions(+), 20 deletions(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 7d9b82d..c66cc0a 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -649,12 +649,6 @@ ${TCL_KIT_LIB_FILE}: ${TCL_OBJS} ${TOMMATH_OBJS} ${ZLIB_OBJS}
 	rm -f $@
 	@MAKE_KIT_LIB@
 	
-	#${SHLIB_LD} $@ ${TCL_OBJS} ${TOMMATH_OBJS} ${ZLIB_OBJS} ; ${RANLIB} $@
-	#${CC} ${CFLAGS} ${LDFLAGS} \
-	#	${TCL_OBJS} ${TOMMATH_OBJS} ${ZLIB_OBJS} \
-	#	${CC_SEARCH_FLAGS} -o ${TCL_KIT_LIB_FILE}
-
-
 # Make target which outputs the list of the .o contained in the Tcl lib useful
 # to build a single big shared library containing Tcl and other extensions.
 # Used for the Tcl Plugin.  -- dl
diff --git a/unix/configure b/unix/configure
index 2740498..a5f318e 100755
--- a/unix/configure
+++ b/unix/configure
@@ -642,20 +642,25 @@ TCL_HAS_LONGLONG
 TCL_UNSHARED_LIB_SUFFIX
 TCL_SHARED_LIB_SUFFIX
 TCL_LIB_VERSIONS_OK
-TCL_BUILD_LIB_SPEC
 LD_LIBRARY_PATH_VAR
 TCL_SHARED_BUILD
 CFG_TCL_UNSHARED_LIB_SUFFIX
 CFG_TCL_SHARED_LIB_SUFFIX
 TCL_SRC_DIR
-TCL_BUILD_STUB_LIB_PATH
-TCL_BUILD_STUB_LIB_SPEC
 TCL_INCLUDE_SPEC
+TCL_BUILD_KIT_LIB_PATH
+TCL_BUILD_KIT_LIB_SPEC
+TCL_KIT_LIB_PATH
+TCL_KIT_LIB_SPEC
+TCL_KIT_LIB_FLAG
 TCL_KIT_LIB_FILE
+TCL_BUILD_STUB_LIB_PATH
+TCL_BUILD_STUB_LIB_SPEC
 TCL_STUB_LIB_PATH
 TCL_STUB_LIB_SPEC
 TCL_STUB_LIB_FLAG
 TCL_STUB_LIB_FILE
+TCL_BUILD_LIB_SPEC
 TCL_LIB_SPEC
 TCL_LIB_FLAG
 TCL_LIB_FILE
@@ -10288,10 +10293,6 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
 
 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
 
-eval "TCL_KIT_LIB_FILE=libtclkit${UNSHARED_LIB_SUFFIX}"
-eval "TCL_KIT_LIB_FILE=${TCL_KIT_LIB_FILE}"
-
-
 TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
 PRIVATE_INCLUDE_DIR='$(includedir)'
 HTML_DIR='$(DISTDIR)/html'
@@ -10428,6 +10429,29 @@ fi
 
 #--------------------------------------------------------------------
 #       The statements below define various symbols relating to Tcl
+#       core vfs and kit support.
+#--------------------------------------------------------------------
+
+eval "TCL_KIT_LIB_FILE=libtclkit${UNSHARED_LIB_SUFFIX}"
+eval "TCL_KIT_LIB_FILE=${TCL_KIT_LIB_FILE}"
+
+eval "TCL_KIT_LIB_FILE=libtclkit${TCL_UNSHARED_LIB_SUFFIX}"
+eval "TCL_KIT_LIB_FILE=\"${TCL_KIT_LIB_FILE}\""
+eval "TCL_KIT_LIB_DIR=${libdir}"
+
+if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+    TCL_KIT_LIB_FLAG="-ltclkit${TCL_VERSION}"
+else
+    TCL_KIT_LIB_FLAG="-ltclkit`echo ${TCL_VERSION} | tr -d .`"
+fi
+
+TCL_BUILD_KIT_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_KIT_LIB_FLAG}"
+TCL_KIT_LIB_SPEC="-L${TCL_KIT_LIB_DIR} ${TCL_KIT_LIB_FLAG}"
+TCL_BUILD_KIT_LIB_PATH="`pwd`/${TCL_KIT_LIB_FILE}"
+TCL_KIT_LIB_PATH="${TCL_KIT_LIB_DIR}/${TCL_KIT_LIB_FILE}"
+
+#--------------------------------------------------------------------
+#       The statements below define various symbols relating to Tcl
 #       stub support.
 #--------------------------------------------------------------------
 
@@ -10519,6 +10543,14 @@ TCL_SHARED_BUILD=${SHARED_BUILD}

+
+
+
+
+
+
+
+
 ac_config_files="$ac_config_files Makefile:../unix/Makefile.in dltest/Makefile:../unix/dltest/Makefile.in tclConfig.sh:../unix/tclConfig.sh.in tcl.pc:../unix/tcl.pc.in"
 
 cat >confcache <<\_ACEOF
diff --git a/unix/configure.in b/unix/configure.in
index 7a15fb7..bc7bdef 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -793,10 +793,6 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
 
 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
 
-eval "TCL_KIT_LIB_FILE=libtclkit${UNSHARED_LIB_SUFFIX}"
-eval "TCL_KIT_LIB_FILE=${TCL_KIT_LIB_FILE}"
-
-
 TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
 PRIVATE_INCLUDE_DIR='$(includedir)'
 HTML_DIR='$(DISTDIR)/html'
@@ -897,6 +893,29 @@ fi
 
 #--------------------------------------------------------------------
 #       The statements below define various symbols relating to Tcl
+#       core vfs and kit support.
+#--------------------------------------------------------------------
+
+eval "TCL_KIT_LIB_FILE=libtclkit${UNSHARED_LIB_SUFFIX}"
+eval "TCL_KIT_LIB_FILE=${TCL_KIT_LIB_FILE}"
+
+eval "TCL_KIT_LIB_FILE=libtclkit${TCL_UNSHARED_LIB_SUFFIX}"
+eval "TCL_KIT_LIB_FILE=\"${TCL_KIT_LIB_FILE}\""
+eval "TCL_KIT_LIB_DIR=${libdir}"
+
+if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+    TCL_KIT_LIB_FLAG="-ltclkit${TCL_VERSION}"
+else
+    TCL_KIT_LIB_FLAG="-ltclkit`echo ${TCL_VERSION} | tr -d .`"
+fi
+
+TCL_BUILD_KIT_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_KIT_LIB_FLAG}"
+TCL_KIT_LIB_SPEC="-L${TCL_KIT_LIB_DIR} ${TCL_KIT_LIB_FLAG}"
+TCL_BUILD_KIT_LIB_PATH="`pwd`/${TCL_KIT_LIB_FILE}"
+TCL_KIT_LIB_PATH="${TCL_KIT_LIB_DIR}/${TCL_KIT_LIB_FILE}"
+
+#--------------------------------------------------------------------
+#       The statements below define various symbols relating to Tcl
 #       stub support.
 #--------------------------------------------------------------------
 
@@ -937,15 +956,24 @@ AC_SUBST(PKG_CFG_ARGS)
 AC_SUBST(TCL_LIB_FILE)
 AC_SUBST(TCL_LIB_FLAG)
 AC_SUBST(TCL_LIB_SPEC)
+AC_SUBST(TCL_BUILD_LIB_SPEC)
+
 AC_SUBST(TCL_STUB_LIB_FILE)
 AC_SUBST(TCL_STUB_LIB_FLAG)
 AC_SUBST(TCL_STUB_LIB_SPEC)
 AC_SUBST(TCL_STUB_LIB_PATH)
-AC_SUBST(TCL_KIT_LIB_FILE)
-AC_SUBST(TCL_INCLUDE_SPEC)
 AC_SUBST(TCL_BUILD_STUB_LIB_SPEC)
 AC_SUBST(TCL_BUILD_STUB_LIB_PATH)
 
+AC_SUBST(TCL_KIT_LIB_FILE)
+AC_SUBST(TCL_KIT_LIB_FLAG)
+AC_SUBST(TCL_KIT_LIB_SPEC)
+AC_SUBST(TCL_KIT_LIB_PATH)
+AC_SUBST(TCL_BUILD_KIT_LIB_SPEC)
+AC_SUBST(TCL_BUILD_KIT_LIB_PATH)
+
+AC_SUBST(TCL_INCLUDE_SPEC)
+
 AC_SUBST(TCL_SRC_DIR)
 AC_SUBST(CFG_TCL_SHARED_LIB_SUFFIX)
 AC_SUBST(CFG_TCL_UNSHARED_LIB_SUFFIX)
@@ -953,7 +981,6 @@ AC_SUBST(CFG_TCL_UNSHARED_LIB_SUFFIX)
 AC_SUBST(TCL_SHARED_BUILD)
 AC_SUBST(LD_LIBRARY_PATH_VAR)
 
-AC_SUBST(TCL_BUILD_LIB_SPEC)
 
 AC_SUBST(TCL_LIB_VERSIONS_OK)
 AC_SUBST(TCL_SHARED_LIB_SUFFIX)
diff --git a/unix/tclConfig.sh.in b/unix/tclConfig.sh.in
index b58e9fd..976bd7f 100644
--- a/unix/tclConfig.sh.in
+++ b/unix/tclConfig.sh.in
@@ -39,6 +39,9 @@ TCL_SHARED_BUILD=@TCL_SHARED_BUILD@
 # The name of the Tcl library (may be either a .a file or a shared library):
 TCL_LIB_FILE='@TCL_LIB_FILE@'
 
+# The name of the static Tcl library (intended for kits):
+TCL_KIT_LIB_FILE='@TCL_KIT_LIB_FILE@'
+
 # Additional libraries to use when linking Tcl.
 TCL_LIBS='@TCL_LIBS@'
 
@@ -142,6 +145,31 @@ TCL_SRC_DIR='@TCL_SRC_DIR@'
 # the "exec_prefix" directory, if it is different.
 TCL_PACKAGE_PATH='@TCL_PACKAGE_PATH@'
 
+# Core VFS Kit Support
+TCL_SUPPORT_KITS=1
+
+# The name of the Tcl kit library (.a):
+TCL_KIT_LIB_FILE='@TCL_KIT_LIB_FILE@'
+
+# -l flag to pass to the linker to pick up the Tcl kit library
+TCL_KIT_LIB_FLAG='@TCL_KIT_LIB_FLAG@'
+
+# String to pass to linker to pick up the Tcl kit library from its
+# build directory.
+TCL_BUILD_KIT_LIB_SPEC='@TCL_BUILD_KIT_LIB_SPEC@'
+
+# String to pass to linker to pick up the Tcl kit library from its
+# installed directory.
+TCL_KIT_LIB_SPEC='@TCL_KIT_LIB_SPEC@'
+
+# Path to the Tcl kit library in the build directory.
+TCL_BUILD_KIT_LIB_PATH='@TCL_BUILD_KIT_LIB_PATH@'
+
+# Path to the Tcl kit library in the install directory.
+TCL_KIT_LIB_PATH='@TCL_KIT_LIB_PATH@'
+
+# END VFS SUPPORT
+
 # Tcl supports stub.
 TCL_SUPPORTS_STUBS=1
 
-- 
cgit v0.12