diff options
| author | mdejong <mdejong> | 2001-07-11 01:36:41 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2001-07-11 01:36:41 (GMT) |
| commit | 29effb59e09d1f7eab3016936a53e909d40aed16 (patch) | |
| tree | 5275368aa5647aa876cac8e7da4e830b8196416b /win/tcl.m4 | |
| parent | 79b281a385aa3099927b9f15abf490b30789089c (diff) | |
| download | tk-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 '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="" |