diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-01-13 20:20:17 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-01-13 20:20:17 (GMT) |
| commit | f9800195f3ed5aacd92e659bf470379345711b8d (patch) | |
| tree | 7294e31feb4f7212409225a4bc16c1d0bdb3b708 | |
| parent | 22e70af222567275ea290368cb6c7ecdc20d66af (diff) | |
| download | blt-f9800195f3ed5aacd92e659bf470379345711b8d.zip blt-f9800195f3ed5aacd92e659bf470379345711b8d.tar.gz blt-f9800195f3ed5aacd92e659bf470379345711b8d.tar.bz2 | |
update TEA 3.10
| -rwxr-xr-x | win/configure | 20 | ||||
| -rwxr-xr-x | win/configure.ac (renamed from win/configure.in) | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/win/configure b/win/configure index c63e8a4..b27cd13 100755 --- a/win/configure +++ b/win/configure @@ -597,6 +597,7 @@ PKG_STUB_LIB_FILE PKG_LIB_FILE EXEEXT CYGPATH +TEA_TK_EXTENSION target_alias host_alias build_alias @@ -1691,20 +1692,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # TEA extensions pass this us the version of TEA they think they # are compatible with. - TEA_VERSION="3.9" - + TEA_VERSION="3.10" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct TEA configuration" >&5 $as_echo_n "checking for correct TEA configuration... " >&6; } if test x"${PACKAGE_NAME}" = x ; then as_fn_error $? " -The PACKAGE_NAME variable must be defined by your TEA configure.in" "$LINENO" 5 +The PACKAGE_NAME variable must be defined by your TEA configure.ac" "$LINENO" 5 fi - if test x"3.9" = x ; then + if test x"3.10" = x ; then as_fn_error $? " TEA version not specified." "$LINENO" 5 - elif test "3.9" != "${TEA_VERSION}" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: warning: requested TEA version \"3.9\", have \"${TEA_VERSION}\"" >&5 -$as_echo "warning: requested TEA version \"3.9\", have \"${TEA_VERSION}\"" >&6; } + elif test "3.10" != "${TEA_VERSION}" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: warning: requested TEA version \"3.10\", have \"${TEA_VERSION}\"" >&5 +$as_echo "warning: requested TEA version \"3.10\", have \"${TEA_VERSION}\"" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5 $as_echo "ok (TEA ${TEA_VERSION})" >&6; } @@ -1715,6 +1715,7 @@ $as_echo "ok (TEA ${TEA_VERSION})" >&6; } if test "${CFLAGS+set}" != "set" ; then CFLAGS="" fi + TEA_TK_EXTENSION=0 case "`uname -s`" in *win32*|*WIN32*|*MINGW32_*) @@ -1735,7 +1736,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CYGPATH="cygpath -w" + ac_cv_prog_CYGPATH="cygpath -m" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -1760,9 +1761,8 @@ fi TEA_PLATFORM="windows" ;; *CYGWIN_*) - CYGPATH=echo EXEEXT=".exe" - # TEA_PLATFORM is determined later in LOAD_TCLCONFIG + # CYGPATH and TEA_PLATFORM are determined later in LOAD_TCLCONFIG ;; *) CYGPATH=echo diff --git a/win/configure.in b/win/configure.ac index c5bb45f..b50272a 100755 --- a/win/configure.in +++ b/win/configure.ac @@ -27,7 +27,7 @@ AC_INIT([saods9], [7.6]) # as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE. #-------------------------------------------------------------------- -TEA_INIT([3.9]) +TEA_INIT([3.10]) AC_CONFIG_AUX_DIR(../tclconfig) |