diff options
| author | mdejong <mdejong> | 2001-07-11 00:59:30 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2001-07-11 00:59:30 (GMT) |
| commit | ca72133fb3d2bc04fc3174d379f1158b13c1ea10 (patch) | |
| tree | d14aa693599b86c000b97beeae9f62468b807b23 /win/tcl.m4 | |
| parent | dc3fdc08d25b618303a0bd1adef6823a2b3231cb (diff) | |
| download | tcl-ca72133fb3d2bc04fc3174d379f1158b13c1ea10.zip tcl-ca72133fb3d2bc04fc3174d379f1158b13c1ea10.tar.gz tcl-ca72133fb3d2bc04fc3174d379f1158b13c1ea10.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.
Diffstat (limited to 'win/tcl.m4')
| -rw-r--r-- | win/tcl.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -298,6 +298,7 @@ AC_DEFUN(SC_ENABLE_SYMBOLS, [ # CC_OBJNAME # CC_EXENAME # CYGPATH +# STLIB_LD # SHLIB_LD # SHLIB_LD_LIBS # LIBS @@ -348,13 +349,13 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ SHLIB_LD_LIBS="" LIBS="" LIBS_GUI="-lgdi32 -lcomdlg32 -limm32" - STLIB_LD="${AR}" + STLIB_LD='${AR} cr' RC_OUT=-o RC_TYPE= RC_INCLUDE=--include RC_DEFINE=--define RES=res.o - MAKE_LIB="\${AR} cr \[$]@" + MAKE_LIB="\${STLIB_LD} \[$]@" POST_MAKE_LIB="\${RANLIB} \[$]@" MAKE_EXE="\${CC} -o \[$]@" LIBPREFIX="lib" @@ -429,7 +430,6 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ SHLIB_LD_LIBS="user32.lib advapi32.lib" LIBS="user32.lib advapi32.lib" LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib" - AR="lib -nologo" STLIB_LD="lib -nologo" RC="rc" RC_OUT=-fo @@ -437,7 +437,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ RC_INCLUDE=-i RC_DEFINE=-d RES=res - MAKE_LIB="\${AR} -out:\[$]@" + MAKE_LIB="\${STLIB_LD} -out:\[$]@" POST_MAKE_LIB= MAKE_EXE="\${CC} -Fe\[$]@" LIBPREFIX="" |