summaryrefslogtreecommitdiffstats
path: root/win
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 /win
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 'win')
-rwxr-xr-xwin/configure35
-rw-r--r--win/tcl.m48
2 files changed, 21 insertions, 22 deletions
diff --git a/win/configure b/win/configure
index 70e7ead..d576386 100755
--- a/win/configure
+++ b/win/configure
@@ -1185,13 +1185,13 @@ echo "configure:1180: checking compiler flags" >&5
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"
@@ -1266,7 +1266,6 @@ echo "configure:1180: checking compiler flags" >&5
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
@@ -1274,7 +1273,7 @@ echo "configure:1180: checking compiler flags" >&5
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=""
@@ -1328,7 +1327,7 @@ echo "configure:1180: checking compiler flags" >&5
#--------------------------------------------------------------------
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1332: checking how to run the C preprocessor" >&5
+echo "configure:1331: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1343,13 +1342,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1347 "configure"
+#line 1346 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1360,13 +1359,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1364 "configure"
+#line 1363 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1377,13 +1376,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1381 "configure"
+#line 1380 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1409,17 +1408,17 @@ echo "$ac_t""$CPP" 1>&6
ac_safe=`echo "errno.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for errno.h""... $ac_c" 1>&6
-echo "configure:1413: checking for errno.h" >&5
+echo "configure:1412: checking for errno.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1418 "configure"
+#line 1417 "configure"
#include "confdefs.h"
#include <errno.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1451,7 +1450,7 @@ fi
echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
-echo "configure:1455: checking for build with symbols" >&5
+echo "configure:1454: checking for build with symbols" >&5
# Check whether --enable-symbols or --disable-symbols was given.
if test "${enable_symbols+set}" = set; then
enableval="$enable_symbols"
@@ -1482,7 +1481,7 @@ TK_DBGX=${DBGX}
echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6
-echo "configure:1486: checking the location of tclConfig.sh" >&5
+echo "configure:1485: checking the location of tclConfig.sh" >&5
if test -d ../../tcl8.4$TK_PATCH_LEVEL/win; then
TCL_BIN_DIR_DEFAULT=../../tcl8.4$TK_PATCH_LEVEL/win
@@ -1508,7 +1507,7 @@ fi
echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6
-echo "configure:1512: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
+echo "configure:1511: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then
echo "$ac_t""loading" 1>&6
@@ -1530,7 +1529,7 @@ echo "configure:1512: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
echo $ac_n "checking for tclsh""... $ac_c" 1>&6
-echo "configure:1534: checking for tclsh" >&5
+echo "configure:1533: checking for tclsh" >&5
if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
diff --git a/win/tcl.m4 b/win/tcl.m4
index add1a55..e6109a2 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -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=""