Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | More fixes to autoconf |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
47f2d827e523ddf9a5687528cf488af2 |
User & Date: | hypnotoad 2016-10-26 18:34:42 |
Context
2017-12-22
| ||
12:17 | Integrate new nmake build system shipping with Tcl 8.6.8 Leaf check-in: ff028b4953 user: apnadkarni tags: trunk, magicsplat-1.8.0 | |
2017-11-18
| ||
15:22 | Create new branch named "vc-reform" check-in: d496187ce5 user: apnadkarni tags: vc-reform | |
2016-10-26
| ||
18:34 | More fixes to autoconf check-in: 47f2d827e5 user: hypnotoad tags: trunk | |
18:13 | Added template for config.tcl check-in: 9aabc62a57 user: hypnotoad tags: trunk | |
Changes
Changes to configure.
653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 .... 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 .... 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629 5630 5631 5632 5633 .... 6134 6135 6136 6137 6138 6139 6140 6141 6142 6143 6144 6145 6146 6147 6148 .... 6459 6460 6461 6462 6463 6464 6465 6466 6467 6468 6469 6470 6471 6472 6473 6474 6475 6476 6477 6478 6479 6480 6481 6482 6483 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494 6495 6496 6497 6498 6499 6500 6501 6502 6503 6504 6505 6506 6507 6508 6509 6510 6511 6512 6513 6514 6515 6516 6517 6518 6519 6520 6521 6522 6523 6524 6525 6526 6527 6528 6529 6530 6531 6532 6533 6534 6535 6536 6537 6538 6539 6540 6541 6542 6543 6544 6545 6546 6547 6548 6549 6550 6551 6552 6553 6554 6555 6556 6557 6558 6559 6560 6561 6562 6563 6564 6565 6566 6567 6568 6569 6570 6571 6572 6573 6574 6575 6576 6577 6578 6579 6580 6581 6582 6583 6584 6585 6586 6587 6588 6589 6590 6591 6592 6593 6594 6595 6596 6597 6598 6599 6600 6601 6602 6603 6604 6605 6606 6607 6608 6609 6610 6611 6612 6613 6614 6615 6616 6617 6618 6619 6620 6621 6622 6623 6624 6625 6626 6627 6628 6629 6630 6631 6632 6633 6634 6635 6636 6637 6638 6639 6640 6641 6642 6643 6644 6645 6646 6647 6648 6649 6650 6651 6652 6653 6654 6655 6656 6657 6658 6659 6660 6661 6662 6663 6664 6665 6666 6667 6668 6669 6670 6671 6672 6673 6674 6675 6676 6677 6678 6679 6680 6681 6682 6683 6684 6685 6686 6687 6688 6689 |
CELIB_DIR AR STUBS_BUILD SHARED_BUILD TCL_THREADS XMKMF TK_PATCH_LEVEL TEA_WINDOWINGSYSTEM CAN3D_WINDOWINGSYSTEM TK_XLIB_DIR_NATIVE TK_TOP_DIR_NATIVE TK_INCLUDES TCL_TOP_DIR_NATIVE TCL_INCLUDES PKG_OBJECTS PKG_SOURCES MATH_LIBS EGREP GREP RANLIB SET_MAKE INSTALL_LIBRARY INSTALL_SCRIPT ................................................................................ case ${TK_DEFS} in *MAC_OSX_TK*) $as_echo "#define MAC_OSX_TK 1" >>confdefs.h TEA_WINDOWINGSYSTEM="aqua" PRACTCL_WINDOWINGSYSTEM="cocoa" if test "${TK_VERSION}" = "8.5" ; then if test "${TK_PATCH_LEVEL}" > ".17" ; then PRACTCL_WINDOWINGSYSTEM="hitheme" fi elif test "${TK_VERSION}" = "8.6" ; then if test "${TK_PATCH_LEVEL}" > ".3" ; then PRACTCL_WINDOWINGSYSTEM="hitheme" fi elif test "${TK_VERSION}" > "8.6" ; then PRACTCL_WINDOWINGSYSTEM="hitheme" fi ;; *) TEA_WINDOWINGSYSTEM="x11" PRACTCL_WINDOWINGSYSTEM="x11" ;; esac ................................................................................ # Let the user call this, because if it triggers, they will # need a compat/strtod.c that is correct. Users can also # use Tcl_GetDouble(FromObj) instead. #TEA_BUGGY_STRTOD fi #----------------------------------------------------------------------- # __CHANGE__ # Specify the C source files to compile in TEA_ADD_SOURCES, # public headers that need to be installed in TEA_ADD_HEADERS, # stub library C source files to compile in TEA_ADD_STUB_SOURCES, # and runtime Tcl library files in TEA_ADD_TCL_SOURCES. ................................................................................ # and change Makefile.in to move it from CONFIG_CLEAN_FILES to BINARIES var. # # A few miscellaneous platform-specific items: # TEA_ADD_* any platform specific compiler/build info here. #-------------------------------------------------------------------- case ${PRACTCL_WINDOWINGSYSTEM} in hitheme) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl public headers" >&5 $as_echo_n "checking for Tcl public headers... " >&6; } # Check whether --with-tclinclude was given. if test "${with_tclinclude+set}" = set; then : ................................................................................ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${result}" >&5 $as_echo "${result}" >&6; } #TEA_ADD_CFLAGS([-ObjC -fobjc-gc]) PKG_CFLAGS="$PKG_CFLAGS -ObjC" #TEA_ADD_LIBS([-framework AGL -framework OpenGL -framework ApplicationServices -framework CoreFoundation -framework Cocoa]) : vars="-I\"${srcdir}/generic\"" for i in $vars; do PKG_INCLUDES="$PKG_INCLUDES $i" done vars="macosx/c3dCocoaMain.c" for i in $vars; do case $i in \$*) # allow $-var names PKG_SOURCES="$PKG_SOURCES $i" PKG_OBJECTS="$PKG_OBJECTS $i" ;; *) # check for existence - allows for generic/win/unix VPATH # To add more dirs here (like 'src'), you have to update VPATH # in Makefile.in as well if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ -a ! -f "${srcdir}/macosx/$i" \ ; then as_fn_error $? "could not find source file '$i'" "$LINENO" 5 fi PKG_SOURCES="$PKG_SOURCES $i" # this assumes it is in a VPATH dir i=`basename $i` # handle user calling this before or after TEA_SETUP_COMPILER if test x"${OBJEXT}" != x ; then j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}" else j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}" fi PKG_OBJECTS="$PKG_OBJECTS $j" ;; esac done vars="-framework OpenGL -framework ApplicationServices -framework CoreFoundation -framework Cocoa" 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 i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` ;; esac fi PKG_LIBS="$PKG_LIBS $i" done PKG_CFLAGS="$PKG_CFLAGS -DMACOSX_HITHEME=1" CAN3D_WINDOWINGSYSTEM=CAN3D_AGL ;; cocoa) # Allow for --with-tclinclude to take effect and define ${ac_cv_c_tclh} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl private include files" >&5 $as_echo_n "checking for Tcl private include files... " >&6; } TCL_SRC_DIR_NATIVE=`${CYGPATH} ${TCL_SRC_DIR}` TCL_TOP_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}\" # Check to see if tcl<Plat>Port.h isn't already with the public headers # Don't look for tclInt.h because that resides with tcl.h in the core # sources, but the <plat>Port headers are in a different directory if test "${TEA_PLATFORM}" = "windows" -a \ -f "${ac_cv_c_tclh}/tclWinPort.h"; then result="private headers found with public headers" elif test "${TEA_PLATFORM}" = "unix" -a \ -f "${ac_cv_c_tclh}/tclUnixPort.h"; then result="private headers found with public headers" else TCL_GENERIC_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}/generic\" if test "${TEA_PLATFORM}" = "windows"; then TCL_PLATFORM_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}/win\" else TCL_PLATFORM_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}/unix\" fi # Overwrite the previous TCL_INCLUDES as this should capture both # public and private headers in the same set. # We want to ensure these are substituted so as not to require # any *_NATIVE vars be defined in the Makefile TCL_INCLUDES="-I${TCL_GENERIC_DIR_NATIVE} -I${TCL_PLATFORM_DIR_NATIVE}" if test "`uname -s`" = "Darwin"; then # If Tcl was built as a framework, attempt to use # the framework's Headers and PrivateHeaders directories case ${TCL_DEFS} in *TCL_FRAMEWORK*) if test -d "${TCL_BIN_DIR}/Headers" -a \ -d "${TCL_BIN_DIR}/PrivateHeaders"; then TCL_INCLUDES="-I\"${TCL_BIN_DIR}/Headers\" -I\"${TCL_BIN_DIR}/PrivateHeaders\" ${TCL_INCLUDES}" else TCL_INCLUDES="${TCL_INCLUDES} ${TCL_INCLUDE_SPEC} `echo "${TCL_INCLUDE_SPEC}" | sed -e 's/Headers/PrivateHeaders/'`" fi ;; esac result="Using ${TCL_INCLUDES}" else if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then as_fn_error $? "Cannot find private header tclInt.h in ${TCL_SRC_DIR}" "$LINENO" 5 fi result="Using srcdir found in tclConfig.sh: ${TCL_SRC_DIR}" fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${result}" >&5 $as_echo "${result}" >&6; } # Allow for --with-tkinclude to take effect and define ${ac_cv_c_tkh} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tk private include files" >&5 $as_echo_n "checking for Tk private include files... " >&6; } TK_SRC_DIR_NATIVE=`${CYGPATH} ${TK_SRC_DIR}` TK_TOP_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}\" # Check to see if tk<Plat>Port.h isn't already with the public headers # Don't look for tkInt.h because that resides with tk.h in the core # sources, but the <plat>Port headers are in a different directory if test "${TEA_PLATFORM}" = "windows" -a \ -f "${ac_cv_c_tkh}/tkWinPort.h"; then result="private headers found with public headers" elif test "${TEA_PLATFORM}" = "unix" -a \ -f "${ac_cv_c_tkh}/tkUnixPort.h"; then result="private headers found with public headers" else TK_GENERIC_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/generic\" TK_XLIB_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/xlib\" if test "${TEA_PLATFORM}" = "windows"; then TK_PLATFORM_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/win\" else TK_PLATFORM_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/unix\" fi # Overwrite the previous TK_INCLUDES as this should capture both # public and private headers in the same set. # 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 case ${PRACTCL_WINDOWINGSYSTEM} in cocoa) TK_INCLUDES="${TK_INCLUDES} -I\"${TK_XLIB_DIR_NATIVE}\"" TK_INCLUDES="${TK_INCLUDES} -I\"${TK_SRC_DIR_NATIVE}/macosx\"" ;; 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 TK_INCLUDES="-I\"${TK_BIN_DIR}/Headers\" -I\"${TK_BIN_DIR}/PrivateHeaders\" ${TK_INCLUDES}" else TK_INCLUDES="${TK_INCLUDES} ${TK_INCLUDE_SPEC} `echo "${TK_INCLUDE_SPEC}" | sed -e 's/Headers/PrivateHeaders/'`" fi ;; esac result="Using ${TK_INCLUDES}" else if test ! -f "${TK_SRC_DIR}/generic/tkInt.h" ; then as_fn_error $? "Cannot find private header tkInt.h in ${TK_SRC_DIR}" "$LINENO" 5 fi result="Using srcdir found in tkConfig.sh: ${TK_SRC_DIR}" fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${result}" >&5 $as_echo "${result}" >&6; } #TEA_ADD_CFLAGS([-ObjC -fobjc-gc]) PKG_CFLAGS="$PKG_CFLAGS -ObjC" #TEA_ADD_LIBS([-framework AGL -framework OpenGL -framework ApplicationServices -framework CoreFoundation -framework Cocoa]) : vars="-I\"${srcdir}/generic\"" for i in $vars; do PKG_INCLUDES="$PKG_INCLUDES $i" done |
< > > > > > > > > < > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
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 .... 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 .... 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5656 5657 5658 5659 5660 5661 5662 5663 5664 5665 5666 5667 5668 5669 5670 5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682 5683 5684 5685 5686 5687 5688 5689 5690 5691 5692 5693 5694 5695 5696 5697 5698 5699 5700 5701 5702 5703 5704 5705 5706 5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720 5721 5722 5723 5724 5725 5726 5727 5728 5729 5730 5731 5732 5733 5734 5735 5736 5737 5738 5739 5740 5741 5742 5743 5744 5745 5746 5747 5748 5749 5750 5751 5752 5753 5754 5755 5756 5757 5758 5759 5760 5761 5762 5763 5764 5765 5766 5767 5768 5769 5770 .... 6271 6272 6273 6274 6275 6276 6277 6278 6279 6280 6281 6282 6283 6284 6285 .... 6596 6597 6598 6599 6600 6601 6602 6603 6604 6605 6606 6607 6608 6609 6610 6611 6612 6613 6614 6615 6616 6617 6618 6619 6620 6621 6622 6623 6624 |
CELIB_DIR AR STUBS_BUILD SHARED_BUILD TCL_THREADS XMKMF TK_PATCH_LEVEL CAN3D_WINDOWINGSYSTEM TK_XLIB_DIR_NATIVE TK_TOP_DIR_NATIVE TK_INCLUDES TCL_TOP_DIR_NATIVE TCL_INCLUDES PKG_OBJECTS PKG_SOURCES TEACUP_PROFILE TEACUP_TOOLSET TEACUP_ARCH TEACUP_OS TEA_WINDOWINGSYSTEM TEA_PLATFORM TEA_SYSTEM MATH_LIBS EGREP GREP RANLIB SET_MAKE INSTALL_LIBRARY INSTALL_SCRIPT ................................................................................ case ${TK_DEFS} in *MAC_OSX_TK*) $as_echo "#define MAC_OSX_TK 1" >>confdefs.h 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 ................................................................................ # Let the user call this, because if it triggers, they will # need a compat/strtod.c that is correct. Users can also # use Tcl_GetDouble(FromObj) instead. #TEA_BUGGY_STRTOD fi #--- # Compute strings and data useful for the teapot #--- { $as_echo "$as_me:${as_lineno-$LINENO}: checking system version" >&5 $as_echo_n "checking system version... " >&6; } if ${tcl_cv_sys_version+:} false; then : $as_echo_n "(cached) " >&6 else # TEA specific: if test "${TEA_PLATFORM}" = "windows" ; then tcl_cv_sys_version=windows else tcl_cv_sys_version=`uname -s`-`uname -r` if test "$?" -ne 0 ; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: can't find uname command" >&5 $as_echo "$as_me: WARNING: can't find uname command" >&2;} tcl_cv_sys_version=unknown else if test "`uname -s`" = "AIX" ; then tcl_cv_sys_version=AIX-`uname -v`.`uname -r` fi fi fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_sys_version" >&5 $as_echo "$tcl_cv_sys_version" >&6; } system=$tcl_cv_sys_version 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 i*86) arch="ix86" ;; amd64) arch="x86_64" ;; esac TEACUP_PROFILE="$TEACUP_OS-$arch" fi TEA_SYSTEM=$system #----------------------------------------------------------------------- # __CHANGE__ # Specify the C source files to compile in TEA_ADD_SOURCES, # public headers that need to be installed in TEA_ADD_HEADERS, # stub library C source files to compile in TEA_ADD_STUB_SOURCES, # and runtime Tcl library files in TEA_ADD_TCL_SOURCES. ................................................................................ # and change Makefile.in to move it from CONFIG_CLEAN_FILES to BINARIES var. # # A few miscellaneous platform-specific items: # TEA_ADD_* any platform specific compiler/build info here. #-------------------------------------------------------------------- case ${PRACTCL_WINDOWINGSYSTEM} in cocoa) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl public headers" >&5 $as_echo_n "checking for Tcl public headers... " >&6; } # Check whether --with-tclinclude was given. if test "${with_tclinclude+set}" = set; then : ................................................................................ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${result}" >&5 $as_echo "${result}" >&6; } if test "${TEA_USE_HITHEME}" = "yes" ; then PKG_CFLAGS="$PKG_CFLAGS -ObjC" PKG_CFLAGS="$PKG_CFLAGS -DMACOSX_HITHEME=1" else PKG_CFLAGS="$PKG_CFLAGS -ObjC -fobjc-gc" fi #TEA_ADD_LIBS([-framework AGL -framework OpenGL -framework ApplicationServices -framework CoreFoundation -framework Cocoa]) : vars="-I\"${srcdir}/generic\"" for i in $vars; do PKG_INCLUDES="$PKG_INCLUDES $i" done |
Changes to configure.in.
57
58
59
60
61
62
63
64
65
66
67
68
69
70
..
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
|
# This sets up CC by using the CC env var, or looks for gcc otherwise. # This also calls AC_PROG_CC and a few others to create the basic setup # necessary to compile executables. #----------------------------------------------------------------------- TEA_SETUP_COMPILER #----------------------------------------------------------------------- # __CHANGE__ # Specify the C source files to compile in TEA_ADD_SOURCES, # public headers that need to be installed in TEA_ADD_HEADERS, # stub library C source files to compile in TEA_ADD_STUB_SOURCES, # and runtime Tcl library files in TEA_ADD_TCL_SOURCES. # This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS ................................................................................ # and change Makefile.in to move it from CONFIG_CLEAN_FILES to BINARIES var. # # A few miscellaneous platform-specific items: # TEA_ADD_* any platform specific compiler/build info here. #-------------------------------------------------------------------- case ${PRACTCL_WINDOWINGSYSTEM} in hitheme) TEA_PRIVATE_TCL_HEADERS TEA_PRIVATE_TK_HEADERS #TEA_ADD_CFLAGS([-ObjC -fobjc-gc]) TEA_ADD_CFLAGS([-ObjC]) #TEA_ADD_LIBS([-framework AGL -framework OpenGL -framework ApplicationServices -framework CoreFoundation -framework Cocoa]) : TEA_ADD_INCLUDES([-I\"${srcdir}/generic\"]) TEA_ADD_SOURCES([macosx/c3dCocoaMain.c]) TEA_ADD_LIBS([-framework OpenGL -framework ApplicationServices -framework CoreFoundation -framework Cocoa]) TEA_ADD_CFLAGS([-DMACOSX_HITHEME=1]) AC_SUBST(CAN3D_WINDOWINGSYSTEM,CAN3D_AGL) ;; cocoa) TEA_PRIVATE_TCL_HEADERS TEA_PRIVATE_TK_HEADERS #TEA_ADD_CFLAGS([-ObjC -fobjc-gc]) TEA_ADD_CFLAGS([-ObjC]) #TEA_ADD_LIBS([-framework AGL -framework OpenGL -framework ApplicationServices -framework CoreFoundation -framework Cocoa]) : TEA_ADD_INCLUDES([-I\"${srcdir}/generic\"]) TEA_ADD_SOURCES([macosx/c3dCocoaMain.c]) TEA_ADD_LIBS([-framework OpenGL -framework ApplicationServices -framework CoreFoundation -framework Cocoa]) AC_SUBST(CAN3D_WINDOWINGSYSTEM,CAN3D_AGL) ;; |
>
>
>
>
>
<
<
<
<
<
<
<
<
<
<
<
<
<
>
|
>
>
|
>
|
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
...
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
|
# This sets up CC by using the CC env var, or looks for gcc otherwise. # This also calls AC_PROG_CC and a few others to create the basic setup # necessary to compile executables. #----------------------------------------------------------------------- TEA_SETUP_COMPILER #--- # Compute strings and data useful for the teapot #--- TEA_CONFIG_TEAPOT #----------------------------------------------------------------------- # __CHANGE__ # Specify the C source files to compile in TEA_ADD_SOURCES, # public headers that need to be installed in TEA_ADD_HEADERS, # stub library C source files to compile in TEA_ADD_STUB_SOURCES, # and runtime Tcl library files in TEA_ADD_TCL_SOURCES. # This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS ................................................................................ # and change Makefile.in to move it from CONFIG_CLEAN_FILES to BINARIES var. # # A few miscellaneous platform-specific items: # TEA_ADD_* any platform specific compiler/build info here. #-------------------------------------------------------------------- case ${PRACTCL_WINDOWINGSYSTEM} in cocoa) TEA_PRIVATE_TCL_HEADERS TEA_PRIVATE_TK_HEADERS if test "${TEA_USE_HITHEME}" = "yes" ; then TEA_ADD_CFLAGS([-ObjC]) TEA_ADD_CFLAGS([-DMACOSX_HITHEME=1]) else TEA_ADD_CFLAGS([-ObjC -fobjc-gc]) fi #TEA_ADD_LIBS([-framework AGL -framework OpenGL -framework ApplicationServices -framework CoreFoundation -framework Cocoa]) : TEA_ADD_INCLUDES([-I\"${srcdir}/generic\"]) TEA_ADD_SOURCES([macosx/c3dCocoaMain.c]) TEA_ADD_LIBS([-framework OpenGL -framework ApplicationServices -framework CoreFoundation -framework Cocoa]) AC_SUBST(CAN3D_WINDOWINGSYSTEM,CAN3D_AGL) ;; |
Changes to tclconfig/tcl.m4.
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 |
;; esac if test "${TEA_USE_SDL}" = "yes" ; then true 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 TkAqua?]) TEA_WINDOWINGSYSTEM="aqua" PRACTCL_WINDOWINGSYSTEM="cocoa" if test "${TK_VERSION}" = "8.5" ; then if test "${TK_PATCH_LEVEL}" > ".17" ; then PRACTCL_WINDOWINGSYSTEM="hitheme" fi elif test "${TK_VERSION}" = "8.6" ; then if test "${TK_PATCH_LEVEL}" > ".3" ; then PRACTCL_WINDOWINGSYSTEM="hitheme" fi elif test "${TK_VERSION}" > "8.6" ; then PRACTCL_WINDOWINGSYSTEM="hitheme" fi ;; *) TEA_WINDOWINGSYSTEM="x11" PRACTCL_WINDOWINGSYSTEM="x11" ;; esac |
| > < > | | |
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 |
;; esac if test "${TEA_USE_SDL}" = "yes" ; then true 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 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 |