Skip to content

Commit 1370560

Browse files
author
jan.nijtmans
committed
When compiling for Tcl8, we automatically compile for Tk8 (when appropriate) as well
1 parent fe343d0 commit 1370560

File tree

3 files changed

+0
-19
lines changed

3 files changed

+0
-19
lines changed

configure

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9318,8 +9318,6 @@ rm -rf conftest*
93189318

93199319
printf "%s\n" "#define TCL_MAJOR_VERSION 8" >>confdefs.h
93209320

9321-
fi
9322-
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tk8}" != x; then
93239321

93249322
printf "%s\n" "#define TK_MAJOR_VERSION 8" >>confdefs.h
93259323

itclWidget/configure

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,6 @@ enable_option_checking
782782
with_tcl
783783
with_tcl8
784784
with_tk
785-
with_tk8
786785
with_itcl
787786
with_tclinclude
788787
with_tkinclude
@@ -1438,7 +1437,6 @@ Optional Packages:
14381437
(tclConfig.sh)
14391438
--with-tcl8 Compile for Tcl8 in Tcl9 environment
14401439
--with-tk directory containing tk configuration (tkConfig.sh)
1441-
--with-tk8 Compile for Tk8 in Tk9 environment
14421440
--with-itcl directory containing itcl configuration (itclConfig.sh)
14431441
--with-tclinclude directory containing the public Tcl header files
14441442
--with-tkinclude directory containing the public Tk header files
@@ -4078,13 +4076,6 @@ then :
40784076
withval=$with_tk; with_tkconfig="${withval}"
40794077
fi
40804078

4081-
4082-
# Check whether --with-tk8 was given.
4083-
if test ${with_tk8+y}
4084-
then :
4085-
withval=$with_tk8; with_tk8="${withval}"
4086-
fi
4087-
40884079
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Tk configuration" >&5
40894080
printf %s "checking for Tk configuration... " >&6; }
40904081
if test ${ac_cv_c_tkconfig+y}
@@ -9920,8 +9911,6 @@ rm -rf conftest*
99209911

99219912
printf "%s\n" "#define TCL_MAJOR_VERSION 8" >>confdefs.h
99229913

9923-
fi
9924-
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tk8}" != x; then
99259914

99269915
printf "%s\n" "#define TK_MAJOR_VERSION 8" >>confdefs.h
99279916

itclWidget/tclconfig/tcl.m4

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,6 @@ AC_DEFUN([TEA_PATH_TKCONFIG], [
225225
AS_HELP_STRING([--with-tk],
226226
[directory containing tk configuration (tkConfig.sh)]),
227227
[with_tkconfig="${withval}"])
228-
AC_ARG_WITH(tk8,
229-
AS_HELP_STRING([--with-tk8],
230-
[Compile for Tk8 in Tk9 environment]),
231-
[with_tk8="${withval}"])
232228
AC_MSG_CHECKING([for Tk configuration])
233229
AC_CACHE_VAL(ac_cv_c_tkconfig,[
234230
@@ -3224,8 +3220,6 @@ print("manifest needed")
32243220
else
32253221
PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX8}"
32263222
AC_DEFINE(TCL_MAJOR_VERSION, 8, [Compile for Tcl8?])
3227-
fi
3228-
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tk8}" != x; then
32293223
AC_DEFINE(TK_MAJOR_VERSION, 8, [Compile for Tk8?])
32303224
fi
32313225
if test "${TEA_PLATFORM}" = "windows" ; then

0 commit comments

Comments
 (0)