summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2003-04-03 02:24:11 (GMT)
committermdejong <mdejong>2003-04-03 02:24:11 (GMT)
commit18f17ff4b787b7183764a21bc157390857b95d5f (patch)
tree63e94423a024dd237a38554c56a2b4ccf82b0cc3
parent18d98caf85ba0de87a91682af5678f6bd580a778 (diff)
downloadtcl-18f17ff4b787b7183764a21bc157390857b95d5f.zip
tcl-18f17ff4b787b7183764a21bc157390857b95d5f.tar.gz
tcl-18f17ff4b787b7183764a21bc157390857b95d5f.tar.bz2
* win/configure: Regen.
* win/configure.in: Set stub lib flag based on new LIBFLAGSUFFIX variable. * win/tcl.m4 (SC_CONFIG_CFLAGS): Set new LIBFLAGSUFFIX that works like LIBSUFFIX, it is used when creating library names. The previous implementation would generate -ltclstub85 instead of -ltclstub85s when configured with --disable-shared.
-rw-r--r--ChangeLog12
-rwxr-xr-xwin/configure6
-rw-r--r--win/configure.in4
-rw-r--r--win/tcl.m44
4 files changed, 23 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f9bc2b4..375ed6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-04-02 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * win/configure: Regen.
+ * win/configure.in: Set stub lib flag based
+ on new LIBFLAGSUFFIX variable.
+ * win/tcl.m4 (SC_CONFIG_CFLAGS): Set new
+ LIBFLAGSUFFIX that works like LIBSUFFIX,
+ it is used when creating library names.
+ The previous implementation would generate
+ -ltclstub85 instead of -ltclstub85s when
+ configured with --disable-shared.
+
2003-04-02 Don Porter <dgp@users.sourceforge.net>
* generic/tclParse.c (TclSubstTokens): Moved declaration of
diff --git a/win/configure b/win/configure
index d6f0246..031e866 100755
--- a/win/configure
+++ b/win/configure
@@ -3037,6 +3037,7 @@ echo "${ECHO_T}using static flags" >&6
runtime=
MAKE_DLL="echo "
LIBSUFFIX="s\${DBGX}.a"
+ LIBFLAGSUFFIX="s\${DBGX}"
LIBRARIES="\${STATIC_LIBRARIES}"
EXESUFFIX="s\${DBGX}.exe"
else
@@ -3064,6 +3065,7 @@ echo "$as_me: error: ${CC} does not support the -shared option.
-Wl,--out-implib,\$(patsubst %.dll,lib%.a,\$@)"
LIBSUFFIX="\${DBGX}.a"
+ LIBFLAGSUFFIX="\${DBGX}"
EXESUFFIX="\${DBGX}.exe"
LIBRARIES="\${SHARED_LIBRARIES}"
fi
@@ -3108,6 +3110,7 @@ echo "${ECHO_T}using static flags" >&6
runtime=-MT
MAKE_DLL="echo "
LIBSUFFIX="s\${DBGX}.lib"
+ LIBFLAGSUFFIX="s\${DBGX}"
LIBRARIES="\${STATIC_LIBRARIES}"
EXESUFFIX="s\${DBGX}.exe"
SHLIB_LD_LIBS=""
@@ -3119,6 +3122,7 @@ echo "${ECHO_T}using shared flags" >&6
# Add SHLIB_LD_LIBS to the Make rule, not here.
MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\$@"
LIBSUFFIX="\${DBGX}.lib"
+ LIBFLAGSUFFIX="\${DBGX}"
EXESUFFIX="\${DBGX}.exe"
LIBRARIES="\${SHARED_LIBRARIES}"
SHLIB_LD_LIBS='${LIBS}'
@@ -3906,7 +3910,7 @@ eval "TCL_LIB_FILE=${LIBPREFIX}tcl$VER${LIBSUFFIX}"
#TCL_LIB_SPEC
eval "TCL_STUB_LIB_FILE=\"${LIBPREFIX}tclstub${VER}${LIBSUFFIX}\""
-eval "TCL_STUB_LIB_FLAG=\"-ltclstub${VER}${TCL_DBGX}\""
+eval "TCL_STUB_LIB_FLAG=\"-ltclstub${VER}${LIBFLAGSUFFIX}\""
eval "TCL_BUILD_STUB_LIB_SPEC=\"-L`pwd` ${TCL_STUB_LIB_FLAG}\""
eval "TCL_STUB_LIB_SPEC=\"-L${libdir} ${TCL_STUB_LIB_FLAG}\""
eval "TCL_BUILD_STUB_LIB_PATH=\"`pwd`/${TCL_STUB_LIB_FILE}\""
diff --git a/win/configure.in b/win/configure.in
index 5678f37..c88ba3d 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
# generate the file "configure", which is run during Tcl installation
# to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.71 2003/03/19 03:09:43 mdejong Exp $
+# RCS: @(#) $Id: configure.in,v 1.72 2003/04/03 02:24:12 mdejong Exp $
AC_INIT(../generic/tcl.h)
AC_PREREQ(2.57)
@@ -329,7 +329,7 @@ eval "TCL_LIB_FILE=${LIBPREFIX}tcl$VER${LIBSUFFIX}"
#TCL_LIB_SPEC
eval "TCL_STUB_LIB_FILE=\"${LIBPREFIX}tclstub${VER}${LIBSUFFIX}\""
-eval "TCL_STUB_LIB_FLAG=\"-ltclstub${VER}${TCL_DBGX}\""
+eval "TCL_STUB_LIB_FLAG=\"-ltclstub${VER}${LIBFLAGSUFFIX}\""
eval "TCL_BUILD_STUB_LIB_SPEC=\"-L`pwd` ${TCL_STUB_LIB_FLAG}\""
eval "TCL_STUB_LIB_SPEC=\"-L${libdir} ${TCL_STUB_LIB_FLAG}\""
eval "TCL_BUILD_STUB_LIB_PATH=\"`pwd`/${TCL_STUB_LIB_FILE}\""
diff --git a/win/tcl.m4 b/win/tcl.m4
index 3bc07ef..4a2037b 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -477,6 +477,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
runtime=
MAKE_DLL="echo "
LIBSUFFIX="s\${DBGX}.a"
+ LIBFLAGSUFFIX="s\${DBGX}"
LIBRARIES="\${STATIC_LIBRARIES}"
EXESUFFIX="s\${DBGX}.exe"
else
@@ -500,6 +501,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
-Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[$]@)"
LIBSUFFIX="\${DBGX}.a"
+ LIBFLAGSUFFIX="\${DBGX}"
EXESUFFIX="\${DBGX}.exe"
LIBRARIES="\${SHARED_LIBRARIES}"
fi
@@ -543,6 +545,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
runtime=-MT
MAKE_DLL="echo "
LIBSUFFIX="s\${DBGX}.lib"
+ LIBFLAGSUFFIX="s\${DBGX}"
LIBRARIES="\${STATIC_LIBRARIES}"
EXESUFFIX="s\${DBGX}.exe"
SHLIB_LD_LIBS=""
@@ -553,6 +556,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
# Add SHLIB_LD_LIBS to the Make rule, not here.
MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\[$]@"
LIBSUFFIX="\${DBGX}.lib"
+ LIBFLAGSUFFIX="\${DBGX}"
EXESUFFIX="\${DBGX}.exe"
LIBRARIES="\${SHARED_LIBRARIES}"
SHLIB_LD_LIBS='${LIBS}'