TEA (tclconfig) Source Code: Changes On Branch practcl

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch practcl Excluding Merge-Ins

This is equivalent to a diff from a413acb98d to 832915fb01

2019-09-09
13:17		Closing fork Leaf check-in: 832915fb01 user: hypnotoad tags: practcl
13:11		Update Practcl.tcl to the latest Workaround in tclZipFs for an internal API change in the Tcl Core post 8.6.9 check-in: 79972997da user: hypnotoad tags: practcl
2019-07-25
21:48		Updated Practcl from clay check-in: 9904f168a6 user: hypnotoad tags: practcl
2018-10-16
21:12		Backout [a413acb98d], since with this change at least tclsqlite doesn't build any more check-in: 094d08a80a user: jan.nijtmans tags: trunk
2018-09-24
14:16		Pulling changes from TEA check-in: 72a7e44a99 user: hypnotoad tags: practcl
2018-08-13
08:22		remove strings that break CFLAGS at configure time check-in: a413acb98d user: pooryorick tags: trunk
2018-06-20
07:17		Undo TEA_PATH_CONFIG changes regarding addtional paths until it's more clear where OpenBSD/FreeBSD stores it's 'official' itclConfig.sh/tdbcConfig.sh. Fix [923f400aa03a5608]: New paths required for Darwin Stu adds: This has nothing to do with where any one os stores itcl/itkConfig.sh. It shouldn't matter to tclconfig where any anything stores anything, should it? This is supposed to be a generic routine, used to pick up the Config.sh of any extension. There is no "common store" for Config.sh files on any platform, afaict. Extensions currently keep their *Config.sh files in their own dirs. I believe this to be the case currently for all extensions and platforms. Perhaps changing this convention is a good idea. The way things are currently, adding dirs for itcl would then mean adding dirs fors tdbc, tdom, etc.? I don't see that as being viable in the long-term. check-in: df3b672e10 user: jan.nijtmans tags: trunk

Added compat/tclZipfs.c.

Added config.tcl.in.

Added practcl.tcl.

Changes to tcl.m4.

