summaryrefslogtreecommitdiffstats
path: root/unix/tcl.m4
diff options
context:
space:
mode:
authormdejong <mdejong>2001-07-11 01:36:41 (GMT)
committermdejong <mdejong>2001-07-11 01:36:41 (GMT)
commit29effb59e09d1f7eab3016936a53e909d40aed16 (patch)
tree5275368aa5647aa876cac8e7da4e830b8196416b /unix/tcl.m4
parent79b281a385aa3099927b9f15abf490b30789089c (diff)
downloadtk-29effb59e09d1f7eab3016936a53e909d40aed16.zip
tk-29effb59e09d1f7eab3016936a53e909d40aed16.tar.gz
tk-29effb59e09d1f7eab3016936a53e909d40aed16.tar.bz2
* unix/Makefile.in: Add AR and STLIB_LD variables.
* unix/configure: * unix/configure.in: Use STLIB_LD when defining MAKE_LIB and MAKE_STUB_LIB. Subst STLIB_LD, RANLIB, and AR. * unix/tcl.m4: Update from Tcl. * win/configure: Regen. * win/tcl.m4: Update from Tcl.
Diffstat (limited to 'unix/tcl.m4')
-rw-r--r--unix/tcl.m47
1 files changed, 6 insertions, 1 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index fab607f..2e2d6f8 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -450,6 +450,8 @@ AC_DEFUN(SC_ENABLE_SYMBOLS, [
# MAKE_LIB - Command to execute to build the Tcl library;
# differs depending on whether or not Tcl is being
# compiled as a shared library.
+# STLIB_LD - Base command to use for combining object files
+# into a static library.
# SHLIB_CFLAGS - Flags to pass to cc when compiling the components
# of a shared library (may request position-independent
# code, among other things).
@@ -592,7 +594,10 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
TCL_NEEDS_EXP_FILE=0
TCL_BUILD_EXP_FILE=""
TCL_EXP_FILE=""
- STLIB_LD="ar cr"
+dnl FIXME: Replace AC_CHECK_PROG with AC_CHECK_TOOL once cross compiling is fixed.
+dnl AC_CHECK_TOOL(AR, ar, :)
+ AC_CHECK_PROG(AR, ar, ar)
+ STLIB_LD='${AR} cr'
case $system in
AIX-5.*)
if test "${TCL_THREADS}" = "1" -a "$using_gcc" = "no" ; then