Skip to content

Commit 538f317

Browse files
author
jan.nijtmans
committed
Re-generate "configure"
1 parent e66f1a2 commit 538f317

File tree

4 files changed

+75
-38
lines changed

4 files changed

+75
-38
lines changed

‎configure

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2541,7 +2541,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
25412541

25422542

25432543

2544-
25452544
#--------------------------------------------------------------------
25462545
# Call TEA_INIT as the first TEA_ macro to set up initial vars.
25472546
# This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
@@ -7180,11 +7179,15 @@ fi
71807179
CC_SEARCH_FLAGS=""
71817180
LD_SEARCH_FLAGS=""
71827181
;;
7183-
CYGWIN_*)
7182+
CYGWIN_*|MINGW32_*|MINGW64_*|MSYS_*)
71847183
SHLIB_CFLAGS=""
71857184
SHLIB_LD='${CC} -shared'
71867185
SHLIB_SUFFIX=".dll"
7187-
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
7186+
if test "${TEA_PLATFORM}" = "unix" -a "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
7187+
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$(patsubst cyg%.dll,lib%.dll.a,\$@)"
7188+
else
7189+
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
7190+
fi
71887191
EXEEXT=".exe"
71897192
do64bit_ok=yes
71907193
CC_SEARCH_FLAGS=""
@@ -9297,8 +9300,17 @@ rm -rf conftest*
92979300
# substituted. (@@@ Might not be necessary anymore)
92989301
#--------------------------------------------------------------------
92999302

9300-
PACKAGE_LIB_PREFIX8="${PACKAGE_LIB_PREFIX}"
9301-
PACKAGE_LIB_PREFIX9="${PACKAGE_LIB_PREFIX}tcl9"
9303+
if test "$TEA_PLATFORM" = "unix"; then
9304+
PACKAGE_LIB_PREFIX8="lib"
9305+
if test "$EXEEXT" = ".exe" -a "$SHARED_BUILD" != "0"; then
9306+
PACKAGE_LIB_PREFIX9="cygtcl9"
9307+
else
9308+
PACKAGE_LIB_PREFIX9="libtcl9"
9309+
fi
9310+
else
9311+
PACKAGE_LIB_PREFIX8=""
9312+
PACKAGE_LIB_PREFIX9="tcl9"
9313+
fi
93029314
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
93039315
PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX9}"
93049316
else
@@ -9353,20 +9365,20 @@ printf "%s\n" "#define TK_MAJOR_VERSION 8" >>confdefs.h
93539365
if test x"${TK_BIN_DIR}" != x ; then
93549366
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}"
93559367
fi
9356-
eval eval "PKG_LIB_FILE8=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9357-
eval eval "PKG_LIB_FILE9=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9358-
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9368+
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9369+
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9370+
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
93599371
RANLIB=:
93609372
else
9361-
eval eval "PKG_LIB_FILE8=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9362-
eval eval "PKG_LIB_FILE9=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9363-
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9373+
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9374+
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9375+
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
93649376
fi
93659377
# Some packages build their own stubs libraries
93669378
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
9367-
eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub.a"
9379+
eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub.a"
93689380
else
9369-
eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
9381+
eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
93709382
fi
93719383
fi
93729384

‎configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ dnl to configure the system for the local environment.
2020
#-----------------------------------------------------------------------
2121

2222
AC_INIT([itcl],[4.3.3])
23-
AC_PREREQ([2.69])
2423

2524
#--------------------------------------------------------------------
2625
# Call TEA_INIT as the first TEA_ macro to set up initial vars.

‎itclWidget/configure

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7827,11 +7827,15 @@ fi
78277827
CC_SEARCH_FLAGS=""
78287828
LD_SEARCH_FLAGS=""
78297829
;;
7830-
CYGWIN_*)
7830+
CYGWIN_*|MINGW32_*|MINGW64_*|MSYS_*)
78317831
SHLIB_CFLAGS=""
78327832
SHLIB_LD='${CC} -shared'
78337833
SHLIB_SUFFIX=".dll"
7834-
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
7834+
if test "${TEA_PLATFORM}" = "unix" -a "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
7835+
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$(patsubst cyg%.dll,lib%.dll.a,\$@)"
7836+
else
7837+
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
7838+
fi
78357839
EXEEXT=".exe"
78367840
do64bit_ok=yes
78377841
CC_SEARCH_FLAGS=""
@@ -9898,8 +9902,17 @@ rm -rf conftest*
98989902
# substituted. (@@@ Might not be necessary anymore)
98999903
#--------------------------------------------------------------------
99009904

