diff options
| author | mdejong <mdejong@noemail.net> | 2001-07-11 00:59:29 (GMT) |
|---|---|---|
| committer | mdejong <mdejong@noemail.net> | 2001-07-11 00:59:29 (GMT) |
| commit | 95c86507d7337013122a84679f1bd9c04a8224fb (patch) | |
| tree | d14aa693599b86c000b97beeae9f62468b807b23 /unix/configure.in | |
| parent | 909f22a2ea7d442953863eea608f2911549b3837 (diff) | |
| download | tcl-95c86507d7337013122a84679f1bd9c04a8224fb.zip tcl-95c86507d7337013122a84679f1bd9c04a8224fb.tar.gz tcl-95c86507d7337013122a84679f1bd9c04a8224fb.tar.bz2 | |
* unix/Makefile.in: Add AR variable for use in STLIB_LD.
* unix/configure: Regen.
* unix/configure.in: Use STLIB_LD when defining MAKE_LIB
and MAKE_STUB_LIB. Subst RANLIB and AR.
* unix/tcl.m4 (SC_CONFIG_CFLAGS): Add doc comment about
STLIB_LD command. Check ${AR} env var when setting
STLIB_LD and delay evaluation until make time.
* win/configure: Regen.
* win/tcl.m4 (SC_CONFIG_CFLAGS): Delay evaluation of
${AR} in STLIB_LD and add flags to better match the
Unix implementation. Don't bother defining AR when
using VC++ since it is not used.
FossilOrigin-Name: dbf361a1bd039c6d2acc243311e59ea5ca78142f
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/unix/configure.in b/unix/configure.in index af18853..1c1d6be 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. AC_INIT(../generic/tcl.h) -# RCS: @(#) $Id: configure.in,v 1.69 2001/06/26 20:28:43 mdejong Exp $ +# RCS: @(#) $Id: configure.in,v 1.70 2001/07/11 00:59:31 mdejong Exp $ TCL_VERSION=8.4 TCL_MAJOR_VERSION=8 @@ -382,7 +382,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != "" ; then TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}" eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}" if test "x$DL_OBJS" = "xtclLoadAout.o"; then - MAKE_LIB="ar cr \[$]@ \${OBJS}" + MAKE_LIB="\${STLIB_LD} \[$]@ \${OBJS}" else MAKE_LIB="\${SHLIB_LD} -o \[$]@ \${OBJS} ${SHLIB_LD_LIBS}" RANLIB=":" @@ -402,7 +402,7 @@ else TCL_SHLIB_CFLAGS="" TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}" eval "TCL_LIB_FILE=libtcl${TCL_UNSHARED_LIB_SUFFIX}" - MAKE_LIB="ar cr \[$]@ \${OBJS}" + MAKE_LIB="\${STLIB_LD} \[$]@ \${OBJS}" fi # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed @@ -469,7 +469,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}" # Replace DBGX with TCL_DBGX eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" -MAKE_STUB_LIB="ar cr \[$]@ \${STUB_LIB_OBJS}" +MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \${STUB_LIB_OBJS}" if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}" @@ -510,6 +510,8 @@ AC_SUBST(LDFLAGS_DEFAULT) # FIXME: Should this be TCL_LDFLAGS_DEBUG ? AC_SUBST(LDFLAGS_DEBUG) AC_SUBST(LDFLAGS_OPTIMIZE) +AC_SUBST(AR) +AC_SUBST(RANLIB) AC_SUBST(MAKE_LIB) AC_SUBST(TCL_SHARED_BUILD) AC_SUBST(SHLIB_CFLAGS) |