diff options
Diffstat (limited to 'win/configure.in')
| -rw-r--r-- | win/configure.in | 92 |
1 files changed, 51 insertions, 41 deletions
diff --git a/win/configure.in b/win/configure.in index f7b0f33..bb29f41 100644 --- a/win/configure.in +++ b/win/configure.in @@ -4,12 +4,17 @@ # to configure the system for the local environment. AC_INIT(../generic/tk.h) -AC_PREREQ(2.13) +AC_PREREQ(2.59) -TK_VERSION=8.4 +# The following define is needed when building with Cygwin since newer +# versions of autoconf incorrectly set SHELL to /bin/bash instead of +# /bin/sh. The bash shell seems to suffer from some strange failures. +SHELL=/bin/sh + +TK_VERSION=8.5 TK_MAJOR_VERSION=8 -TK_MINOR_VERSION=4 -TK_PATCH_LEVEL=".19" +TK_MINOR_VERSION=5 +TK_PATCH_LEVEL=".10" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ @@ -36,35 +41,15 @@ if test "${CFLAGS+set}" != "set" ; then fi AC_PROG_CC +AC_C_INLINE +AC_HEADER_STDC -# To properly support cross-compilation, one would -# need to use these tool checks instead of -# the ones below and reconfigure with -# autoconf 2.50. You can also just set -# the CC, AR, RANLIB, and RC environment -# variables if you want to cross compile. -#AC_CHECK_TOOL(AR, ar) -#AC_CHECK_TOOL(RANLIB, ranlib) -#AC_CHECK_TOOL(RC, windres) - -if test "${GCC}" = "yes" ; then - AC_CHECK_PROG(AR, ar, ar) - AC_CHECK_PROG(RANLIB, ranlib, ranlib) - AC_CHECK_PROG(RC, windres, windres) - - if test "${AR}" = "" ; then - AC_MSG_ERROR([Required archive tool 'ar' not found on PATH.]) - fi - if test "${RANLIB}" = "" ; then - AC_MSG_ERROR([Required archive index tool 'ranlib' not found on PATH.]) - fi - if test "${RC}" = "" ; then - AC_MSG_ERROR([Required resource tool 'windres' not found on PATH.]) - fi -fi +AC_CHECK_TOOL(AR, ar) +AC_CHECK_TOOL(RANLIB, ranlib) +AC_CHECK_TOOL(RC, windres) #-------------------------------------------------------------------- -# Checks to see if the make progeam sets the $MAKE variable. +# Checks to see if the make program sets the $MAKE variable. #-------------------------------------------------------------------- AC_PROG_MAKE_SET @@ -73,7 +58,27 @@ AC_PROG_MAKE_SET # Perform additinal compiler tests. #-------------------------------------------------------------------- -AC_CYGWIN +dnl Currently AC_CYGWIN is disabled since it invokes AC_CANONICAL_HOST +dnl under autoconf 2.5X. +dnl +dnl AC_CYGWIN + +AC_CACHE_CHECK(for Cygwin version of gcc, + ac_cv_cygwin, +AC_TRY_COMPILE([ +#ifdef __CYGWIN__ +#error cygwin +#endif +], +[], + ac_cv_cygwin=no, + ac_cv_cygwin=yes) +) +if test "$ac_cv_cygwin" = "yes" ; then + AC_MSG_ERROR([Compiling under Cygwin is not currently supported. +A maintainer for the Cygwin port of Tcl/Tk is needed. See the README +file for information about building with Mingw.]) +fi #-------------------------------------------------------------------- # Determines the correct binary file extension (.o, .obj, .exe etc.) @@ -111,7 +116,15 @@ AC_CHECK_HEADER(errno.h, , MAN2TCLFLAGS="-DNO_ERRNO_H") AC_SUBST(MAN2TCLFLAGS) #-------------------------------------------------------------------- -# Set the default compiler switches based on the --enable-symbols +# Windows XP theme engine header for Ttk +#-------------------------------------------------------------------- + +AC_CHECK_HEADER([uxtheme.h], [AC_DEFINE(HAVE_UXTHEME_H)], + [AC_MSG_NOTICE([xpnative theme will be unavailable])], + [#include <windows.h>]) + +#-------------------------------------------------------------------- +# Set the default compiler switches based on the --enable-symbols # option. This macro depends on C flags, and should be called # after SC_CONFIG_CFLAGS macro is called. #-------------------------------------------------------------------- @@ -201,12 +214,14 @@ else fi # The wish.exe.manifest requires these -# TK_WIN_VERSION is the 4 dotted pair Windows version format +# TK_WIN_VERSION is the 4 dotted pair Windows version format which needs +# the release level, and must account for interim release versioning case "$TK_PATCH_LEVEL" in - a*) TK_WIN_VERSION="$TK_VERSION.0.`echo $TK_PATCH_LEVEL | tr -d a`" ;; - b*) TK_WIN_VERSION="$TK_VERSION.1.`echo $TK_PATCH_LEVEL | tr -d b`" ;; - .*) TK_WIN_VERSION="$TK_VERSION.2$TK_PATCH_LEVEL" ;; + *a*) TK_RELEASE_LEVEL=0 ;; + *b*) TK_RELEASE_LEVEL=1 ;; + *) TK_RELEASE_LEVEL=2 ;; esac +TK_WIN_VERSION="$TK_VERSION.$TK_RELEASE_LEVEL.`echo $TK_PATCH_LEVEL | tr -d ab.`" AC_SUBST(TK_WIN_VERSION) # X86|AMD64|IA64 for manifest AC_SUBST(MACHINE) @@ -228,11 +243,6 @@ AC_SUBST(TCL_VERSION) AC_SUBST(TCL_MAJOR_VERSION) AC_SUBST(TCL_MINOR_VERSION) AC_SUBST(TCL_PATCH_LEVEL) -AC_SUBST(TCL_LIB_FILE) -AC_SUBST(TCL_DLL_FILE) -AC_SUBST(TCL_STUB_LIB_FILE) -AC_SUBST(TCL_STUB_LIB_FLAG) -AC_SUBST(TCL_BUILD_STUB_LIB_SPEC) AC_SUBST(TCL_SRC_DIR) AC_SUBST(TCL_BIN_DIR) AC_SUBST(TCL_DBGX) |