From c3933b9e93612aa6ac6c1cbfa948e59e7eff6c19 Mon Sep 17 00:00:00 2001 From: William Joye Date: Fri, 13 Jan 2017 15:13:33 -0500 Subject: update TEA 3.10 --- unix/configure | 12 +++++----- unix/configure.ac | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ unix/configure.in | 69 ------------------------------------------------------- 3 files changed, 75 insertions(+), 75 deletions(-) create mode 100755 unix/configure.ac delete mode 100755 unix/configure.in diff --git a/unix/configure b/unix/configure index c1c3467..f767415 100755 --- a/unix/configure +++ b/unix/configure @@ -598,6 +598,7 @@ PKG_STUB_LIB_FILE PKG_LIB_FILE EXEEXT CYGPATH +TEA_TK_EXTENSION target_alias host_alias build_alias @@ -1692,13 +1693,12 @@ 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 as_fn_error $? " @@ -1716,6 +1716,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_*) @@ -1736,7 +1737,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 @@ -1761,9 +1762,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/unix/configure.ac b/unix/configure.ac new file mode 100755 index 0000000..c2978ef --- /dev/null +++ b/unix/configure.ac @@ -0,0 +1,69 @@ +#!/bin/bash -norc +dnl This file is an input file used by the GNU "autoconf" program to +dnl generate the file "configure", which is run during Tcl installation +dnl to configure the system for the local environment. + +#----------------------------------------------------------------------- +# Sample configure.in for Tcl Extensions. The only places you should +# need to modify this file are marked by the string __CHANGE__ +#----------------------------------------------------------------------- + +#----------------------------------------------------------------------- +# __CHANGE__ +# Set your package name and version numbers here. +# +# This initializes the environment with PACKAGE_NAME and PACKAGE_VERSION +# set as provided. These will also be added as -D defs in your Makefile +# so you can encode the package version directly into the source files. +# This will also define a special symbol for Windows (BUILD_ +# so that we create the export library with the dll. +#----------------------------------------------------------------------- + +AC_INIT([saods9], [7.6]) + +#-------------------------------------------------------------------- +# Call TEA_INIT as the first TEA_ macro to set up initial vars. +# This will define a ${TEA_PLATFORM} variable == "unix" or "windows" +# as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE. +#-------------------------------------------------------------------- + +TEA_INIT([3.9]) + +AC_CONFIG_AUX_DIR(../tclconfig) + +#-------------------------------------------------------------------- + +AC_ARG_WITH([arch],AC_HELP_STRING([--with-arch],[build name]),[],[with_arch=unknown]) + +OS="unix" +AC_SUBST(OS) + +ARCH=$with_arch +AC_SUBST(ARCH) + +prefix=$ac_pwd +exec_prefix=$ac_pwd + +TEA_CONFIG_SYSTEM + +case $system in + Darwin* ) + TKFLAGS="--disable-corefoundation" + AC_SUBST(TKFLAGS) + + CORES=`sysctl -n "hw.ncpu"` + ;; + CYGWIN* ) + CORES=`grep -c ^processor /proc/cpuinfo` + ;; + Linux* ) + CORES=`grep -c ^processor /proc/cpuinfo` + ;; + *) + CORES=1 + ;; +esac +AC_SUBST(CORES) + +AC_OUTPUT([Makefile]) + diff --git a/unix/configure.in b/unix/configure.in deleted file mode 100755 index c2978ef..0000000 --- a/unix/configure.in +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash -norc -dnl This file is an input file used by the GNU "autoconf" program to -dnl generate the file "configure", which is run during Tcl installation -dnl to configure the system for the local environment. - -#----------------------------------------------------------------------- -# Sample configure.in for Tcl Extensions. The only places you should -# need to modify this file are marked by the string __CHANGE__ -#----------------------------------------------------------------------- - -#----------------------------------------------------------------------- -# __CHANGE__ -# Set your package name and version numbers here. -# -# This initializes the environment with PACKAGE_NAME and PACKAGE_VERSION -# set as provided. These will also be added as -D defs in your Makefile -# so you can encode the package version directly into the source files. -# This will also define a special symbol for Windows (BUILD_ -# so that we create the export library with the dll. -#----------------------------------------------------------------------- - -AC_INIT([saods9], [7.6]) - -#-------------------------------------------------------------------- -# Call TEA_INIT as the first TEA_ macro to set up initial vars. -# This will define a ${TEA_PLATFORM} variable == "unix" or "windows" -# as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE. -#-------------------------------------------------------------------- - -TEA_INIT([3.9]) - -AC_CONFIG_AUX_DIR(../tclconfig) - -#-------------------------------------------------------------------- - -AC_ARG_WITH([arch],AC_HELP_STRING([--with-arch],[build name]),[],[with_arch=unknown]) - -OS="unix" -AC_SUBST(OS) - -ARCH=$with_arch -AC_SUBST(ARCH) - -prefix=$ac_pwd -exec_prefix=$ac_pwd - -TEA_CONFIG_SYSTEM - -case $system in - Darwin* ) - TKFLAGS="--disable-corefoundation" - AC_SUBST(TKFLAGS) - - CORES=`sysctl -n "hw.ncpu"` - ;; - CYGWIN* ) - CORES=`grep -c ^processor /proc/cpuinfo` - ;; - Linux* ) - CORES=`grep -c ^processor /proc/cpuinfo` - ;; - *) - CORES=1 - ;; -esac -AC_SUBST(CORES) - -AC_OUTPUT([Makefile]) - -- cgit v0.12