1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30	+ + + + +	# tcl.m4 -- # # This file provides a set of autoconf macros to help TEA-enable # a Tcl extension. # # Copyright (c) 1999-2000 Ajuba Solutions. # Copyright (c) 2002-2005 ActiveState Corporation. # Copyright (c) 2012-2018 Sean Woods. # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. AC_PREREQ(2.57) # Possible values for key variables defined: # # TEA_WINDOWINGSYSTEM - win32 aqua x11 (mirrors 'tk windowingsystem') # PRACTCL_WINDOWINGSYSTEM - windows cocoa hitheme x11 sdl # TEA_PLATFORM - windows unix # TEA_TK_EXTENSION - True if this is a Tk extension # TEACUP_OS - windows macosx linux generic # TEACUP_TOOLSET - Toolset in use (gcc,mingw,msvc,llvm) # TEACUP_PROFILE - win32 # #------------------------------------------------------------------------ # TEA_PATH_TCLCONFIG -- # # Locate the tclConfig.sh file and perform a sanity check on # the Tcl compile flags
︙
208 209 210 211 212 213 214 215 216 217 218 219 220 221	213 214 215 216 217 218 219 220 221 222 223 224 225 226 227	+	# First, look for one uninstalled. # the alternative search directory is invoked by --with-tk # if test x"${no_tk}" = x ; then # we reset no_tk in case something fails here no_tk=true TEA_TK_EXTENSION=0 AC_ARG_WITH(tk, AC_HELP_STRING([--with-tk], [directory containing tk configuration (tkConfig.sh)]), with_tkconfig="${withval}") AC_MSG_CHECKING([for Tk configuration]) AC_CACHE_VAL(ac_cv_c_tkconfig,[
︙
337 338 339 340 341 342 343 344 345 346 347 348 349 350	343 344 345 346 347 348 349 350 351 352 353 354 355 356 357	+	]) if test x"${ac_cv_c_tkconfig}" = x ; then TK_BIN_DIR="# no Tk configs found" AC_MSG_ERROR([Can't find Tk configuration definitions. Use --with-tk to specify a directory containing tkConfig.sh]) else no_tk= TEA_TK_EXTENSION=1 TK_BIN_DIR="${ac_cv_c_tkconfig}" AC_MSG_RESULT([found ${TK_BIN_DIR}/tkConfig.sh]) fi fi ]) #------------------------------------------------------------------------
︙
534 535 536 537 538 539 540 ~~541~~ 542 543 ~~544~~ 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576	541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609	+ + + + + + + + + - + - + + + + + + + + + + + + + + + + + +	# eval is required to do the TK_DBGX substitution eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}\"" eval "TK_LIB_SPEC=\"${TK_LIB_SPEC}\"" eval "TK_STUB_LIB_FLAG=\"${TK_STUB_LIB_FLAG}\"" eval "TK_STUB_LIB_SPEC=\"${TK_STUB_LIB_SPEC}\"" # TEA specific: Ensure windowingsystem is defined case ${TK_DEFS} in PLATFORM_SDL) TEA_WINDOWINGSYSTEM="x11" PRACTCL_WINDOWINGSYSTEM="sdl" TEA_USE_SDL=yes ;; esac if test "${TEA_USE_SDL}" = "yes" ; then true ~~if test "${TEA_PLATFORM}" = "unix" ; then~~ elif test "${TEA_PLATFORM}" = "unix" ; then case ${TK_DEFS} in MAC_OSX_TK) ~~AC_DEFINE(MAC_OSX_TK, 1, [Are we building against Mac OS X ~~TkAqu~~a?])~~ AC_DEFINE(MAC_OSX_TK, 1, [Are we building against Mac OS X Cocoa?]) TEA_WINDOWINGSYSTEM="aqua" PRACTCL_WINDOWINGSYSTEM="cocoa" TEA_USE_HITHEME=no; if test "${TK_VERSION}" = "8.5" ; then if test "${TK_PATCH_LEVEL}" > ".17" ; then TEA_USE_HITHEME=yes; fi elif test "${TK_VERSION}" = "8.6" ; then if test "${TK_PATCH_LEVEL}" > ".3" ; then TEA_USE_HITHEME=yes; fi elif test "${TK_VERSION}" > "8.6" ; then TEA_USE_HITHEME=yes; fi ;; *) TEA_WINDOWINGSYSTEM="x11" PRACTCL_WINDOWINGSYSTEM="x11" ;; esac elif test "${TEA_PLATFORM}" = "windows" ; then TEA_WINDOWINGSYSTEM="win32" PRACTCL_WINDOWINGSYSTEM="windows" fi AC_SUBST(TK_VERSION) AC_SUBST(TK_BIN_DIR) AC_SUBST(TK_SRC_DIR) AC_SUBST(TK_LIB_FILE) AC_SUBST(TK_LIB_FLAG) AC_SUBST(TK_LIB_SPEC) AC_SUBST(TK_STUB_LIB_FILE) AC_SUBST(TK_STUB_LIB_FLAG) AC_SUBST(TK_STUB_LIB_SPEC) # TEA specific: AC_SUBST(TK_LIBS) AC_SUBST(TK_XINCLUDES) # Practcl AC_SUBST(PRACTCL_WINDOWINGSYSTEM) ]) #------------------------------------------------------------------------ # TEA_PROG_TCLSH # Determine the fully qualified path name of the tclsh executable # in the Tcl build directory or the tclsh installed in a bin # directory. This macro will correctly determine the name
︙
586 587 588 589 590 591 592 ~~593~~ 594 595 596 597 598 599 600 601 602 603 604 605 606 607 ~~608~~ 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 ~~625~~ 626 627 628 629 630 631 632	619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687	+ + + + + + + + + + + + + + + + + + + - + + + - + - + +	# Results: # Substitutes the following vars: # TCLSH_PROG #------------------------------------------------------------------------ AC_DEFUN([TEA_PROG_TCLSH], [ AC_MSG_CHECKING([for tclsh]) AC_ARG_WITH(tclsh, [ --with-tclsh Specify a local tcl shell to use for dynamic code], with_tclsh=${withval}) # Use the value from --with-tclsh, if it was given TCLSH_PROG=0 if test x"${with_tclsh}" != x ; then if test -f "${with_tclsh}" ; then TCLSH_PROG=${with_tclsh} else if test -f "${with_tclsh}/tcl8.6" ; then TCLSH_PROG="${with_tclsh}/tcl8.6" else if test -f "${with_tclsh}/tclsh86.exe" ; then TCLSH_PROG="${with_tclsh}/tclsh86.exe" else AC_MSG_ERROR([${with_tclsh} does not point to a valid Tcl executable]) fi fi fi else ~~if test -f "${TCL_BIN_DIR}/Makefile" ; then~~ if test -f "${TCL_BIN_DIR}/Makefile" ; then # tclConfig.sh is in Tcl build directory if test "${TEA_PLATFORM}" = "windows"; then if test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}" ; then TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}" elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}sg${EXEEXT}" ; then TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}sg${EXEEXT}" elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}s${EXEEXT}" ; then TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}s${EXEEXT}" elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}t${EXEEXT}" ; then TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}t${EXEEXT}" elif test -f "${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}st${EXEEXT}" ; then TCLSH_PROG="${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}st${EXEEXT}" fi else TCLSH_PROG="${TCL_BIN_DIR}/tclsh" fi ~~else~~ else # tclConfig.sh is in install location if test "${TEA_PLATFORM}" = "windows"; then TCLSH_PROG="tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}" else TCLSH_PROG="tclsh${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}${TCL_DBGX}" fi list="`ls -d ${TCL_BIN_DIR}/../bin 2>/dev/null` \ `ls -d ${TCL_BIN_DIR}/.. 2>/dev/null` \ `ls -d ${TCL_PREFIX}/bin 2>/dev/null`" for i in $list ; do if test -f "$i/${TCLSH_PROG}" ; then REAL_TCL_BIN_DIR="`cd "$i"; pwd`/" break fi done TCLSH_PROG="${REAL_TCL_BIN_DIR}${TCLSH_PROG}" fi fi fi AC_MSG_RESULT([${TCLSH_PROG}]) AC_SUBST(TCLSH_PROG) ]) #------------------------------------------------------------------------ # TEA_PROG_WISH # Determine the fully qualified path name of the wish executable
︙
657 658 659 660 661 662 663 ~~664~~ 665 666 667 668 669 670 671	712 713 714 715 716 717 718 719 720 721 722 723 724 725 726	- +	WISH_PROG="${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}$s{EXEEXT}" elif test -f "${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}t${EXEEXT}" ; then WISH_PROG="${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}t${EXEEXT}" elif test -f "${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}st${EXEEXT}" ; then WISH_PROG="${TK_BIN_DIR}/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}st${EXEEXT}" fi else ~~WISH_PROG="${TK_BIN_DIR}/wish"~~ WISH_PROG="${TK_BIN_DIR}/wish" fi else # tkConfig.sh is in install location if test "${TEA_PLATFORM}" = "windows"; then WISH_PROG="wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${TK_DBGX}${EXEEXT}" else WISH_PROG="wish${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}${TK_DBGX}"
︙
794 795 796 797 798 799 800 ~~801 802 803~~ 804 805 ~~806 807~~ 808 ~~809~~ 810 811 812 ~~813~~ 814 ~~815 816~~ 817 ~~818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837~~ 838 ~~839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864~~ 865 ~~866~~ 867 868 869 870 ~~871 872~~ 873 ~~874~~ 875 876 877 ~~878 879 880 881~~ 882 883 ~~884~~ ~~885 886 887 888~~ 889 890 891 ~~892~~ ~~893 894~~ 895 896 897 898 899 900 901	849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966	- - - + + + - - + + - + - + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + + + + + - - - - + + + + + + + + + + + + - + - - - - + + + - + - - +	# TCL_THREADS # _REENTRANT # _THREAD_SAFE #------------------------------------------------------------------------ AC_DEFUN([TEA_ENABLE_THREADS], [ AC_ARG_ENABLE(threads, ~~AC_HELP_STRING([--enable-threads], [build with threads (default: on)]), [tcl_ok=$enableval], [tcl_ok=yes])~~ AC_HELP_STRING([--enable-threads], [build with threads (default: on)]), [tcl_ok=$enableval], [tcl_ok=yes]) if test "${enable_threads+set}" = set; then ~~enableval="$enable_threads" tcl_ok=$enableval~~ enableval="$enable_threads" tcl_ok=$enableval else ~~tcl_ok=yes~~ tcl_ok=yes fi if test "$tcl_ok" = "yes" -o "${TCL_THREADS}" = 1; then ~~TCL_THREADS=1~~ TCL_THREADS=1 ~~if test "${TEA_PLATFORM}" != "windows" ; then # We are always OK on Windows, so check what this platform wants:~~ if test "${TEA_PLATFORM}" != "windows" ; then # We are always OK on Windows, so check what this platform wants: # USE_THREAD_ALLOC tells us to try the special thread-based # allocator that significantly reduces lock contention AC_DEFINE(USE_THREAD_ALLOC, 1, [Do we want to use the threaded memory allocator?]) AC_DEFINE(_REENTRANT, 1, [Do we want the reentrant OS API?]) if test "`uname -s`" = "SunOS" ; then AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Do we really want to follow the standard? Yes we do!]) fi AC_DEFINE(_THREAD_SAFE, 1, [Do we want the thread-safe OS API?]) AC_CHECK_LIB(pthread,pthread_mutex_init,tcl_ok=yes,tcl_ok=no) if test "$tcl_ok" = "no"; then # Check a little harder for __pthread_mutex_init in the same # library, as some systems hide it there until pthread.h is # defined. We could alternatively do an AC_TRY_COMPILE with # pthread.h, but that will work with libpthread really doesn't # exist, like AIX 4.2. [Bug: 4359] AC_CHECK_LIB(pthread, __pthread_mutex_init, tcl_ok=yes, tcl_ok=no) fi # USE_THREAD_ALLOC tells us to try the special thread-based # allocator that significantly reduces lock contention AC_DEFINE(USE_THREAD_ALLOC, 1, [Do we want to use the threaded memory allocator?]) AC_DEFINE(_REENTRANT, 1, [Do we want the reentrant OS API?]) if test "`uname -s`" = "SunOS" ; then AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Do we really want to follow the standard? Yes we do!]) fi AC_DEFINE(_THREAD_SAFE, 1, [Do we want the thread-safe OS API?]) AC_CHECK_LIB(pthread,pthread_mutex_init,tcl_ok=yes,tcl_ok=no) if test "$tcl_ok" = "no"; then # Check a little harder for __pthread_mutex_init in the same # library, as some systems hide it there until pthread.h is # defined. We could alternatively do an AC_TRY_COMPILE with # pthread.h, but that will work with libpthread really doesn't # exist, like AIX 4.2. [Bug: 4359] AC_CHECK_LIB(pthread, __pthread_mutex_init, tcl_ok=yes, tcl_ok=no) fi if test "$tcl_ok" = "yes"; then # The space is needed THREADS_LIBS=" -lpthread" else AC_CHECK_LIB(pthreads, pthread_mutex_init, tcl_ok=yes, tcl_ok=no) if test "$tcl_ok" = "yes"; then # The space is needed THREADS_LIBS=" -lpthreads" else AC_CHECK_LIB(c, pthread_mutex_init, tcl_ok=yes, tcl_ok=no) if test "$tcl_ok" = "no"; then AC_CHECK_LIB(c_r, pthread_mutex_init, tcl_ok=yes, tcl_ok=no) if test "$tcl_ok" = "yes"; then # The space is needed THREADS_LIBS=" -pthread" else TCL_THREADS=0 AC_MSG_WARN([Do not know how to find pthread lib on your system - thread support disabled]) fi fi fi fi fi if test "$tcl_ok" = "yes"; then # The space is needed THREADS_LIBS=" -lpthread" else AC_CHECK_LIB(pthreads, pthread_mutex_init, tcl_ok=yes, tcl_ok=no) if test "$tcl_ok" = "yes"; then # The space is needed THREADS_LIBS=" -lpthreads" else AC_CHECK_LIB(c, pthread_mutex_init, tcl_ok=yes, tcl_ok=no) if test "$tcl_ok" = "no"; then AC_CHECK_LIB(c_r, pthread_mutex_init, tcl_ok=yes, tcl_ok=no) if test "$tcl_ok" = "yes"; then # The space is needed THREADS_LIBS=" -pthread" else TCL_THREADS=0 AC_MSG_WARN([Do not know how to find pthread lib on your system - thread support disabled]) fi fi fi fi fi else ~~TCL_THREADS=0~~ TCL_THREADS=0 fi # Do checking message here to not mess up interleaved configure output AC_MSG_CHECKING([for building with threads]) if test "${TCL_THREADS}" = 1; then ~~AC_DEFINE(TCL_THREADS, 1, [Are we building with threads enabled?]) AC_MSG_RESULT([yes (default)])~~ AC_DEFINE(TCL_THREADS, 1, [Are we building with threads enabled?]) AC_MSG_RESULT([yes (default)]) else ~~AC_MSG_RESULT([no])~~ AC_MSG_RESULT([no]) fi # TCL_THREADS sanity checking. See if our request for building with # threads is the same as the way Tcl was built. If not, warn the user. if test "${TCL_VERSION}" > "8.6" ; then TCL_HAS_THREADS=1 else ~~case ${TCL_DEFS} in THREADS=1) if test "${TCL_THREADS}" = "0"; then AC_MSG_WARN([~~ case ${TCL_DEFS} in THREADS=1) TCL_HAS_THREADS=1; ;; ) TCL_HAS_THREADS=0; ;; esac fi if test "${TCL_HAS_THREADS}" = "1"; then if test "${TCL_THREADS}" = "0"; then AC_MSG_WARN([ Building ${PACKAGE_NAME} without threads enabled, but building against Tcl that IS thread-enabled. It is recommended to use --enable-threads.]) fi fi ~~;; ) if test "${TCL_THREADS}" = "1"; then AC_MSG_WARN([~~ else if test "${TCL_THREADS}" = "1"; then AC_MSG_WARN([ --enable-threads requested, but building against a Tcl that is NOT thread-enabled. This is an OK configuration that will also run in a thread-enabled core.]) fi fi ~~;; ~~esac~~~~ fi AC_SUBST(TCL_THREADS) ]) #------------------------------------------------------------------------ # TEA_ENABLE_SYMBOLS -- # # Specify if debugging symbols should be used.
︙
1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376	1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443	+ +	if test "$GCC" = "yes"; then # mingw gcc mode AC_CHECK_TOOL(RC, windres) CFLAGS_DEBUG="-g" CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" SHLIB_LD='${CC} -shared' UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' PRACTCL_UNSHARED_LIB_SUFFIX='.a' LDFLAGS_CONSOLE="-wl,--subsystem,console ${lflags}" LDFLAGS_WINDOW="-wl,--subsystem,windows ${lflags}" AC_CACHE_CHECK(for cross-compile version of gcc, ac_cv_cross, AC_TRY_COMPILE([ #ifdef _WIN32
︙
2078 2079 2080 2081 2082 2083 2084 ~~2085~~ 2086 2087 ~~2088~~ 2089 2090 2091 2092 2093 2094 2095	2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164	- + + - + +	AS_IF([test "$tcl_cv_cc_visibility_hidden" != yes], [ AC_DEFINE(MODULE_SCOPE, [extern], [No Compiler support for module scope symbols]) ]) AS_IF([test "$SHARED_LIB_SUFFIX" = ""], [ # TEA specific: use PACKAGE_VERSION instead of VERSION ~~SHARED_LIB_SUFFIX='${PACKAGE_VERSION}${SHLIB_SUFFIX}'])~~ SHARED_LIB_SUFFIX='${PACKAGE_VERSION}${SHLIB_SUFFIX}' ]) AS_IF([test "$UNSHARED_LIB_SUFFIX" = ""], [ # TEA specific: use PACKAGE_VERSION instead of VERSION ~~UNSHARED_LIB_SUFFIX='${PACKAGE_VERSION}.a'])~~ UNSHARED_LIB_SUFFIX='${PACKAGE_VERSION}.a' ]) if test "${GCC}" = "yes" -a ${SHLIB_SUFFIX} = ".dll"; then AC_CACHE_CHECK(for SEH support in compiler, tcl_cv_seh, AC_TRY_RUN([ #define WIN32_LEAN_AND_MEAN #include <windows.h>
︙
2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197	2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267	+	AC_SUBST(CFLAGS_DEBUG) AC_SUBST(CFLAGS_OPTIMIZE) AC_SUBST(CFLAGS_WARNING) AC_SUBST(STLIB_LD) AC_SUBST(SHLIB_LD) AC_SUBST(SHLIB_SUFFIX) AC_SUBST(SHLIB_LD_LIBS) AC_SUBST(SHLIB_CFLAGS) AC_SUBST(LD_LIBRARY_PATH_VAR) # These must be called after we do the basic CFLAGS checks and
︙
2338 2339 2340 2341 2342 2343 2344 ~~2345~~ 2346 2347 2348 2349 2350 2351 2352	2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422	- +	# Sets the following vars: # XINCLUDES # XLIBSW # PKG_LIBS (appends to) #-------------------------------------------------------------------- AC_DEFUN([TEA_PATH_X], [ ~~if test "${~~TEA~~_WINDOWINGSYSTEM}" = "x11" ; then~~ if test "${PRACTCL_WINDOWINGSYSTEM}" = "x11" ; then TEA_PATH_UNIX_X fi ]) AC_DEFUN([TEA_PATH_UNIX_X], [ AC_PATH_X not_really_there=""
︙
2728 2729 2730 2731 2732 2733 2734 ~~2735~~ ~~2736~~ 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 ~~2749~~ 2750 2751 2752 2753 2754 2755 2756	2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826	- + - - + +	# EXEEXT # Select the executable extension based on the host type. This # is a lightweight replacement for AC_EXEEXT that doesn't require # a compiler. #------------------------------------------------------------------------ AC_DEFUN([TEA_INIT], [ ~~TEA_VERSION="~~3.13~~"~~ TEA_VERSION="4.0" AC_MSG_CHECKING([TEA configuration]) if test x"${PACKAGE_NAME}" = x ; then AC_MSG_ERROR([ The PACKAGE_NAME variable must be defined by your TEA configure.ac]) fi AC_MSG_RESULT([ok (TEA ${TEA_VERSION})]) # If the user did not set CFLAGS, set it now to keep macros # like AC_PROG_CC and AC_TRY_COMPILE from adding "-g -O2". if test "${CFLAGS+set}" != "set" ; then CFLAGS="" fi TEA_TK_EXTENSION=0 AC_SUBST(TEA_TK_EXTENSION) case "`uname -s`" in win32\|WIN32\|MINGW32_\|MINGW64_) AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo) EXEEXT=".exe" TEA_PLATFORM="windows" ;; CYGWIN_)
︙
2991 2992 2993 2994 2995 2996 2997 ~~2998 2999~~ 3000 3001 3002 3003 3004 3005 3006	3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080	+ + - - + + + +	# Defines and substs the following vars: # PKG_LIBS #------------------------------------------------------------------------ AC_DEFUN([TEA_ADD_LIBS], [ vars="$@" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in .lib) ~~# Convert foo.lib to -lfoo for GCC~~. No-op if not .lib~~ i=`echo "$i" \| sed -e 's/~~^\(~~[[^-]]~~.\)~~\.lib~~[$]/-l\1/i~~'`~~ # Convert foo.lib to -lfoo for GCC i=-l`echo "$i" \| sed -e 's/\.[[^.]]$//' -e 's/\.lib.*//'` ;; esac fi PKG_LIBS="$PKG_LIBS $i" done AC_SUBST(PKG_LIBS) ]) #------------------------------------------------------------------------
︙
3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 ~~3184 3185 3186 3187~~ 3188 3189 3190 ~~3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203~~ 3204 ~~3205 3206 3207 3208 3209~~ 3210 ~~3211 3212 3213 3214 3215~~ ~~3216 3217 3218~~ 3219 3220 3221 ~~3222~~ 3223 3224 3225 ~~3226~~ 3227 3228 ~~3229~~ 3230 3231 ~~3232~~ 3233 ~~3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257~~ 3258 ~~3259 3260 3261 3262 3263 3264 3265~~ 3266 3267 3268 3269 3270 3271 3272	3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386	+ + + + + + + + + + + + - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + +	# differs depending on whether or not Tcl is being # compiled as a shared library. # MAKE_SHARED_LIB Makefile rule for building a shared library # MAKE_STATIC_LIB Makefile rule for building a static library # MAKE_STUB_LIB Makefile rule for building a stub library # VC_MANIFEST_EMBED_DLL Makefile rule for embedded VC manifest in DLL # VC_MANIFEST_EMBED_EXE Makefile rule for embedded VC manifest in EXE # # PRACTCL_TOOLSET What toolset is in use (gcc or msvc) # PRACTCL_SHARED_LIB Template rule for building a shared library # PRACTCL_STATIC_LIB Template rule for building a static library # PRACTCL_STUB_LIB Template rule for building a stub library # PRACTCL_VC_MANIFEST_EMBED_DLL Template rule for embedded VC manifest in DLL # PRACTCL_VC_MANIFEST_EMBED_EXE Template rule for embedded VC manifest in EXE # PRACTCL_NAME_LIBRARY Template rule for naming libraries # #------------------------------------------------------------------------ AC_DEFUN([TEA_MAKE_LIB], [ PRACTCL_TOOLSET="gcc" PRACTCL_VC_MANIFEST_EMBED_DLL=: PRACTCL_VC_MANIFEST_EMBED_EXE=: if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes"; then MAKE_STATIC_LIB="\${STLIB_LD} -out:\[$]@ \$(PKG_OBJECTS)" MAKE_SHARED_LIB="\${SHLIB_LD} \${SHLIB_LD_LIBS} \${LDFLAGS_DEFAULT} -out:\[$]@ \$(PKG_OBJECTS)" AC_EGREP_CPP([manifest needed], [ if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes"; then PRACTCL_TOOLSET="msvc" PRACTCL_STATIC_LIB="%STLIB_LD% -out:%OUTFILE% %LIBRARY_OBJECTS%" PRACTCL_SHARED_LIB="%SHLIB_LD% %SHLIB_LD_LIBS% %LDFLAGS_DEFAULT% -out:%OUTFILE% %LIBRARY_OBJECTS%" MAKE_STATIC_LIB="\${STLIB_LD} -out:\[$]@ \$(PKG_OBJECTS)" MAKE_SHARED_LIB="\${SHLIB_LD} \${SHLIB_LD_LIBS} \${LDFLAGS_DEFAULT} -out:\[$]@ \$(PKG_OBJECTS)" AC_EGREP_CPP([manifest needed], [ #if defined(_MSC_VER) && _MSC_VER >= 1400 print("manifest needed") #endif ], [ # Could do a CHECK_PROG for mt, but should always be with MSVC8+ VC_MANIFEST_EMBED_DLL="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;2 ; fi" VC_MANIFEST_EMBED_EXE="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;1 ; fi" MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}" TEA_ADD_CLEANFILES([.manifest]) ]) MAKE_STUB_LIB="\${STLIB_LD} -nodefaultlib -out:\[$]@ \$(PKG_STUB_OBJECTS)" else MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(PKG_OBJECTS)" MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}" MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \$(PKG_STUB_OBJECTS)" fi ], [ # Could do a CHECK_PROG for mt, but should always be with MSVC8+ PRACTCL_VC_MANIFEST_EMBED_DLL="mt.exe -nologo -manifest %OUTFILE%.manifest -outputresource:%OUTFILE%\;2" PRACTCL_VC_MANIFEST_EMBED_EXE="mt.exe -nologo -manifest %OUTFILE%.manifest -outputresource:%OUTFILE%\;1" VC_MANIFEST_EMBED_DLL="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;2 ; fi" VC_MANIFEST_EMBED_EXE="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest -outputresource:\[$]@\;1 ; fi" MAKE_SHARED_LIB="${MAKE_SHARED_LIB} ; ${VC_MANIFEST_EMBED_DLL}" TEA_ADD_CLEANFILES([.manifest]) ]) PRACTCL_STUB_LIB="%STLIB_LD% -nodefaultlib -out:%OUTFILE% %LIBRARY_OBJECTS%" MAKE_STUB_LIB="\${STLIB_LD} -nodefaultlib -out:\[$]@ \$(PKG_STUB_OBJECTS)" else MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(PKG_OBJECTS)" MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}" MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \$(PKG_STUB_OBJECTS)" PRACTCL_STATIC_LIB="%STLIB_LD% %OUTFILE% %LIBRARY_OBJECTS%" PRACTCL_SHARED_LIB="%SHLIB_LD% -o %OUTFILE% %LIBRARY_OBJECTS% %SHLIB_LD_LIBS%" PRACTCL_STUB_LIB="%STLIB_LD% %OUTFILE% %LIBRARY_OBJECTS%" fi ~~if test "${SHARED_BUILD}" = "1" ; then MAKE_LIB="${MAKE_SHARED_LIB} " else MAKE_LIB="${MAKE_STATIC_LIB} " fi~~ if test "${SHARED_BUILD}" = "1" ; then MAKE_LIB="${MAKE_SHARED_LIB} " else MAKE_LIB="${MAKE_STATIC_LIB} " fi #-------------------------------------------------------------------- # Shared libraries and static libraries have different names. # Use the double eval to make sure any variables in the suffix is # substituted. (@@@ Might not be necessary anymore) #-------------------------------------------------------------------- #-------------------------------------------------------------------- # Shared libraries and static libraries have different names. # Use the double eval to make sure any variables in the suffix is # substituted. (@@@ Might not be necessary anymore) #-------------------------------------------------------------------- ~~if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then~~ if test "${TEA_PLATFORM}" = "windows" ; then PRACTCL_NAME_LIBRARY="%LIBRARY_PREFIX%%LIBRARY_NAME%%LIBRARY_VERSION_NODOTS%" if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in # the private libraries of Tcl and Tk. if test x"${TK_BIN_DIR}" != x ; then ~~SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""~~ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\"" fi SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\"" if test "$GCC" = "yes"; then ~~SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"~~ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc" fi eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}" ~~else~~ else eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}" if test "$GCC" = "yes"; then ~~PKG_LIB_FILE=lib${PKG_LIB_FILE}~~ PKG_LIB_FILE=lib${PKG_LIB_FILE} fi fi # Some packages build their own stubs libraries eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}" if test "$GCC" = "yes"; then PKG_STUB_LIB_FILE=lib${PKG_STUB_LIB_FILE} fi # These aren't needed on Windows (either MSVC or gcc) RANLIB=: RANLIB_STUB=: else RANLIB_STUB="${RANLIB}" if test "${SHARED_BUILD}" = "1" ; then SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TCL_STUB_LIB_SPEC}" if test x"${TK_BIN_DIR}" != x ; then SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}" fi eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}" RANLIB=: else eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}" fi # Some packages build their own stubs libraries eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}" fi fi # Some packages build their own stubs libraries eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}" if test "$GCC" = "yes"; then PKG_STUB_LIB_FILE=lib${PKG_STUB_LIB_FILE} fi # These aren't needed on Windows (either MSVC or gcc) RANLIB=: RANLIB_STUB=: else PRACTCL_NAME_LIBRARY="lib%LIBRARY_PREFIX%%LIBRARY_NAME%%LIBRARY_VERSION%" RANLIB_STUB="${RANLIB}" if test "${SHARED_BUILD}" = "1" ; then SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TCL_STUB_LIB_SPEC}" if test x"${TK_BIN_DIR}" != x ; then SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}" fi eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}" RANLIB=: else eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}" fi # Some packages build their own stubs libraries eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}" fi # Store the raw CFLAGS before we add the trimmings PRACTCL_CFLAGS=${CFLAGS} # These are escaped so that only CFLAGS is picked up at configure time. # The other values will be substituted at make time. CFLAGS="${CFLAGS} \${CFLAGS_DEFAULT} \${CFLAGS_WARNING}" if test "${SHARED_BUILD}" = "1" ; then CFLAGS="${CFLAGS} \${SHLIB_CFLAGS}" fi AC_SUBST(MAKE_LIB) AC_SUBST(MAKE_SHARED_LIB) AC_SUBST(MAKE_STATIC_LIB) AC_SUBST(MAKE_STUB_LIB) AC_SUBST(RANLIB_STUB) AC_SUBST(VC_MANIFEST_EMBED_DLL) AC_SUBST(VC_MANIFEST_EMBED_EXE) AC_SUBST(MAKE_LIB) AC_SUBST(MAKE_SHARED_LIB) AC_SUBST(MAKE_STATIC_LIB) AC_SUBST(MAKE_STUB_LIB) AC_SUBST(RANLIB_STUB) AC_SUBST(VC_MANIFEST_EMBED_DLL) AC_SUBST(VC_MANIFEST_EMBED_EXE) AC_SUBST(PRACTCL_CFLAGS) AC_SUBST(PRACTCL_TOOLSET) AC_SUBST(PRACTCL_SHARED_LIB) AC_SUBST(PRACTCL_STATIC_LIB) AC_SUBST(PRACTCL_STUB_LIB) AC_SUBST(PRACTCL_VC_MANIFEST_EMBED_DLL) AC_SUBST(PRACTCL_VC_MANIFEST_EMBED_EXE) AC_SUBST(PRACTCL_NAME_LIBRARY) ]) #------------------------------------------------------------------------ # TEA_LIB_SPEC -- # # Compute the name of an existing object library located in libdir # from the given base name and produce the appropriate linker flags.
︙
3553 3554 3555 3556 3557 3558 3559 ~~3560~~ 3561 ~~3562 3563~~ 3564 ~~3565~~ 3566 3567 3568 3569 3570 3571 3572	3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698	- + + - - + - + + + + + + + + + + + + +	# We want to ensure these are substituted so as not to require # any _NATIVE vars be defined in the Makefile TK_INCLUDES="-I${TK_GENERIC_DIR_NATIVE} -I${TK_PLATFORM_DIR_NATIVE}" # Detect and add ttk subdir if test -d "${TK_SRC_DIR}/generic/ttk"; then TK_INCLUDES="${TK_INCLUDES} -I\"${TK_SRC_DIR_NATIVE}/generic/ttk\"" fi ~~if te~~st "~~${~~TEA~~_WINDOWINGSYSTEM}~~" != "x11"; the~~n~~ case ${PRACTCL_WINDOWINGSYSTEM} in cocoa) TK_INCLUDES="${TK_INCLUDES} -I\"${TK_XLIB_DIR_NATIVE}\"" ~~fi ~~if test "${TEA_WINDOWINGSYSTEM}" = "aqua"; then~~~~ TK_INCLUDES="${TK_INCLUDES} -I\"${TK_SRC_DIR_NATIVE}/macosx\"" ;; fi hitheme) TK_INCLUDES="${TK_INCLUDES} -I\"${TK_XLIB_DIR_NATIVE}\"" TK_INCLUDES="${TK_INCLUDES} -I\"${TK_SRC_DIR_NATIVE}/macosx\"" ;; sdl) TK_INCLUDES="${TK_INCLUDES} -I\"${TK_XLIB_DIR_NATIVE}\"" ;; x11) ;; ) TK_INCLUDES="${TK_INCLUDES} -I\"${TK_XLIB_DIR_NATIVE}\"" ;; esac if test "`uname -s`" = "Darwin"; then # If Tk was built as a framework, attempt to use # the framework's Headers and PrivateHeaders directories case ${TK_DEFS} in TK_FRAMEWORK) if test -d "${TK_BIN_DIR}/Headers" -a \ -d "${TK_BIN_DIR}/PrivateHeaders"; then
︙
3683 3684 3685 3686 3687 3688 3689 ~~3690~~ 3691 3692 3693 3694 3695 3696 3697	3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823	- +	INCLUDE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tkh}` TK_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" AC_SUBST(TK_INCLUDES) ~~if test "${~~TEA~~_WINDOWINGSYSTEM}" != "x11"; then~~ if test "${PRACTCL_WINDOWINGSYSTEM}" != "x11"; then # On Windows and Aqua, we need the X compat headers AC_MSG_CHECKING([for X11 header files]) if test ! -r "${INCLUDE_DIR_NATIVE}/X11/Xlib.h"; then INCLUDE_DIR_NATIVE="`${CYGPATH} ${TK_SRC_DIR}/xlib`" TK_XINCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" AC_SUBST(TK_XINCLUDES) fi
︙
4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034	4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	no_celib= CELIB_DIR=${ac_cv_c_celibconfig} CELIB_DIR=`echo "$CELIB_DIR" \| sed -e 's!\\\!/!g'` AC_MSG_RESULT([found $CELIB_DIR]) fi fi ]) #-------------------------------------------------------------------- # TEA_CONFIG_TEAPOT # # Try to determine the canonical name for this package's binary # target # # Arguments: # none AC_DEFUN([TEA_CONFIG_TEAPOT], [ AC_REQUIRE([TEA_INIT]) AC_REQUIRE([TEA_CONFIG_SYSTEM]) TEACUP_OS=$system TEACUP_ARCH="unknown" TEACUP_TOOLSET="gcc" TEACUP_PROFILE="unknown" arch="unknown" case ${host_alias} in mingw32) arch="ix86" TEACUP_PROFILE="win32-ix86" ;; mingw64) arch="x86_64" TEACUP_PROFILE="win32-x86_64" ;; esac if test "${arch}" = "unknown" ; then if test "${TEA_PLATFORM}" = "windows" ; then if test "$GCC" = "yes" ; then TEACUP_TOOLSET="gcc" else TEACUP_TOOLSET="msvc" fi if test "$do64bit" != "no" ; then case "$do64bit" in amd64\|x64\|yes) arch="x86_64" TEACUP_PROFILE="win32-x86_64" ;; ia64) arch="ia64" TEACUP_PROFILE="win32-ia64" ;; esac else arch="ix86" TEACUP_PROFILE="win32-ix86" fi else case $system in Linux) TEACUP_OS="linux" arch=`uname -m` TEACUP_PROFILE="linux-glibc2.3-$arch" ;; GNU) TEACUP_OS="gnu" arch=`uname -m` ;; NetBSD-Debian) TEACUP_OS="netbsd-debian" arch=`uname -m` ;; OpenBSD-) TEACUP_OS="openbsd" arch=`arch -s` ;; Darwin) TEACUP_OS="macosx" TEACUP_PROFILE="macosx-universal" arch=`uname -m` if test $arch = "x86_64"; then TEACUP_PROFILE="macosx10.5-i386-x86_84" fi ;; OpenBSD) TEACUP_OS="openbsd" arch=`arch -s` ;; esac fi fi TEACUP_ARCH=$arch if test "$TEACUP_PROFILE" = "unknown"; then if test $arch = "unknown"; then arch=`uname -m` fi case $arch in i86) arch="ix86" ;; amd64) arch="x86_64" ;; esac TEACUP_PROFILE="$TEACUP_OS-$arch" fi TEA_SYSTEM=$system AC_SUBST(TEA_SYSTEM) AC_SUBST(TEA_PLATFORM) AC_SUBST(TEA_WINDOWINGSYSTEM) AC_SUBST(TEACUP_OS) AC_SUBST(TEACUP_ARCH) AC_SUBST(TEACUP_TOOLSET) AC_SUBST(TEACUP_PROFILE) ]) #------------------------------------------------------------------------ # TEA_INSTALLER -- # # Configure the installer. # # Arguments:
︙
4065 4066 4067 4068 4069 4070 4071 ~~4072~~ 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 ~~4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098~~ 4099 4100 4101 4102 4103 4104 4105	4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323	- + - - - - - - - - - - - - - - -	AC_SUBST(INSTALL_LIBRARY) ]) ### # Tip 430 - ZipFS Modifications ### #------------------------------------------------------------------------ ~~# SC_ZIPFS_SUPPORT~~ # TEA_ZIPFS_SUPPORT # Locate a zip encoder installed on the system path, or none. # # Arguments: # none # # Results: # Substitutes the following vars: # TCL_ZIP_FILE # TCL_ZIPFS_SUPPORT # TCL_ZIPFS_FLAG # ZIP_PROG ~~#------------------------------------------------------------------------~~ ~~#------------------------------------------------------------------------~~ ~~# SC_PROG_ZIP~~ ~~# Locate a zip encoder installed on the system path, or none.~~ # ~~# Arguments:~~ ~~# none~~ # ~~# Results:~~ ~~# Substitutes the following vars:~~ ~~# ZIP_PROG~~ ~~# ZIP_PROG_OPTIONS~~ ~~# ZIP_PROG_VFSSEARCH~~ ~~# ZIP_INSTALL_OBJS~~ #------------------------------------------------------------------------ AC_DEFUN([TEA_ZIPFS_SUPPORT], [ AC_MSG_CHECKING([for zipfs support]) ZIP_PROG="" ZIP_PROG_OPTIONS="" ZIP_PROG_VFSSEARCH="" INSTALL_MSGS=""
︙



















































































1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	### # Tcl Parsable version of data from xxxConfig.sh ### name {@PACKAGE_NAME@} version {@PACKAGE_VERSION@} libfile {@PKG_LIB_FILE@} srcdir {@srcdir@} prefix {@prefix@} exec_prefix {@exec_prefix@} exeext {@EXEEXT@} tk {@TEA_TK_EXTENSION@} bindir {@bindir@} libdir {@libdir@} includedir {@includedir@} datarootdir {@datarootdir@} datadir {@datadir@} mandir {@mandir@} cleanfiles {@CLEANFILES@} AR {@AR@} CC {@CC@} CFLAGS {@CFLAGS@} CFLAGS_DEBUG {@CFLAGS_DEBUG@} CFLAGS_OPTIMIZE {@CFLAGS_OPTIMIZE@} CFLAGS_DEFAULT {@CFLAGS_DEFAULT@} CFLAGS_WARNING {@CFLAGS_WARNING@} CPPFLAGS {@CPPFLAGS@} DEFS {@DEFS@ @PKG_CFLAGS@} EXEEXT {@EXEEXT@} LDFLAGS {@LDFLAGS@} LDFLAGS_DEFAULT {@LDFLAGS_DEFAULT@} LIBS {@PKG_LIBS@ @LIBS@} MAKE_LIB {@MAKE_LIB@} MAKE_SHARED_LIB {@MAKE_SHARED_LIB@} MAKE_STATIC_LIB {@MAKE_STATIC_LIB@} MAKE_STUB_LIB {@MAKE_STUB_LIB@} OBJEXT {@OBJEXT@} PKG_CFLAGS {@PKG_CFLAGS@} RANLIB {@RANLIB@} RANLIB_STUB {@RANLIB_STUB@} SHELL {@SHELL@} SHARED_BUILD {@SHARED_BUILD@} SHLIB_CFLAGS {@SHLIB_CFLAGS@} SHLIB_LD {@SHLIB_LD@} SHLIB_LD_LIBS {@SHLIB_LD_LIBS@} SHLIB_SUFFIX {@SHLIB_SUFFIX@} STLIB_LD {@STLIB_LD@} TCL_DEFS {@TCL_DEFS@} TCL_VERSION {@TCL_VERSION@} TCL_PATCH_LEVEL {@TCL_PATCH_LEVEL@} TCL_BIN_DIR {@TCL_BIN_DIR@} TCL_SRC_DIR {@TCL_SRC_DIR@} TEA_TK_EXTENSION {@TEA_TK_EXTENSION@} TK_VERSION {@TK_VERSION@} TK_PATCH_LEVEL {@TK_PATCH_LEVEL@} TK_BIN_DIR {@TK_BIN_DIR@} TK_SRC_DIR {@TK_SRC_DIR@} TEA_PLATFORM {@TEA_PLATFORM@} TEA_WINDOWINGSYSTEM {@TEA_WINDOWINGSYSTEM@} TEA_SYSTEM {@TEA_SYSTEM@} TEACUP_OS {@TEACUP_OS@} TEACUP_ARCH {@TEACUP_ARCH@} TEACUP_TOOLSET {@TEACUP_TOOLSET@} TEACUP_PROFILE {@TEACUP_PROFILE@} TEACUP_ZIPFILE {@PACKAGE_NAME@-@PACKAGE_VERSION@-@[email protected]} PRACTCL_DEFS {@PRACTCL_DEFS@} PRACTCL_TOOLSET {@PRACTCL_TOOLSET@} PRACTCL_SHARED_LIB {@PRACTCL_SHARED_LIB@} PRACTCL_STATIC_LIB {@PRACTCL_STATIC_LIB@} PRACTCL_STUB_LIB {@PRACTCL_STUB_LIB@} PRACTCL_LIBS {@PKG_LIBS@ @LIBS@} PRACTCL_VC_MANIFEST_EMBED_DLL {@PRACTCL_VC_MANIFEST_EMBED_DLL@} PRACTCL_VC_MANIFEST_EMBED_EXE {@PRACTCL_VC_MANIFEST_EMBED_EXE@} PRACTCL_NAME_LIBRARY {@PRACTCL_NAME_LIBRARY@} PRACTCL_PKG_LIBS {@PKG_LIBS@}