9901-
PACKAGE_LIB_PREFIX8="${PACKAGE_LIB_PREFIX}"
9902-
PACKAGE_LIB_PREFIX9="${PACKAGE_LIB_PREFIX}tcl9"
9905+
if test "$TEA_PLATFORM" = "unix"; then
9906+
PACKAGE_LIB_PREFIX8="lib"
9907+
if test "$EXEEXT" = ".exe" -a "$SHARED_BUILD" != "0"; then
9908+
PACKAGE_LIB_PREFIX9="cygtcl9"
9909+
else
9910+
PACKAGE_LIB_PREFIX9="libtcl9"
9911+
fi
9912+
else
9913+
PACKAGE_LIB_PREFIX8=""
9914+
PACKAGE_LIB_PREFIX9="tcl9"
9915+
fi
99039916
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
99049917
PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX9}"
99059918
else
@@ -9954,20 +9967,20 @@ printf "%s\n" "#define TK_MAJOR_VERSION 8" >>confdefs.h
99549967
if test x"${TK_BIN_DIR}" != x ; then
99559968
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}"
99569969
fi
9957-
eval eval "PKG_LIB_FILE8=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9958-
eval eval "PKG_LIB_FILE9=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9959-
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9970+
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9971+
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9972+
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
99609973
RANLIB=:
99619974
else
9962-
eval eval "PKG_LIB_FILE8=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9963-
eval eval "PKG_LIB_FILE9=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9964-
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9975+
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9976+
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9977+
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
99659978
fi
99669979
# Some packages build their own stubs libraries
99679980
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
9968-
eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub.a"
9981+
eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub.a"
99699982
else
9970-
eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
9983+
eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
99719984
fi
99729985
fi
99739986

‎itclWidget/tclconfig/tcl.m4

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,11 +1380,15 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
13801380
CC_SEARCH_FLAGS=""
13811381
LD_SEARCH_FLAGS=""
13821382
;;
1383-
CYGWIN_*)
1383+
CYGWIN_*|MINGW32_*|MINGW64_*|MSYS_*)
13841384
SHLIB_CFLAGS=""
13851385
SHLIB_LD='${CC} -shared'
13861386
SHLIB_SUFFIX=".dll"
1387-
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$[@].a"
1387+
if test "${TEA_PLATFORM}" = "unix" -a "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
1388+
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$(patsubst cyg%.dll,lib%.dll.a,\$[@])"
1389+
else
1390+
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$[@].a"
1391+
fi
13881392
EXEEXT=".exe"
13891393
do64bit_ok=yes
13901394
CC_SEARCH_FLAGS=""
@@ -3204,8 +3208,17 @@ print("manifest needed")
32043208
# substituted. (@@@ Might not be necessary anymore)
32053209
#--------------------------------------------------------------------
32063210
3207-
PACKAGE_LIB_PREFIX8="${PACKAGE_LIB_PREFIX}"
3208-
PACKAGE_LIB_PREFIX9="${PACKAGE_LIB_PREFIX}tcl9"
3211+
if test "$TEA_PLATFORM" = "unix"; then
3212+
PACKAGE_LIB_PREFIX8="lib"
3213+
if test "$EXEEXT" = ".exe" -a "$SHARED_BUILD" != "0"; then
3214+
PACKAGE_LIB_PREFIX9="cygtcl9"
3215+
else
3216+
PACKAGE_LIB_PREFIX9="libtcl9"
3217+
fi
3218+
else
3219+
PACKAGE_LIB_PREFIX8=""
3220+
PACKAGE_LIB_PREFIX9="tcl9"
3221+
fi
32093222
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
32103223
PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX9}"
32113224
else
@@ -3256,20 +3269,20 @@ print("manifest needed")
32563269
if test x"${TK_BIN_DIR}" != x ; then
32573270
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}"
32583271
fi
3259-
eval eval "PKG_LIB_FILE8=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
3260-
eval eval "PKG_LIB_FILE9=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
3261-
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
3272+
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
3273+
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
3274+
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
32623275
RANLIB=:
32633276
else
3264-
eval eval "PKG_LIB_FILE8=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
3265-
eval eval "PKG_LIB_FILE9=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
3266-
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
3277+
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
3278+
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
3279+
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
32673280
fi
32683281
# Some packages build their own stubs libraries
32693282
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
3270-
eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub.a"
3283+
eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub.a"
32713284
else
3272-
eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
3285+
eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
32733286
fi
32743287
fi
32753288

0 commit comments

Comments
 (0)