head 1.30; access; symbols pkgsrc-2013Q2:1.30.0.4 pkgsrc-2013Q2-base:1.30 pkgsrc-2012Q4:1.30.0.2 pkgsrc-2012Q4-base:1.30 pkgsrc-2012Q2:1.29.0.34 pkgsrc-2012Q2-base:1.29 pkgsrc-2012Q1:1.29.0.32 pkgsrc-2012Q1-base:1.29 pkgsrc-2011Q4:1.29.0.30 pkgsrc-2011Q4-base:1.29 pkgsrc-2011Q3:1.29.0.28 pkgsrc-2011Q3-base:1.29 pkgsrc-2011Q2:1.29.0.26 pkgsrc-2011Q2-base:1.29 pkgsrc-2011Q1:1.29.0.24 pkgsrc-2011Q1-base:1.29 pkgsrc-2010Q4:1.29.0.22 pkgsrc-2010Q4-base:1.29 pkgsrc-2010Q3:1.29.0.20 pkgsrc-2010Q3-base:1.29 pkgsrc-2010Q2:1.29.0.18 pkgsrc-2010Q2-base:1.29 pkgsrc-2010Q1:1.29.0.16 pkgsrc-2010Q1-base:1.29 pkgsrc-2009Q4:1.29.0.14 pkgsrc-2009Q4-base:1.29 pkgsrc-2009Q3:1.29.0.12 pkgsrc-2009Q3-base:1.29 pkgsrc-2009Q2:1.29.0.10 pkgsrc-2009Q2-base:1.29 pkgsrc-2009Q1:1.29.0.8 pkgsrc-2009Q1-base:1.29 pkgsrc-2008Q4:1.29.0.6 pkgsrc-2008Q4-base:1.29 pkgsrc-2008Q3:1.29.0.4 pkgsrc-2008Q3-base:1.29 cube-native-xorg:1.29.0.2 cube-native-xorg-base:1.29 pkgsrc-2008Q2:1.28.0.8 pkgsrc-2008Q2-base:1.28 cwrapper:1.28.0.6 pkgsrc-2008Q1:1.28.0.4 pkgsrc-2008Q1-base:1.28 pkgsrc-2007Q4:1.28.0.2 pkgsrc-2007Q4-base:1.28 pkgsrc-2007Q3:1.27.0.4 pkgsrc-2007Q3-base:1.27 pkgsrc-2007Q2:1.27.0.2 pkgsrc-2007Q2-base:1.27 pkgsrc-2007Q1:1.26.0.4 pkgsrc-2007Q1-base:1.26 pkgsrc-2006Q4:1.26.0.2 pkgsrc-2006Q4-base:1.26 pkgsrc-2006Q3:1.25.0.4 pkgsrc-2006Q3-base:1.25 pkgsrc-2006Q2:1.25.0.2 pkgsrc-2006Q2-base:1.25 pkgsrc-2006Q1:1.24.0.2 pkgsrc-2006Q1-base:1.24 pkgsrc-2005Q4:1.22.0.2 pkgsrc-2005Q4-base:1.22 pkgsrc-2005Q3:1.20.0.2 pkgsrc-2005Q3-base:1.20 pkgsrc-2005Q2:1.18.0.6 pkgsrc-2005Q2-base:1.18 pkgsrc-2005Q1:1.18.0.4 pkgsrc-2005Q1-base:1.18 pkgsrc-2004Q4:1.18.0.2 pkgsrc-2004Q4-base:1.18 pkgsrc-2004Q3:1.16.0.4 pkgsrc-2004Q3-base:1.16 pkgsrc-2004Q2:1.16.0.2 pkgsrc-2004Q2-base:1.16 pkgsrc-2004Q1:1.15.0.2 pkgsrc-2004Q1-base:1.15 pkgsrc-2003Q4:1.11.0.2 pkgsrc-2003Q4-base:1.11 netbsd-1-6-1:1.10.0.6 netbsd-1-6-1-base:1.10 netbsd-1-6:1.10.0.8 netbsd-1-6-RELEASE-base:1.10 pkgviews:1.10.0.4 pkgviews-base:1.10 buildlink2:1.10.0.2 buildlink2-base:1.10 netbsd-1-5-PATCH003:1.10 netbsd-1-5-PATCH001:1.5 netbsd-1-5-RELEASE:1.4 netbsd-1-4-PATCH003:1.4 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.30 date 2012.08.21.21.32.34; author marino; state dead; branches; next 1.29; 1.29 date 2008.07.20.23.35.20; author dbj; state Exp; branches; next 1.28; 1.28 date 2007.10.13.11.41.33; author adam; state Exp; branches; next 1.27; 1.27 date 2007.05.31.13.02.06; author adam; state Exp; branches; next 1.26; 1.26 date 2006.11.02.17.42.03; author adam; state Exp; branches; next 1.25; 1.25 date 2006.04.27.08.18.09; author adam; state Exp; branches; next 1.24; 1.24 date 2006.02.23.23.31.52; author minskim; state Exp; branches; next 1.23; 1.23 date 2006.01.16.14.48.34; author adam; state Exp; branches; next 1.22; 1.22 date 2005.11.03.23.09.24; author rillig; state Exp; branches; next 1.21; 1.21 date 2005.11.02.15.41.25; author joerg; state Exp; branches; next 1.20; 1.20 date 2005.09.21.14.49.08; author joerg; state Exp; branches; next 1.19; 1.19 date 2005.07.19.11.12.25; author adam; state Exp; branches; next 1.18; 1.18 date 2004.11.26.10.31.09; author adam; state Exp; branches; next 1.17; 1.17 date 2004.10.01.13.35.53; author adam; state Exp; branches; next 1.16; 1.16 date 2004.04.09.23.39.00; author danw; state Exp; branches; next 1.15; 1.15 date 2004.03.25.22.49.15; author jlam; state Exp; branches; next 1.14; 1.14 date 2004.03.11.01.27.05; author minskim; state Exp; branches; next 1.13; 1.13 date 2004.03.08.22.14.19; author minskim; state Exp; branches; next 1.12; 1.12 date 2004.03.08.20.29.43; author minskim; state Exp; branches; next 1.11; 1.11 date 2003.03.16.18.37.43; author jschauma; state Exp; branches; next 1.10; 1.10 date 2002.01.05.23.47.19; author tron; state Exp; branches; next 1.9; 1.9 date 2001.12.23.17.11.30; author bjoern; state Exp; branches; next 1.8; 1.8 date 2001.10.23.09.55.47; author jlam; state Exp; branches; next 1.7; 1.7 date 2001.07.29.07.54.57; author tron; state Exp; branches; next 1.6; 1.6 date 2001.05.24.02.58.30; author jlam; state Exp; branches; next 1.5; 1.5 date 2001.04.18.18.15.41; author jwise; state Exp; branches; next 1.4; 1.4 date 2000.09.01.16.22.00; author jwise; state Exp; branches; next 1.3; 1.3 date 2000.08.31.16.48.11; author jwise; state Exp; branches; next 1.2; 1.2 date 2000.08.30.20.22.36; author jwise; state Exp; branches; next 1.1; 1.1 date 2000.08.29.16.16.07; author jwise; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.08.29.16.16.07; author jwise; state Exp; branches; next ; desc @@ 1.30 log @x11/tk: Upgrade from version 8.4.18 to 8.5.12 Highlights of Tk 8.5 * New modern theming engine: New and complementary widgets that make use of platform-specific theming on Mac OS X and Windows to better fit in with those environments, and feature an improved look and feel under X11. * New widgets: Part of the themed widget set, Tk now has core notebook, combobox, treeview and progressbar widgets. * text widget: Smooth scrolling, widget peering, and improved procedures for counting and replacing text. * Font rendering: Now uses anti-aliased text under X11, and a more modern text engine (ATSUI) on Mac OS X. * Additional improvements: Window transparency, new fullscreen option for windows, enhancements to specific widgets and window layout, and more. There is of course much, much more. See [8.5 Changes](http://wiki.tcl.tk/10630) on the wiki for a complete list of new features. @ text @$NetBSD: patch-ab,v 1.29 2008/07/20 23:35:20 dbj Exp $ --- unix/configure.orig 2007-09-21 19:04:18.000000000 +0200 +++ unix/configure @@@@ -2062,12 +2062,13 @@@@ fi # Step 3: set configuration options based on system name and version. do64bit_ok=no + RPATH_FLAG="" LDFLAGS_ORIG="$LDFLAGS" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' ECHO_VERSION='`echo ${VERSION}`' - TCL_LIB_VERSIONS_OK=ok + TCL_LIB_VERSIONS_OK=nodots CFLAGS_DEBUG=-g CFLAGS_OPTIMIZE=-O if test "$GCC" = "yes" ; then @@@@ -2794,7 +2795,6 @@@@ if eval "test \"`echo '$ac_cv_header_'$a # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" @@@@ -2829,6 +2829,9 @@@@ rm -f conftest* fi echo "$ac_t""$tcl_cv_ld_elf" 1>&6 + SHLIB_LD='${TCL_CC} -shared -Wl,-x' + RPATH_FLAG='-Wl,-R' + LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' if test $tcl_cv_ld_elf = yes; then SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' else @@@@ -2926,12 +2929,13 @@@@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6 UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' TCL_LIB_VERSIONS_OK=nodots ;; - FreeBSD-*) + FreeBSD-*|DragonFly-*) # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" SHLIB_LD="ld -Bshareable -x" SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" + RPATH_FLAG='-Wl,-R' DL_OBJS="tclLoadDl.o" DL_LIBS="" LDFLAGS="$LDFLAGS -export-dynamic" @@@@ -3768,7 +3772,7 @@@@ fi ;; IRIX*) ;; - NetBSD-*|FreeBSD-*|OpenBSD-*) + NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;; Darwin-*) ;; @@@@ -3786,16 +3790,16 @@@@ fi fi if test "$SHARED_LIB_SUFFIX" = "" ; then - SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}${SHLIB_SUFFIX}' fi if test "$UNSHARED_LIB_SUFFIX" = "" ; then - UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' fi if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then LIB_SUFFIX=${SHARED_LIB_SUFFIX} - MAKE_LIB='${SHLIB_LD} -o $@@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' + MAKE_LIB='${SHLIB_LD} -o $@@ ${OBJS:.o=.lo} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0' + INSTALL_LIB='$(INSTALL_LIBRARY) $(TK_LA_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' else LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} @@@@ -5346,7 +5350,11 @@@@ echo "configure:5344: checking for X11 l for i in $dirs ; do if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then echo "$ac_t""$i" 1>&6 - XLIBSW="-L$i -lX11" + if test "${RPATH_FLAG}" != ""; then + XLIBSW="-L$i ${RPATH_FLAG}$i -lX11" + else + XLIBSW="-L$i -lX11" + fi x_libraries="$i" break fi @@@@ -5355,7 +5363,11 @@@@ echo "configure:5344: checking for X11 l if test "$x_libraries" = ""; then XLIBSW=-lX11 else - XLIBSW="-L$x_libraries -lX11" + if test "${RPATH_FLAG}" != ""; then + XLIBSW="-L$x_libraries ${RPATH_FLAG}$x_libraries -lX11" + else + XLIBSW="-L$x_libraries -lX11" + fi fi fi if test "$XLIBSW" = nope ; then @@@@ -5427,6 +5439,10 @@@@ if test "x${x_libraries}" != "x"; then fi if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'` +elif test "${TCL_LD_SEARCH_FLAGS}" = '-R${LIB_RUNTIME_DIR}'; then + LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -R/g'` +elif test "${TCL_LD_SEARCH_FLAGS}" = '-Wl,-R${LIB_RUNTIME_DIR}'; then + LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -Wl,-R/g'` fi # The statement below is very tricky! It actually *evaluates* the @@@@ -5965,11 +5981,18 @@@@ else if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}" + eval TK_BUILD_LIB_SPEC="libtk${VERSION}\${TK_DBGX}.la" else eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" + eval TK_BUILD_LIB_SPEC="libtk`echo ${VERSION} | tr -d .`\${TK_DBGX}.la" fi - TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" + if test "${RPATH_FLAG}" != ""; then + TK_LIB_SPEC_RPATH="${RPATH_FLAG}${exec_prefix}/lib" + else + TK_LIB_SPEC_RPATH="" + fi + TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_SPEC_RPATH} ${TK_LIB_FLAG}" else TK_BUILD_EXP_FILE="lib.exp" eval "TK_EXP_FILE=libtk${TCL_EXPORT_FILE_SUFFIX}" @ 1.29 log @include LDFLAGS when creating shared library. This fixes build problems on darwin @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.28 2007/10/13 11:41:33 adam Exp $ @ 1.28 log @Changes 8.4.16: * Bug fixes * Improvements @ text @d1 1 a1 1 $NetBSD$ d78 1 a78 1 + MAKE_LIB='${SHLIB_LD} -o $@@ ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0' @ 1.27 log @Changes 8.4.15: * Minor bugfixes @ text @d3 1 a3 1 --- unix/configure.orig 2007-05-25 18:09:53.000000000 +0200 d53 1 a53 1 @@@@ -3758,7 +3762,7 @@@@ fi d62 1 a62 1 @@@@ -3776,16 +3780,16 @@@@ fi d83 1 a83 1 @@@@ -5336,7 +5340,11 @@@@ echo "configure:5334: checking for X11 l d96 1 a96 1 @@@@ -5345,7 +5353,11 @@@@ echo "configure:5334: checking for X11 l d109 1 a109 1 @@@@ -5417,6 +5429,10 @@@@ if test "x${x_libraries}" != "x"; then d120 1 a120 1 @@@@ -5951,11 +5967,18 @@@@ else @ 1.26 log @Changes 8.4.14: * Tk_PhotoPutBlock performance restored (JPEG image loading). * [namespace inscope] change reverted; harmed Itcl. * Made [expr {srand(.)}] accept wide integer argument. * Made [lappend $invalidList] raise an error. * Improved [text] delete performance. * Support for the WM_UNICHAR window message on Windows * Stopped excess variable writes by [scale]. * Tcl_Main no longer blocks main loop start for one interactive command. * [console] made thread safe. * Thread-enabled configuration uses MT-safe system calls. * Many Aqua/Tk bug fixes and improvements, see changes file. * Made unthreaded notifier naked-fork-safe on Darwin. * Support for weak linking on Mac OS X. * msgcat support for CFLocale on Darwin (msgcat 1.3.4) * Fixed crashes due to alignment issues in encoding translation routines. * Fixed crash with [listbox -listvariable] on namespace variable. * Fixed crash when Tcl_DeleteTrace changes proc on the active stack. * Fixed crash when normalizing filesystem pathnames. * Fixed crash due to invalid font name from XServer. * Several 64-bit bugs fixed and platform support enhanced. @ text @d3 1 a3 1 --- unix/configure.orig 2006-10-19 19:27:34.000000000 +0200 d5 1 a5 1 @@@@ -2055,12 +2055,13 @@@@ fi d20 1 a20 1 @@@@ -2747,7 +2748,6 @@@@ if eval "test \"`echo '$ac_cv_header_'$a d28 1 a28 1 @@@@ -2782,6 +2782,9 @@@@ rm -f conftest* d38 1 a38 1 @@@@ -2879,12 +2882,13 @@@@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6 d53 1 a53 1 @@@@ -3635,7 +3639,7 @@@@ fi d62 1 a62 1 @@@@ -3653,16 +3657,16 @@@@ fi d83 1 a83 1 @@@@ -5213,7 +5217,11 @@@@ echo "configure:5211: checking for X11 l d96 1 a96 1 @@@@ -5222,7 +5230,11 @@@@ echo "configure:5211: checking for X11 l d109 1 a109 1 @@@@ -5294,6 +5306,10 @@@@ if test "x${x_libraries}" != "x"; then d120 1 a120 1 @@@@ -5827,11 +5843,18 @@@@ else @ 1.25 log @Changes 8.4.13: * Win NT/XP: unicode console support taken back out. * ${prefix}/share addition to ::tcl_pkgPath undone. * Warning message for packages with incorrect index scripts silenced. * Correct syntax error in configure script (bash 3.1 exposes it). * Tk incompatibilities with SCIM resolved. * Improved [file writable] support of Windows conventions. * Tcl_GetIndexFromObj() support for exact matching of empty key. * Tk Portuguese localization support (pt.msg). * Tk more robust when X server does not recognize color name "Black". * Tk_PhotoPutBlock() performance improvement. * [lsearch -start $pastEnd] no longer finds match at end of list. * Correct [expr abs($LONG_MIN)] result. * Correct [string range] failures on some strings containing \x00. * TCL_EVAL_GLOBAL and [uplevel 0] agreement when traces or [unknown] active. * Corrections to context of auto-loading the target of an interp alias. * Corrected some interference between enter and enterstep traces. * Correct [$img configure -data] failure to change X display. * Tk_GetBitmapFromData() thread safety. * Crashes in [grid] for some invalid index arguments. * Crash when all content of a [text] is elided. * Crash in [$text edit undo/redo]. * Crash in animated GIF display with variable frame size. * Crash related to pipe usage in thread-enabled Tcl on Windows. * Crash when [$text dump -command] changes contents while dumping. * Crash reading utf-8 when multibyte char spans multiple buffers at EOF. * Several finalization crashes corrected. @ text @d3 1 a3 1 --- unix/configure.orig 2006-04-19 14:29:37.000000000 +0200 d5 1 a5 1 @@@@ -2054,12 +2054,13 @@@@ fi d20 1 a20 1 @@@@ -2746,7 +2747,6 @@@@ if eval "test \"`echo '$ac_cv_header_'$a d28 1 a28 1 @@@@ -2781,6 +2781,9 @@@@ rm -f conftest* d38 1 a38 1 @@@@ -2878,12 +2881,13 @@@@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6 d53 1 a53 1 @@@@ -3837,7 +3841,7 @@@@ fi d62 1 a62 1 @@@@ -3855,16 +3859,16 @@@@ fi d83 1 a83 1 @@@@ -5405,7 +5409,11 @@@@ echo "configure:5403: checking for X11 l d96 1 a96 1 @@@@ -5414,7 +5422,11 @@@@ echo "configure:5403: checking for X11 l d109 1 a109 1 @@@@ -5486,6 +5498,10 @@@@ if test "x${x_libraries}" != "x"; then d120 1 a120 1 @@@@ -6019,11 +6035,18 @@@@ else @ 1.24 log @Add link options to have a correct dependency_libs line in .la files on NetBSD. This fixes PR pkg/32915. Bump PKGREVISION. @ text @d3 1 a3 1 --- unix/configure.orig 2005-12-06 02:42:37.000000000 +0000 d5 1 a5 1 @@@@ -2007,12 +2007,13 @@@@ fi d20 1 a20 1 @@@@ -2699,8 +2700,7 @@@@ if eval "test \"`echo '$ac_cv_header_'$a d25 1 a25 2 - SHLIB_LD_LIBS="" + SHLIB_LD_LIBS='${LIBS}' d28 1 a28 24 DL_LIBS="" @@@@ -2720,13 +2720,23 @@@@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then rm -rf conftest* - echo "$ac_t""yes" 1>&6 + + echo "$ac_t""yes" 1>&6 + SHLIB_LD='${TCL_CC} -shared -Wl,-x' + RPATH_FLAG='-Wl,-R' + LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + else rm -rf conftest* - echo "$ac_t""no" 1>&6 + + echo "$ac_t""no" 1>&6 + SHLIB_LD="ld -Bshareable -x" + RPATH_FLAG='-R' + LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}' SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' + a29 1 rm -f conftest* d31 8 a38 1 @@@@ -2813,12 +2823,13 @@@@ rm -f conftest* d53 1 a53 1 @@@@ -3748,7 +3759,7 @@@@ fi d62 1 a62 1 @@@@ -3766,16 +3777,16 @@@@ fi d83 1 a83 1 @@@@ -5313,7 +5324,11 @@@@ echo "configure:5311: checking for X11 l d96 1 a96 1 @@@@ -5322,7 +5337,11 @@@@ echo "configure:5311: checking for X11 l d109 1 a109 1 @@@@ -5394,6 +5413,10 @@@@ if test "x${x_libraries}" != "x"; then d120 1 a120 1 @@@@ -5927,11 +5950,18 @@@@ else @ 1.23 log @Changes 8.4.12: * Repeated [namespace import] of same command now permitted. * ${prefix}/share added to ::tcl_pkgPath on some systems. * [exec]'s >> redirection has improved append behavior. * [info globals] returned only existing variables. * Recognize some Solaris variations of the cp1251 encoding. * Addressed [file mkdir] race condition. * Support opening >2GB files on RHEL 3. * Corrections to $argv formatting when [encoding system] is multibyte. * http 2.5.2: Update URL encoding rules to RFC 3986. * Fixed issue in recursive file delete with NFS lock files. * Stopped crash after use of Tcl_TraceCommand(). * Win NT/XP: support unicode console. * Improved support for Tclkit to set [encoding system]. * Added Korean timezone abbreviations. * Windows: exit codes can now exceed -128..127 range. * [load] support on LynxOS. * Packages with incorrect index scripts now cause a warning to be logged. *** POTENTIAL INCOMPATIBILITY *** * [lsearch -regexp] now accepts backrefs in the RE. * [selection get] made compatible with OpenOffice.org. * Dialog support for widget names containing spaces. * Improved Tk window manager event interaction on OS X Aqua. @ text @d3 1 a3 1 --- unix/configure.orig 2005-12-06 03:42:37.000000000 +0100 d20 1 a20 1 @@@@ -2699,7 +2700,6 @@@@ if eval "test \"`echo '$ac_cv_header_'$a d25 2 a26 1 SHLIB_LD_LIBS="" d29 1 @ 1.22 log @Fixed wrong use of WRKSRC. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.21 2005/11/02 15:41:25 joerg Exp $ d3 1 a3 1 --- unix/configure.orig 2005-06-29 16:43:10.000000000 +0000 d5 1 a5 1 @@@@ -1910,12 +1910,13 @@@@ fi d20 1 a20 1 @@@@ -2585,7 +2586,6 @@@@ if eval "test \"`echo '$ac_cv_header_'$a d28 1 a28 1 @@@@ -2606,13 +2606,23 @@@@ EOF d54 1 a54 1 @@@@ -2699,12 +2709,13 @@@@ rm -f conftest* d69 1 a69 1 @@@@ -3521,7 +3532,7 @@@@ fi d78 1 a78 1 @@@@ -3539,16 +3550,16 @@@@ fi d99 1 a99 1 @@@@ -5091,7 +5102,11 @@@@ echo "configure:5089: checking for X11 l d112 1 a112 1 @@@@ -5100,7 +5115,11 @@@@ echo "configure:5089: checking for X11 l d125 1 a125 1 @@@@ -5172,6 +5191,10 @@@@ if test "x${x_libraries}" != "x"; then d136 1 a136 1 @@@@ -5823,11 +5846,18 @@@@ else @ 1.21 log @RPATH_FLAG needs to be defined for FreeBSD 3+ and DragonFly as well, since otherwise libtk84.so depends on libX11.so without knowing where to find it. approved-by: jwise@@ @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.20 2005/09/21 14:49:08 joerg Exp $ d3 2 a4 2 --- configure.orig 2005-06-29 16:43:10.000000000 +0000 +++ configure @ 1.20 log @Ensure that errno really comes from errno.h and only define it as extern, if it's not a macro. Teach configure about DragonFly. OKed by maintainer. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.19 2005/07/19 11:12:25 adam Exp $ d54 1 a54 1 @@@@ -2699,7 +2709,7 @@@@ rm -f conftest* d63 7 a69 1 @@@@ -3521,7 +3531,7 @@@@ fi d78 1 a78 1 @@@@ -3539,16 +3549,16 @@@@ fi d99 1 a99 1 @@@@ -5091,7 +5101,11 @@@@ echo "configure:5089: checking for X11 l d112 1 a112 1 @@@@ -5100,7 +5114,11 @@@@ echo "configure:5089: checking for X11 l d125 1 a125 1 @@@@ -5172,6 +5190,10 @@@@ if test "x${x_libraries}" != "x"; then d136 1 a136 1 @@@@ -5823,11 +5845,18 @@@@ else @ 1.19 log @Changes 8.4.11: * Bug fixes @ text @d1 1 a1 1 $NetBSD$ d54 18 @ 1.18 log @Changes 8.4.8: * Fixed possible deadlock in Tcl_Finalize * Fixed thread IDs on 64-bit systems * Fixed [scan %ld] handling LP64 systems * Fixed [string map $samevar $samevar] crash * Fixed broken [namespace forget] logic * Fixed [namespace import] cycle prevention * Improved control over int <-> wideInt conversion * Fixed buffer overflow when there is a syntax error in [subst] * Fixed [file executable] result for case insensitivity on Windows * Fixed [expr {NaN == NaN}] result * Make [tcl_findLibrary] search $::auto_path as well * Fixed crash in [fconfigure -ttycontrol] in threaded build * [TIP 222] implementation of [wm attributes -alpha] on Windows * [TIP 159] implementation of [wm iconphoto] * Make Tk [load]-able on OS X/Aqua * Handle color/screen resolution changes on Windows * Fixed [wm resizable] for Solaris/CDE * Handle Windows native dialog double clicks that fall through * Fixed [place forget] memory leak * Recompute menu geometry on named font size change * Fixed X/IME IC focus after creation * Improved multiple display Tk dialog window placement * Fixed compound buttons for OS X/Aqua * Documentation improvements and test suite expansion @ text @d3 1 a3 1 --- configure.orig 2004-11-19 18:50:17.000000000 +0000 d5 1 a5 1 @@@@ -1815,12 +1815,13 @@@@ fi d20 1 a20 1 @@@@ -2522,7 +2523,6 @@@@ if eval "test \"`echo '$ac_cv_header_'$a d28 1 a28 1 @@@@ -2543,13 +2543,23 @@@@ EOF d54 1 a54 1 @@@@ -3163,16 +3173,16 @@@@ fi d68 1 a68 1 - MAKE_LIB='${SHLIB_LD} -o $@@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' d70 1 a70 1 + MAKE_LIB='${SHLIB_LD} -o $@@ ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0' d75 1 a75 1 @@@@ -4526,7 +4536,11 @@@@ echo "configure:4524: checking for X11 l d88 1 a88 1 @@@@ -4535,7 +4549,11 @@@@ echo "configure:4524: checking for X11 l d101 1 a101 1 @@@@ -4605,6 +4623,10 @@@@ if test "x${x_libraries}" != "x"; then d112 17 a128 5 @@@@ -5156,11 +5178,18 @@@@ eval "TK_LIB_FILE=${TK_LIB_FILE}" if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}" + eval TK_BUILD_LIB_SPEC="libtk${VERSION}\${TK_DBGX}.la" d130 2 a131 14 eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" + eval TK_BUILD_LIB_SPEC="libtk`echo ${VERSION} | tr -d .`\${TK_DBGX}.la" fi - TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}" + if test "${RPATH_FLAG}" != ""; then + TK_LIB_SPEC_RPATH="${RPATH_FLAG}${exec_prefix}/lib" + else + TK_LIB_SPEC_RPATH="" + fi + TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_SPEC_RPATH} ${TK_LIB_FLAG}" TK_BUILD_EXP_FILE="" TK_EXP_FILE="" else @ 1.17 log @Changes 8.4.7: * Fixed [glob -path] bug when in the root directory * Fixed unicode-char path installation on Windows NT-based platforms * Properly subsitute more values in Windows tclConfig.sh * Improved stack overflow prevention on Windows * Fixed mem leak in [fconfigure $serial -xchar] * Fixed crash with [cd] with a volumerelative $HOME * Fixed clock %G %V formats for ISO8601 week numbers * Fixed support for non-WIDE_INT aware math functions * Added [http::config -urlencoding] option * Fixed utf-8 encoding of \u0000 on system I/O * Prevented dde hangs with non-responsive apps * Added round() wide integer support * Cleaner exit and correction of mem leaks when using the threaded memory allocator and reinitializing * Improved build configuration on 64-bit systems * Added read support of PPM/PGM with the -data option * Correct issue with displaying maximize window button on KDE-3.2.1 * Fix drawing of unicode chars in menu titles on Windows * Correctly post Tk clipboard data to the Windows clipboard on exit * Fix the panedwindow -opaqueresize option to work as per the docs * Reduce Tk tk_messageBox default font size to 14-point * Prevent possible segfault in -maxundo * Fix XIM initialization on Solaris * Complete the implementation of the CG version of the X drawing emulation layer on Mac OS X * Fix several Mac OS X usability issues @ text @d3 1 a3 1 --- configure.orig 2004-07-29 21:57:48.000000000 +0000 d5 1 a5 1 @@@@ -1788,12 +1788,13 @@@@ fi d20 1 a20 1 @@@@ -2495,7 +2496,6 @@@@ if eval "test \"`echo '$ac_cv_header_'$a d28 1 a28 1 @@@@ -2516,13 +2516,23 @@@@ EOF d54 1 a54 1 @@@@ -3136,16 +3146,16 @@@@ fi d75 1 a75 1 @@@@ -4499,7 +4509,11 @@@@ echo "configure:4497: checking for X11 l d88 1 a88 1 @@@@ -4508,7 +4522,11 @@@@ echo "configure:4497: checking for X11 l d101 1 a101 1 @@@@ -4578,6 +4596,10 @@@@ if test "x${x_libraries}" != "x"; then d112 1 a112 1 @@@@ -5129,11 +5151,18 @@@@ eval "TK_LIB_FILE=${TK_LIB_FILE}" @ 1.16 log @Fix up some Makefile logic that got broken by the libtool patches (and prevented it from building on some platforms). Ensure that the built library is named libtk84 (as opposed to libtk8.4) on all platforms. @ text @d3 1 a3 1 --- configure.orig Mon Mar 1 19:04:48 2004 d5 1 a5 1 @@@@ -2071,12 +2071,13 @@@@ fi d10 1 a10 1 EXTRA_CFLAGS="" d20 1 a20 203 @@@@ -2140,7 +2141,7 @@@@ fi SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" - LDFLAGS="" + LD_FLAGS="" LD_LIBRARY_PATH_VAR="LIBPATH" @@@@ -2151,7 +2152,7 @@@@ fi else do64bit_ok=yes EXTRA_CFLAGS="-q64" - LDFLAGS="-q64" + LD_FLAGS="-q64" RANLIB="${RANLIB} -X64" AR="${AR} -X64" SHLIB_LD_FLAGS="-b64" @@@@ -2192,7 +2193,7 @@@@ fi SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} LD_LIBRARY_PATH_VAR="LIBPATH" @@@@ -2212,7 +2213,7 @@@@ fi else do64bit_ok=yes EXTRA_CFLAGS="-q64" - LDFLAGS="-q64" + LD_FLAGS="-q64" RANLIB="${RANLIB} -X64" AR="${AR} -X64" SHLIB_LD_FLAGS="-b64" @@@@ -2288,7 +2289,7 @@@@ EOF SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -2299,7 +2300,7 @@@@ EOF SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="-export-dynamic" + LD_FLAGS="-export-dynamic" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -2310,7 +2311,7 @@@@ EOF SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -2374,7 +2375,7 @@@@ fi SHLIB_LD_LIBS='${LIBS}' DL_OBJS="tclLoadShl.o" DL_LIBS="-ldld" - LDFLAGS="-Wl,-E" + LD_FLAGS="-Wl,-E" CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' LD_LIBRARY_PATH_VAR="SHLIB_PATH" @@@@ -2410,10 +2411,10 @@@@ fi do64bit_ok=yes if test "`uname -m`" = "ia64" ; then EXTRA_CFLAGS="+DD64" - LDFLAGS="+DD64 $LDFLAGS" + LD_FLAGS="+DD64 $LD_FLAGS" else EXTRA_CFLAGS="+DA2.0W" - LDFLAGS="+DA2.0W $LDFLAGS" + LD_FLAGS="+DA2.0W $LD_FLAGS" fi fi fi @@@@ -2467,7 +2468,7 @@@@ fi SHLIB_LD_LIBS="" DL_OBJS="tclLoadShl.o" DL_LIBS="-ldld" - LDFLAGS="-Wl,-E" + LD_FLAGS="-Wl,-E" CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' LD_LIBRARY_PATH_VAR="SHLIB_PATH" @@@@ -2480,7 +2481,7 @@@@ fi SHLIB_LD_LIBS='${LIBS}' DL_OBJS="tclLoadAout.o" DL_LIBS="" - LDFLAGS="-Wl,-D,08000000" + LD_FLAGS="-Wl,-D,08000000" CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a' @@@@ -2495,7 +2496,7 @@@@ fi CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' EXTRA_CFLAGS="" - LDFLAGS="" + LD_FLAGS="" ;; IRIX-6.*) SHLIB_CFLAGS="" @@@@ -2508,7 +2509,7 @@@@ fi LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' if test "$GCC" = "yes" ; then EXTRA_CFLAGS="-mabi=n32" - LDFLAGS="-mabi=n32" + LD_FLAGS="-mabi=n32" else case $system in IRIX-6.3) @@@@ -2519,7 +2520,7 @@@@ fi EXTRA_CFLAGS="-n32" ;; esac - LDFLAGS="-n32" + LD_FLAGS="-n32" fi ;; IRIX64-6.*) @@@@ -2529,7 +2530,7 @@@@ fi SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' @@@@ -2542,7 +2543,7 @@@@ fi do64bit_ok=yes SHLIB_LD="ld -64 -shared -rdata_shared" EXTRA_CFLAGS="-64" - LDFLAGS="-64" + LD_FLAGS="-64" fi fi ;; @@@@ -2561,7 +2562,7 @@@@ fi SHLIB_LD="${CC} -shared" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="-rdynamic" + LD_FLAGS="-rdynamic" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} else @@@@ -2597,7 +2598,7 @@@@ if eval "test \"`echo '$ac_cv_header_'$a SHLIB_LD="ld -shared" DL_OBJS="tclLoadDld.o" DL_LIBS="-ldld" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" else @@@@ -2636,7 +2637,7 @@@@ EOF SHLIB_LD="${CC} -shared" DL_OBJS="" DL_LIBS="-ldl" - LDFLAGS="-rdynamic" + LD_FLAGS="-rdynamic" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" else @@@@ -2672,7 +2673,7 @@@@ if eval "test \"`echo '$ac_cv_header_'$a SHLIB_LD="ld -shared" DL_OBJS="" DL_LIBS="-ldld" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" else @@@@ -2691,7 +2692,7 @@@@ fi SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -2702,7 +2703,7 @@@@ fi SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="-Wl,-Bexport" + LD_FLAGS="-Wl,-Bexport" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -2739,12 +2740,11 @@@@ if eval "test \"`echo '$ac_cv_header_'$a d28 1 a28 7 DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' echo $ac_n "checking for ELF""... $ac_c" 1>&6 @@@@ -2761,13 +2761,23 @@@@ EOF d54 1 a54 191 @@@@ -2781,7 +2791,7 @@@@ else SHLIB_SUFFIX=".a" DL_OBJS="tclLoadAout.o" DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' @@@@ -2802,14 +2812,14 @@@@ fi SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="-export-dynamic" + LD_FLAGS="-export-dynamic" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' if test "${TCL_THREADS}" = "1" ; then # The -pthread needs to go in the CFLAGS, not LIBS LIBS=`echo $LIBS | sed s/-pthread//` EXTRA_CFLAGS="-pthread" - LDFLAGS="$LDFLAGS -pthread" + LD_FLAGS="$LD_FLAGS -pthread" fi case $system in FreeBSD-3.*) @@@@ -2830,7 +2840,7 @@@@ fi DL_OBJS="tclLoadDyld.o" PLAT_OBJS="tclMacOSXBundle.o" DL_LIBS="" - LDFLAGS="-prebind" + LD_FLAGS="-prebind" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" CFLAGS_OPTIMIZE="-Os" @@@@ -2847,7 +2857,7 @@@@ fi SHLIB_SUFFIX=".so" DL_OBJS="tclLoadNext.o" DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -2867,7 +2877,7 @@@@ EOF SHLIB_SUFFIX=".so" DL_OBJS="tclLoadOSF.o" DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -2883,7 +2893,7 @@@@ EOF SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -2899,7 +2909,7 @@@@ EOF SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' if test "$GCC" = "yes" ; then @@@@ -2916,7 +2926,7 @@@@ EOF LIBS="$LIBS -lpthread -lmach -lexc" else EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread" - LDFLAGS="-pthread" + LD_FLAGS="-pthread" fi fi @@@@ -2931,7 +2941,7 @@@@ EOF DL_OBJS="tclLoadDl.o" # dlopen is in -lc on QNX DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -2942,7 +2952,7 @@@@ EOF SHLIB_SUFFIX=".a" DL_OBJS="tclLoadAout.o" DL_LIBS="" - LDFLAGS="-Wl,-D,08000000" + LD_FLAGS="-Wl,-D,08000000" CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} ;; @@@@ -2952,10 +2962,10 @@@@ EOF # below. if test "$GCC" = "yes" ; then SHLIB_CFLAGS="-fPIC -melf" - LDFLAGS="-melf -Wl,-Bexport" + LD_FLAGS="-melf -Wl,-Bexport" else SHLIB_CFLAGS="-Kpic -belf" - LDFLAGS="-belf -Wl,-Bexport" + LD_FLAGS="-belf -Wl,-Bexport" fi SHLIB_LD="ld -G" SHLIB_LD_LIBS="" @@@@ -2972,7 +2982,7 @@@@ EOF SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@@@ -2983,7 +2993,7 @@@@ EOF SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} @@@@ -3019,7 +3029,7 @@@@ EOF SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="" + LD_FLAGS="" if test "$GCC" = "yes" ; then SHLIB_LD="$CC -shared" CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' @@@@ -3045,7 +3055,7 @@@@ EOF SHLIB_CFLAGS="-KPIC" - LDFLAGS="" + LD_FLAGS="" # Check to enable 64-bit flags for compiler/linker if test "$do64bit" = "yes" ; then @@@@ -3057,10 +3067,10 @@@@ EOF do64bit_ok=yes if test "$do64bitVIS" = "yes" ; then EXTRA_CFLAGS="-xarch=v9a" - LDFLAGS="-xarch=v9a" + LD_FLAGS="-xarch=v9a" else EXTRA_CFLAGS="-xarch=v9" - LDFLAGS="-xarch=v9" + LD_FLAGS="-xarch=v9" fi fi else @@@@ -3092,7 +3102,7 @@@@ EOF SHLIB_LD_LIBS='${LIBS}' DL_OBJS="tclLoadAout.o" DL_LIBS="" - LDFLAGS="-Wl,-D,08000000" + LD_FLAGS="-Wl,-D,08000000" CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} if test "$GCC" != "yes" ; then @@@@ -3133,9 +3143,9 @@@@ rm -f conftest* LDFLAGS=$hold_ldflags echo "$ac_t""$found" 1>&6 if test $found = yes; then - LDFLAGS="-Wl,-Bexport" + LD_FLAGS="-Wl,-Bexport" else - LDFLAGS="" + LD_FLAGS="" fi CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" @@@@ -3310,7 +3320,7 @@@@ fi SHLIB_SUFFIX="" DL_OBJS="tclLoadNone.o" DL_LIBS="" - LDFLAGS="" + LD_FLAGS="" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" BUILD_DLTEST="" @@@@ -3347,16 +3357,16 @@@@ fi d75 1 a75 1 @@@@ -4428,7 +4438,11 @@@@ echo "configure:4426: checking for X11 l d88 1 a88 1 @@@@ -4437,7 +4451,11 @@@@ echo "configure:4426: checking for X11 l d101 1 a101 1 @@@@ -4507,6 +4525,10 @@@@ if test "x${x_libraries}" != "x"; then d112 1 a112 1 @@@@ -5156,11 +5178,18 @@@@ eval "TK_LIB_FILE=${TK_LIB_FILE}" a131 8 @@@@ -5405,6 +5434,7 @@@@ s%@@LDFLAGS_DEBUG@@%$LDFLAGS_DEBUG%g s%@@LDFLAGS_OPTIMIZE@@%$LDFLAGS_OPTIMIZE%g s%@@CC_SEARCH_FLAGS@@%$CC_SEARCH_FLAGS%g s%@@LD_SEARCH_FLAGS@@%$LD_SEARCH_FLAGS%g +s%@@LD_FLAGS@@%$LD_FLAGS%g s%@@STLIB_LD@@%$STLIB_LD%g s%@@SHLIB_LD@@%$SHLIB_LD%g s%@@TCL_SHLIB_LD_EXTRAS@@%$TCL_SHLIB_LD_EXTRAS%g @ 1.15 log @Fix tcl/tk configure script stupidity: it overwrote the value of LDFLAGS that accumulates within itself with a do-nothing version because it tried to re-use LDFLAGS for another purpose. This broke all library checks after the "checking for ELF" step. Fix this by (duh) not re-using LDFLAGS but by using a different variable. Bump the PKGREVISIONs of lang/tcl and x11/tk. This fixes building the threaded versions of tcl and tk. @ text @d5 1 a5 1 @@@@ -2071,6 +2071,7 @@@@ fi d13 7 d123 1 a123 1 @@@@ -2495,7 +2496,10 @@@@ fi a128 3 + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots d132 1 a132 1 @@@@ -2508,7 +2512,7 @@@@ fi d141 1 a141 1 @@@@ -2519,8 +2523,11 @@@@ fi a147 3 + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots d150 1 a150 2 SHLIB_CFLAGS="" @@@@ -2529,7 +2536,7 @@@@ fi d159 1 a159 1 @@@@ -2542,9 +2549,12 @@@@ fi d167 2 a168 7 + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots ;; Linux*) SHLIB_CFLAGS="-fPIC" @@@@ -2561,7 +2571,7 @@@@ fi d177 1 a177 1 @@@@ -2597,7 +2607,7 @@@@ if eval "test \"`echo '$ac_cv_header_'$a d186 1 a186 11 @@@@ -2626,6 +2636,9 @@@@ fi EOF + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots ;; GNU*) SHLIB_CFLAGS="-fPIC" @@@@ -2636,7 +2649,7 @@@@ EOF d195 1 a195 1 @@@@ -2672,7 +2685,7 @@@@ if eval "test \"`echo '$ac_cv_header_'$a d204 1 a204 1 @@@@ -2691,7 +2704,7 @@@@ fi d213 1 a213 1 @@@@ -2702,7 +2715,7 @@@@ fi d222 1 a222 1 @@@@ -2739,12 +2752,11 @@@@ if eval "test \"`echo '$ac_cv_header_'$a d236 1 a236 1 @@@@ -2761,13 +2773,23 @@@@ EOF d262 1 a262 1 @@@@ -2781,7 +2803,7 @@@@ else d271 1 a271 1 @@@@ -2802,14 +2824,14 @@@@ fi d288 1 a288 1 @@@@ -2830,7 +2852,7 @@@@ fi d297 1 a297 1 @@@@ -2847,7 +2869,7 @@@@ fi d306 1 a306 1 @@@@ -2867,7 +2889,7 @@@@ EOF d315 1 a315 1 @@@@ -2883,7 +2905,7 @@@@ EOF d324 1 a324 1 @@@@ -2899,7 +2921,7 @@@@ EOF d333 1 a333 1 @@@@ -2916,7 +2938,7 @@@@ EOF d342 1 a342 1 @@@@ -2931,7 +2953,7 @@@@ EOF d351 1 a351 1 @@@@ -2942,7 +2964,7 @@@@ EOF d360 1 a360 1 @@@@ -2952,10 +2974,10 @@@@ EOF d373 1 a373 1 @@@@ -2972,7 +2994,7 @@@@ EOF d382 1 a382 1 @@@@ -2983,7 +3005,7 @@@@ EOF d391 1 a391 1 @@@@ -3019,7 +3041,7 @@@@ EOF d400 1 a400 1 @@@@ -3045,7 +3067,7 @@@@ EOF d409 1 a409 1 @@@@ -3057,10 +3079,10 @@@@ EOF d422 1 a422 11 @@@@ -3084,6 +3106,9 @@@@ EOF CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + TCL_LIB_VERSIONS_OK=nodots ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" @@@@ -3092,7 +3117,7 @@@@ EOF d431 1 a431 1 @@@@ -3133,9 +3158,9 @@@@ rm -f conftest* d443 1 a443 1 @@@@ -3310,7 +3335,7 @@@@ fi d452 11 a462 1 @@@@ -3355,8 +3380,8 @@@@ fi d468 2 a469 2 + MAKE_LIB='${SHLIB_LD} -o ${@@:C/\.so.*/.la/} ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0' + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)' d473 1 a473 1 @@@@ -4428,7 +4453,11 @@@@ echo "configure:4426: checking for X11 l d486 1 a486 1 @@@@ -4437,7 +4466,11 @@@@ echo "configure:4426: checking for X11 l d499 1 a499 1 @@@@ -4507,6 +4540,10 @@@@ if test "x${x_libraries}" != "x"; then d510 1 a510 1 @@@@ -5156,11 +5193,18 @@@@ eval "TK_LIB_FILE=${TK_LIB_FILE}" d530 1 a530 1 @@@@ -5405,6 +5449,7 @@@@ s%@@LDFLAGS_DEBUG@@%$LDFLAGS_DEBUG%g @ 1.14 log @Keep library names on IRIX and Linux to be same as on other platforms. @ text @d3 1 a3 1 --- configure.orig 2004-03-01 18:04:48.000000000 -0600 d13 105 a117 1 @@@@ -2496,6 +2497,9 @@@@ fi d120 2 a121 1 LDFLAGS="" d128 12 a139 1 @@@@ -2521,6 +2525,9 @@@@ fi d141 2 a142 1 LDFLAGS="-n32" d150 15 a164 2 @@@@ -2545,6 +2552,9 @@@@ fi LDFLAGS="-64" d173 18 d201 37 a237 1 @@@@ -2739,7 +2752,6 @@@@ if eval "test \"`echo '$ac_cv_header_'$a d245 6 d277 160 d447 30 d545 8 @ 1.13 log @Update Tcl/Tk to 8.4.6. * Tcl_Obj sharing fixed in [binary scan] * Updated errno usage for recent glibc * Fixed [file normalize ~unknownuser] error * Fixed two memory leaks in VFS code * Fixed possible infinite loop in TclFinalizeFilesystem * Updated HP-UX 11 build libraries setup * Unix std channels forced to exist at startup * Stopped broken [exec] quoting of '{' * Fixed memory leak with very long host names * Corrected level interpretation of Tcl_CreateTrace * Allow 64-bit configure on IRIX64-6.5* * Several OS X/Aqua native integration improvements (scrollbar, event generate, unicode clipboard, tk_messageBox, mousewheel event, alpha blending for partially transparent images) * Recognized native hand2/fleur cursors on Windows * Post menubuttons so they stay on screen better * Fixed crash during intra-image copy/resize * New msg catalogs for Esperanto and Polish * Corrections bold/italic font handling (width calculations) on Windows * Fixed shrinking grid geometry calculations @ text @d13 41 a53 1 @@@@ -2739,7 +2740,6 @@@@ if eval "test \"`echo '$ac_cv_header_'$a d61 1 a61 1 @@@@ -2761,13 +2761,23 @@@@ EOF d87 1 a87 1 @@@@ -3084,6 +3094,9 @@@@ EOF d97 1 a97 1 @@@@ -3355,8 +3368,8 @@@@ fi d108 1 a108 1 @@@@ -4428,7 +4441,11 @@@@ echo "configure:4426: checking for X11 l d121 1 a121 1 @@@@ -4437,7 +4454,11 @@@@ echo "configure:4426: checking for X11 l d134 1 a134 1 @@@@ -4507,6 +4528,10 @@@@ if test "x${x_libraries}" != "x"; then d145 1 a145 1 @@@@ -5156,11 +5181,18 @@@@ eval "TK_LIB_FILE=${TK_LIB_FILE}" @ 1.12 log @Update tk to 8.4.5. Too many changes since 8.3.4. Please see ChangeLog in the distfile. @ text @d3 1 a3 1 --- configure.orig 2003-11-21 14:17:23.000000000 -0600 d5 1 a5 1 @@@@ -2016,6 +2016,7 @@@@ fi d13 1 a13 41 @@@@ -2435,6 +2436,9 @@@@ fi LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' EXTRA_CFLAGS="" LDFLAGS="" + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots ;; IRIX-6.*|IRIX64-6.5*) SHLIB_CFLAGS="" @@@@ -2460,6 +2464,9 @@@@ fi esac LDFLAGS="-n32" fi + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots ;; IRIX64-6.*) SHLIB_CFLAGS="" @@@@ -2484,6 +2491,9 @@@@ fi LDFLAGS="-64" fi fi + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots ;; Linux*) SHLIB_CFLAGS="-fPIC" @@@@ -2565,6 +2575,9 @@@@ fi EOF + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots ;; GNU*) SHLIB_CFLAGS="-fPIC" @@@@ -2678,7 +2691,6 @@@@ if eval "test \"`echo '$ac_cv_header_'$a d21 1 a21 1 @@@@ -2700,13 +2712,23 @@@@ EOF d47 1 a47 1 @@@@ -3023,6 +3045,9 @@@@ EOF d57 1 a57 1 @@@@ -3294,8 +3319,8 @@@@ fi d68 1 a68 1 @@@@ -4367,7 +4392,11 @@@@ echo "configure:4365: checking for X11 l d81 1 a81 1 @@@@ -4376,7 +4405,11 @@@@ echo "configure:4365: checking for X11 l d94 1 a94 1 @@@@ -4446,6 +4479,10 @@@@ if test "x${x_libraries}" != "x"; then d105 1 a105 1 @@@@ -5095,11 +5132,18 @@@@ eval "TK_LIB_FILE=${TK_LIB_FILE}" @ 1.11 log @On Linux, this used to create libtk8.3.4 - let's use nodots here, too, so we don't need to change the PLIST. @ text @d1 1 a1 1 $NetBSD: $ d3 4 a6 3 --- configure.orig Fri Oct 19 20:24:40 2001 +++ configure Sun Mar 16 13:25:15 2003 @@@@ -1746,6 +1746,7 @@@@ a8 1 fullSrcDir=`cd $srcdir; pwd` d13 33 a45 11 @@@@ -1765,7 +1766,7 @@@@ # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1769: checking for $ac_word" >&5 +echo "configure:1770: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@@@ -1870,7 +1871,7 @@@@ # known GMT value. d47 7 a53 148 echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6 -echo "configure:1874: checking for gettimeofday in -lbsd" >&5 +echo "configure:1875: checking for gettimeofday in -lbsd" >&5 ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@@@ -1878,7 +1879,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -1951,7 +1952,7 @@@@ HP-UX-*.11.*) SHLIB_SUFFIX=".sl" echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:1955: checking for shl_load in -ldld" >&5 +echo "configure:1956: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@@@ -1959,7 +1960,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -2013,7 +2014,7 @@@@ HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*) SHLIB_SUFFIX=".sl" echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:2017: checking for shl_load in -ldld" >&5 +echo "configure:2018: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@@@ -2021,7 +2022,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -2136,20 +2137,23 @@@@ DL_LIBS="-ldl" LDFLAGS="-rdynamic" LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + TCL_LIB_VERSIONS_OK=nodots else ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dld.h""... $ac_c" 1>&6 -echo "configure:2143: checking for dld.h" >&5 +echo "configure:2144: checking for dld.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -2206,17 +2210,17 @@@@ else ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dld.h""... $ac_c" 1>&6 -echo "configure:2210: checking for dld.h" >&5 +echo "configure:2211: checking for dld.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -2271,17 +2275,17 @@@@ # Not available on all versions: check for include file. ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:2275: checking for dlfcn.h" >&5 +echo "configure:2276: checking for dlfcn.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2286: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -2300,7 +2304,6 @@@@ d61 1 a61 1 @@@@ -2321,13 +2324,23 @@@@ d65 1 d67 1 a67 1 echo "$ac_t""yes" 1>&6 d75 1 d77 1 a77 1 echo "$ac_t""no" 1>&6 d87 2 a88 12 @@@@ -2539,6 +2552,9 @@@@ DL_LIBS="-ldl" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + TCL_LIB_VERSIONS_OK=nodots ;; SunOS-5*) @@@@ -2586,6 +2602,9 @@@@ else d97 1 a97 11 @@@@ -2611,17 +2630,17 @@@@ # that don't grok the -Bexport option. Test that it does. hold_ldflags=$LDFLAGS echo $ac_n "checking for ld accepts -Bexport flag""... $ac_c" 1>&6 -echo "configure:2615: checking for ld accepts -Bexport flag" >&5 +echo "configure:2631: checking for ld accepts -Bexport flag" >&5 LDFLAGS="${LDFLAGS} -Wl,-Bexport" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* found=yes else @@@@ -2667,9 +2686,9 @@@@ if test "x$DL_OBJS" = "xtclLoadAout.o" ; then echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6 -echo "configure:2671: checking sys/exec.h" >&5 +echo "configure:2687: checking sys/exec.h" >&5 cat > conftest.$ac_ext < int main() { @@@@ -2687,7 +2706,7 @@@@ ; return 0; } EOF -if { (eval echo configure:2691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_ok=usable else @@@@ -2705,9 +2724,9 @@@@ else echo $ac_n "checking a.out.h""... $ac_c" 1>&6 -echo "configure:2709: checking a.out.h" >&5 +echo "configure:2725: checking a.out.h" >&5 cat > conftest.$ac_ext < int main() { @@@@ -2725,7 +2744,7 @@@@ ; return 0; } EOF -if { (eval echo configure:2729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_ok=usable else @@@@ -2743,9 +2762,9 @@@@ else echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6 -echo "configure:2747: checking sys/exec_aout.h" >&5 +echo "configure:2763: checking sys/exec_aout.h" >&5 cat > conftest.$ac_ext < int main() { @@@@ -2763,7 +2782,7 @@@@ ; return 0; } EOF -if { (eval echo configure:2767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_ok=usable else @@@@ -2860,7 +2879,7 @@@@ echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:2864: checking for build with symbols" >&5 +echo "configure:2880: checking for build with symbols" >&5 # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" @@@@ -2904,12 +2923,12 @@@@ #-------------------------------------------------------------------- echo $ac_n "checking for sin""... $ac_c" 1>&6 -echo "configure:2908: checking for sin" >&5 +echo "configure:2924: checking for sin" >&5 if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sin=yes" else @@@@ -2953,7 +2972,7 @@@@ fi echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6 -echo "configure:2957: checking for main in -lieee" >&5 +echo "configure:2973: checking for main in -lieee" >&5 ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@@@ -2961,14 +2980,14 @@@@ ac_save_LIBS="$LIBS" LIBS="-lieee $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -2999,7 +3018,7 @@@@ libbsd=no if test "`uname -s`" = "AIX" ; then echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6 -echo "configure:3003: checking for gettimeofday in -lbsd" >&5 +echo "configure:3019: checking for gettimeofday in -lbsd" >&5 ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@@@ -3007,7 +3026,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -3049,9 +3068,9 @@@@ #-------------------------------------------------------------------- echo $ac_n "checking stdlib.h""... $ac_c" 1>&6 -echo "configure:3053: checking stdlib.h" >&5 +echo "configure:3069: checking stdlib.h" >&5 cat > conftest.$ac_ext < EOF @@@@ -3066,7 +3085,7 @@@@ rm -f conftest* cat > conftest.$ac_ext < EOF @@@@ -3080,7 +3099,7 @@@@ rm -f conftest* cat > conftest.$ac_ext < EOF @@@@ -3112,16 +3131,16 @@@@ #-------------------------------------------------------------------- echo $ac_n "checking fd_set and sys/select""... $ac_c" 1>&6 -echo "configure:3116: checking fd_set and sys/select" >&5 +echo "configure:3132: checking fd_set and sys/select" >&5 cat > conftest.$ac_ext < int main() { fd_set readMask, writeMask; ; return 0; } EOF -if { (eval echo configure:3125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tk_ok=yes else @@@@ -3133,7 +3152,7 @@@@ rm -f conftest* if test $tk_ok = no; then cat > conftest.$ac_ext < EOF @@@@ -3165,12 +3184,12 @@@@ #-------------------------------------------------------------------- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3169: checking for ANSI C header files" >&5 +echo "configure:3185: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@@@ -3178,7 +3197,7 @@@@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -3195,7 +3214,7 @@@@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@@@ -3213,7 +3232,7 @@@@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@@@ -3234,7 +3253,7 @@@@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@@@ -3245,7 +3264,7 @@@@ exit (0); } EOF -if { (eval echo configure:3249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@@@ -3269,12 +3288,12 @@@@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:3273: checking for mode_t" >&5 +echo "configure:3289: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@@@ -3302,12 +3321,12 @@@@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3306: checking for pid_t" >&5 +echo "configure:3322: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@@@ -3335,12 +3354,12 @@@@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3339: checking for size_t" >&5 +echo "configure:3355: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@@@ -3368,12 +3387,12 @@@@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3372: checking for uid_t in sys/types.h" >&5 +echo "configure:3388: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@@@ -3410,17 +3429,17 @@@@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3414: checking for $ac_hdr" >&5 +echo "configure:3430: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -3447,12 +3466,12 @@@@ done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3451: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3467: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@@@ -3461,7 +3480,7 @@@@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@@@ -3487,16 +3506,16 @@@@ #------------------------------------------- echo $ac_n "checking pw_gecos in struct pwd""... $ac_c" 1>&6 -echo "configure:3491: checking pw_gecos in struct pwd" >&5 +echo "configure:3507: checking pw_gecos in struct pwd" >&5 cat > conftest.$ac_ext < int main() { struct passwd pwd; pwd.pw_gecos; ; return 0; } EOF -if { (eval echo configure:3500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tk_ok=yes else @@@@ -3529,7 +3548,7 @@@@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:3533: checking for X" >&5 +echo "configure:3549: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@@@ -3591,12 +3610,12 @@@@ d108 1 a108 72 # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -3665,14 +3684,14 @@@@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@@@ -3762,12 +3781,12 @@@@ if test "$no_x" = ""; then if test "$x_includes" = ""; then cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@@@ -3787,15 +3806,15 @@@@ fi if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then echo $ac_n "checking for X11 header files""... $ac_c" 1>&6 -echo "configure:3791: checking for X11 header files" >&5 +echo "configure:3807: checking for X11 header files" >&5 XINCLUDES="# no special path needed" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@@@ -3831,13 +3850,17 @@@@ if test "$no_x" = yes; then echo $ac_n "checking for X11 libraries""... $ac_c" 1>&6 -echo "configure:3835: checking for X11 libraries" >&5 +echo "configure:3851: checking for X11 libraries" >&5 XLIBSW=nope dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib" d112 1 d116 1 a116 1 XLIBSW="-L$i -lX11" d121 1 a121 1 @@@@ -3846,12 +3869,16 @@@@ d125 1 d129 2 a130 1 XLIBSW="-L$x_libraries -lX11" a132 1 + fi d134 1 a134 25 echo $ac_n "checking for XCreateWindow in -lXwindow""... $ac_c" 1>&6 -echo "configure:3855: checking for XCreateWindow in -lXwindow" >&5 +echo "configure:3879: checking for XCreateWindow in -lXwindow" >&5 ac_lib_var=`echo Xwindow'_'XCreateWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@@@ -3859,7 +3886,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lXwindow $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -3916,6 +3943,10 @@@@ d145 1 a145 327 @@@@ -3955,7 +3986,7 @@@@ #-------------------------------------------------------------------- echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:3959: checking for main in -lXbsd" >&5 +echo "configure:3987: checking for main in -lXbsd" >&5 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@@@ -3963,14 +3994,14 @@@@ ac_save_LIBS="$LIBS" LIBS="-lXbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -3993,12 +4024,12 @@@@ tk_checkBoth=0 echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:3997: checking for connect" >&5 +echo "configure:4025: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@@@ -4043,7 +4074,7 @@@@ if test "$tk_checkSocket" = 1; then echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:4047: checking for main in -lsocket" >&5 +echo "configure:4075: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@@@ -4051,14 +4082,14 @@@@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -4084,12 +4115,12 @@@@ tk_oldLibs=$LIBS LIBS="$LIBS -lsocket -lnsl" echo $ac_n "checking for accept""... $ac_c" 1>&6 -echo "configure:4088: checking for accept" >&5 +echo "configure:4116: checking for accept" >&5 if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_accept=yes" else @@@@ -4134,12 +4165,12 @@@@ fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:4138: checking for gethostbyname" >&5 +echo "configure:4166: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@@@ -4180,7 +4211,7 @@@@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:4184: checking for main in -lnsl" >&5 +echo "configure:4212: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@@@ -4188,14 +4219,14 @@@@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -4235,13 +4266,13 @@@@ if test -d /usr/include/mit ; then echo $ac_n "checking MIT X libraries""... $ac_c" 1>&6 -echo "configure:4239: checking MIT X libraries" >&5 +echo "configure:4267: checking MIT X libraries" >&5 tk_oldCFlags=$CFLAGS CFLAGS="$CFLAGS -I/usr/include/mit" tk_oldLibs=$LIBS LIBS="$LIBS -lX11-mit" cat > conftest.$ac_ext < @@@@ -4252,7 +4283,7 @@@@ ; return 0; } EOF -if { (eval echo configure:4256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@@@ -4279,12 +4310,12 @@@@ MATH_LIBS="" echo $ac_n "checking for sin""... $ac_c" 1>&6 -echo "configure:4283: checking for sin" >&5 +echo "configure:4311: checking for sin" >&5 if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sin=yes" else @@@@ -4328,7 +4359,7 @@@@ fi echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6 -echo "configure:4332: checking for main in -lieee" >&5 +echo "configure:4360: checking for main in -lieee" >&5 ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@@@ -4336,14 +4367,14 @@@@ ac_save_LIBS="$LIBS" LIBS="-lieee $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -4370,14 +4401,14 @@@@ #-------------------------------------------------------------------- echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:4374: checking whether char is unsigned" >&5 +echo "configure:4402: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@@@ -4442,12 +4473,12 @@@@ echo $ac_n "checking for strtod""... $ac_c" 1>&6 -echo "configure:4446: checking for strtod" >&5 +echo "configure:4474: checking for strtod" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtod'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strtod=yes" else @@@@ -4492,12 +4523,12 @@@@ if test "$tcl_strtod" = 1; then echo $ac_n "checking for Solaris2.4/Tru64 strtod bugs""... $ac_c" 1>&6 -echo "configure:4496: checking for Solaris2.4/Tru64 strtod bugs" >&5 +echo "configure:4524: checking for Solaris2.4/Tru64 strtod bugs" >&5 if test "$cross_compiling" = yes; then tcl_ok=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_ok=1 else @@@@ -4549,7 +4580,7 @@@@ echo $ac_n "checking how to build libraries""... $ac_c" 1>&6 -echo "configure:4553: checking how to build libraries" >&5 +echo "configure:4581: checking how to build libraries" >&5 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@@@ -4588,7 +4619,7 @@@@ if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}" TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX} - MAKE_LIB="\${SHLIB_LD} -o \$@@ \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS}" + MAKE_LIB="\${SHLIB_LD} -o \${@@:C/\.so.*/.la/} \${OBJS:.o=.lo} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS} -version-info 1:0" RANLIB=":" # TCL_STUB_FLAGS="-DUSE_TCL_STUBS" @@@@ -4611,11 +4642,17 @@@@ d153 3 a155 1 + fi d160 1 a160 3 fi - TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" - TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}" @ 1.10 log @Update patch with diffs for a regenerated "configure". This restores the Solaris fixes which got lost in the recent update. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- configure.orig Sat Oct 20 02:24:40 2001 +++ configure Sun Jan 6 00:38:35 2002 d103 7 a109 1 @@@@ -2139,17 +2140,17 @@@@ d130 1 a130 1 @@@@ -2206,17 +2207,17 @@@@ d151 1 a151 1 @@@@ -2271,17 +2272,17 @@@@ d172 1 a172 1 @@@@ -2300,7 +2301,6 @@@@ d180 1 a180 1 @@@@ -2321,13 +2321,23 @@@@ a183 1 - echo "$ac_t""yes" 1>&6 d185 1 a185 1 + echo "$ac_t""yes" 1>&6 a192 1 - echo "$ac_t""no" 1>&6 d194 1 a194 1 + echo "$ac_t""no" 1>&6 d204 1 a204 1 @@@@ -2539,6 +2549,9 @@@@ d214 1 a214 1 @@@@ -2586,6 +2599,9 @@@@ d224 1 a224 1 @@@@ -2611,10 +2627,10 @@@@ a236 1 @@@@ -2621,7 +2637,7 @@@@ d245 1 a245 1 @@@@ -2667,9 +2683,9 @@@@ d257 1 a257 1 @@@@ -2687,7 +2703,7 @@@@ d266 1 a266 1 @@@@ -2705,9 +2721,9 @@@@ d278 1 a278 1 @@@@ -2725,7 +2741,7 @@@@ d287 1 a287 1 @@@@ -2743,9 +2759,9 @@@@ d299 1 a299 1 @@@@ -2763,7 +2779,7 @@@@ d308 1 a308 1 @@@@ -2860,7 +2876,7 @@@@ d317 1 a317 1 @@@@ -2904,12 +2920,12 @@@@ d332 1 a332 1 @@@@ -2932,7 +2948,7 @@@@ d341 1 a341 1 @@@@ -2953,7 +2969,7 @@@@ d350 1 a350 1 @@@@ -2961,7 +2977,7 @@@@ a358 1 @@@@ -2968,7 +2984,7 @@@@ d367 1 a367 1 @@@@ -2999,7 +3015,7 @@@@ d376 1 a376 1 @@@@ -3007,7 +3023,7 @@@@ d385 1 a385 1 @@@@ -3018,7 +3034,7 @@@@ d394 1 a394 1 @@@@ -3049,9 +3065,9 @@@@ d406 1 a406 1 @@@@ -3066,7 +3082,7 @@@@ d415 1 a415 1 @@@@ -3080,7 +3096,7 @@@@ d424 1 a424 1 @@@@ -3112,9 +3128,9 @@@@ a435 1 @@@@ -3121,7 +3137,7 @@@@ d444 1 a444 1 @@@@ -3133,7 +3149,7 @@@@ d453 1 a453 1 @@@@ -3165,12 +3181,12 @@@@ d468 1 a468 1 @@@@ -3178,7 +3194,7 @@@@ d477 1 a477 1 @@@@ -3195,7 +3211,7 @@@@ d486 1 a486 1 @@@@ -3213,7 +3229,7 @@@@ d495 1 a495 1 @@@@ -3234,7 +3250,7 @@@@ d504 1 a504 1 @@@@ -3245,7 +3261,7 @@@@ d513 1 a513 1 @@@@ -3269,12 +3285,12 @@@@ d528 1 a528 1 @@@@ -3302,12 +3318,12 @@@@ d543 1 a543 1 @@@@ -3335,12 +3351,12 @@@@ d558 1 a558 1 @@@@ -3368,12 +3384,12 @@@@ d573 1 a573 1 @@@@ -3410,17 +3426,17 @@@@ d594 1 a594 1 @@@@ -3447,12 +3463,12 @@@@ d609 1 a609 1 @@@@ -3461,7 +3477,7 @@@@ d618 1 a618 1 @@@@ -3487,9 +3503,9 @@@@ a629 1 @@@@ -3496,7 +3512,7 @@@@ d638 1 a638 1 @@@@ -3529,7 +3545,7 @@@@ d647 1 a647 1 @@@@ -3591,12 +3607,12 @@@@ d662 1 a662 1 @@@@ -3665,7 +3681,7 @@@@ a670 1 @@@@ -3672,7 +3688,7 @@@@ d679 1 a679 1 @@@@ -3762,12 +3778,12 @@@@ d694 1 a694 1 @@@@ -3787,15 +3803,15 @@@@ d713 1 a713 1 @@@@ -3831,13 +3847,17 @@@@ a723 1 - XLIBSW="-L$i -lX11" d727 1 a727 1 + XLIBSW="-L$i -lX11" d732 1 a732 1 @@@@ -3846,12 +3866,16 @@@@ a735 1 - XLIBSW="-L$x_libraries -lX11" d739 1 a739 2 + XLIBSW="-L$x_libraries -lX11" + fi d742 1 d750 1 a750 1 @@@@ -3859,7 +3883,7 @@@@ d759 1 a759 1 @@@@ -3870,7 +3894,7 @@@@ d768 1 a768 1 @@@@ -3916,6 +3940,10 @@@@ d779 1 a779 1 @@@@ -3955,7 +3983,7 @@@@ d788 1 a788 1 @@@@ -3963,7 +3991,7 @@@@ a796 1 @@@@ -3970,7 +3998,7 @@@@ d805 1 a805 1 @@@@ -3993,12 +4021,12 @@@@ d820 1 a820 1 @@@@ -4021,7 +4049,7 @@@@ d829 1 a829 1 @@@@ -4043,7 +4071,7 @@@@ d838 1 a838 1 @@@@ -4051,7 +4079,7 @@@@ a846 1 @@@@ -4058,7 +4086,7 @@@@ d855 1 a855 1 @@@@ -4084,12 +4112,12 @@@@ d870 1 a870 1 @@@@ -4112,7 +4140,7 @@@@ d879 1 a879 1 @@@@ -4134,12 +4162,12 @@@@ d894 1 a894 1 @@@@ -4162,7 +4190,7 @@@@ d903 1 a903 1 @@@@ -4180,7 +4208,7 @@@@ d912 1 a912 1 @@@@ -4188,7 +4216,7 @@@@ a920 1 @@@@ -4195,7 +4223,7 @@@@ d929 1 a929 1 @@@@ -4235,13 +4263,13 @@@@ d945 1 a945 1 @@@@ -4252,7 +4280,7 @@@@ d954 1 a954 1 @@@@ -4279,12 +4307,12 @@@@ d969 1 a969 1 @@@@ -4307,7 +4335,7 @@@@ d978 1 a978 1 @@@@ -4328,7 +4356,7 @@@@ d987 1 a987 1 @@@@ -4336,7 +4364,7 @@@@ a995 1 @@@@ -4343,7 +4371,7 @@@@ d1004 1 a1004 1 @@@@ -4370,7 +4398,7 @@@@ a1012 1 @@@@ -4377,7 +4405,7 @@@@ d1021 1 a1021 1 @@@@ -4399,7 +4427,7 @@@@ d1030 1 a1030 1 @@@@ -4409,7 +4437,7 @@@@ d1039 1 a1039 1 @@@@ -4442,12 +4470,12 @@@@ d1054 1 a1054 1 @@@@ -4470,7 +4498,7 @@@@ d1063 1 a1063 1 @@@@ -4492,12 +4520,12 @@@@ d1078 1 a1078 1 @@@@ -4517,7 +4545,7 @@@@ d1087 1 a1087 1 @@@@ -4549,7 +4577,7 @@@@ d1096 1 a1096 1 @@@@ -4588,7 +4616,7 @@@@ d1105 1 a1105 1 @@@@ -4611,11 +4639,17 @@@@ d1113 1 a1113 3 fi - TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" - TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}" d1118 3 a1120 1 + fi @ 1.9 log @Update to version 8.3.4 Taken from "changes" from the distribution (minus changes not relevant for NetBSD): 2001-04-04 (doc fixes) numerous doc corrections and clarifications. Update of READMEs. 2001-04-04 (bug fix) corrected reseting of service mode to only occur when it was set (hedin, hobbs) 2001-04-02 (bug fix) Checked for menu deletion before calling associated menu entry command. Fixed listbox, canvas and entry destruction to be more aware of current widget activity. (hobbs) 2001-03-30 (bug fix) handled the error case where a valid-looking but invalid identifier could be passed in certain event generate options causing a crash (hobbs) 2001-03-29 (bug fix) corrected handling of drag-selection (dejong) 2000-10-27 (feature enhancement) made [tk useinputmethods 1] the default for Tk (hobbs) 2000-09-29 (bug fix) corrected BadMatch errors when using Tk on multiple screens (hipp) 2000-08-18 (feature enhancement) Removed redundant call to DitherInstance (melski) 2001-08-24 (bug fix) correct several possible free memory reads and array bounds read errors reported by purify. (hobbs) 2001-08-27 (new feature) added call to Tcl_SetMainLoop which enables Tk to be loaded interactively into tclsh and have the event loop kick in correctly. (hobbs) 2001-08-28 (bug fix) fixed tk_chooseDirectory crash on Win95. (baker) 2001-08-28 (bug fix) removed 2 second 'raise' delay seen by some Unix window managers. (hobbs, baker) 2001-09-14 (bug fix) fixed memory leaks that occured if errors were thrown while initializing the channel for an image. (darley) 2001-10-04 (new feature) added enhanced bgerror dialog from Hipp. (hobbs) 2001-10-17 (bug fix) fixed file filtering in the motif file dialog (nelson) @ text @d4 768 a771 2 +++ configure @@@@ -3916,6 +3916,10 @@@@ d782 1 a782 1 @@@@ -3955,7 +3959,7 @@@@ d787 1 a787 1 +echo "configure:3963: checking for main in -lXbsd" >&5 d791 1 a791 1 @@@@ -3963,14 +3967,14 @@@@ d796 1 a796 1 +#line 3971 "configure" d800 1 d805 1 a805 1 +if { (eval echo configure:3978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d809 1 a809 1 @@@@ -3993,12 +3997,12 @@@@ d814 1 a814 1 +echo "configure:4001: checking for connect" >&5 d820 1 a820 1 +#line 4006 "configure" d824 1 a824 1 @@@@ -4021,7 +4025,7 @@@@ d829 1 a829 1 +if { (eval echo configure:4029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d833 1 a833 1 @@@@ -4043,7 +4047,7 @@@@ d838 1 a838 1 +echo "configure:4051: checking for main in -lsocket" >&5 d842 1 a842 1 @@@@ -4051,14 +4055,14 @@@@ d847 1 a847 1 +#line 4059 "configure" d851 1 d856 1 a856 1 +if { (eval echo configure:4066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d860 1 a860 1 @@@@ -4084,12 +4088,12 @@@@ d865 1 a865 1 +echo "configure:4092: checking for accept" >&5 d871 1 a871 1 +#line 4097 "configure" d875 1 a875 1 @@@@ -4112,7 +4116,7 @@@@ d880 1 a880 1 +if { (eval echo configure:4120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d884 1 a884 1 @@@@ -4134,12 +4138,12 @@@@ d889 1 a889 1 +echo "configure:4142: checking for gethostbyname" >&5 d895 1 a895 1 +#line 4147 "configure" d899 1 a899 1 @@@@ -4162,7 +4166,7 @@@@ d904 1 a904 1 +if { (eval echo configure:4170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d908 1 a908 1 @@@@ -4180,7 +4184,7 @@@@ d913 1 a913 1 +echo "configure:4188: checking for main in -lnsl" >&5 d917 1 a917 1 @@@@ -4188,14 +4192,14 @@@@ d922 1 a922 1 +#line 4196 "configure" d926 1 d931 1 a931 1 +if { (eval echo configure:4203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d935 1 a935 1 @@@@ -4235,13 +4239,13 @@@@ d940 1 a940 1 +echo "configure:4243: checking MIT X libraries" >&5 d947 1 a947 1 +#line 4249 "configure" d951 1 a951 1 @@@@ -4252,7 +4256,7 @@@@ d956 1 a956 1 +if { (eval echo configure:4260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d960 1 a960 1 @@@@ -4279,12 +4283,12 @@@@ d965 1 a965 1 +echo "configure:4287: checking for sin" >&5 d971 1 a971 1 +#line 4292 "configure" d975 1 a975 1 @@@@ -4307,7 +4311,7 @@@@ d980 1 a980 1 +if { (eval echo configure:4315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d984 1 a984 1 @@@@ -4328,7 +4332,7 @@@@ d989 1 a989 1 +echo "configure:4336: checking for main in -lieee" >&5 d993 1 a993 1 @@@@ -4336,14 +4340,14 @@@@ d998 1 a998 1 +#line 4344 "configure" d1002 1 d1007 1 a1007 1 +if { (eval echo configure:4351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1011 1 a1011 1 @@@@ -4370,14 +4374,14 @@@@ d1016 1 a1016 1 +echo "configure:4378: checking whether char is unsigned" >&5 d1020 1 d1025 1 a1025 1 +#line 4385 "configure" d1029 1 a1029 1 @@@@ -4399,7 +4403,7 @@@@ d1034 1 a1034 1 +#line 4407 "configure" d1038 1 a1038 1 @@@@ -4409,7 +4413,7 @@@@ d1043 1 a1043 1 +if { (eval echo configure:4417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null d1047 1 a1047 1 @@@@ -4442,12 +4446,12 @@@@ d1052 1 a1052 1 +echo "configure:4450: checking for strtod" >&5 d1058 1 a1058 1 +#line 4455 "configure" d1062 1 a1062 1 @@@@ -4470,7 +4474,7 @@@@ d1067 1 a1067 1 +if { (eval echo configure:4478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1071 1 a1071 1 @@@@ -4492,12 +4496,12 @@@@ d1076 1 a1076 1 +echo "configure:4500: checking for Solaris2.4/Tru64 strtod bugs" >&5 d1082 1 a1082 1 +#line 4505 "configure" d1086 1 a1086 1 @@@@ -4517,7 +4521,7 @@@@ d1091 1 a1091 1 +if { (eval echo configure:4525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null d1095 1 a1095 1 @@@@ -4549,7 +4553,7 @@@@ d1100 1 a1100 1 +echo "configure:4557: checking how to build libraries" >&5 d1104 1 a1104 1 @@@@ -4588,7 +4592,7 @@@@ d1109 1 a1109 1 + MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE:C/\.so.*/.la/} \${OBJS:.o=.lo} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${SHLIB_LD_LIBS} -version-info 1:0" d1113 1 a1113 1 @@@@ -4611,11 +4615,17 @@@@ @ 1.8 log @Use -Wl,-R instead of -Wl,-rpath as the former is more consistent with the rest of pkgsrc. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.7 2001/07/29 07:54:57 tron Exp $ d3 3 a5 680 --- configure.orig Tue Aug 8 21:19:32 2000 +++ configure Sun Jul 29 09:44:17 2001 @@@@ -1581,6 +1581,7 @@@@ do64bit_ok=no fullSrcDir=`cd $srcdir; pwd` + RPATH_FLAG="" EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" @@@@ -1661,7 +1662,7 @@@@ HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*|HP-UX-*.11.*) SHLIB_SUFFIX=".sl" echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:1665: checking for shl_load in -ldld" >&5 +echo "configure:1666: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@@@ -1669,7 +1670,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -1776,17 +1777,17 @@@@ else ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dld.h""... $ac_c" 1>&6 -echo "configure:1780: checking for dld.h" >&5 +echo "configure:1781: checking for dld.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -1841,17 +1842,17 @@@@ # Not available on all versions: check for include file. ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:1845: checking for dlfcn.h" >&5 +echo "configure:1846: checking for dlfcn.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -1870,7 +1871,6 @@@@ # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" SHLIB_LD_LIBS="" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" @@@@ -1891,13 +1891,23 @@@@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then rm -rf conftest* - echo "$ac_t""yes" 1>&6 + + echo "$ac_t""yes" 1>&6 + SHLIB_LD='${TCL_CC} -shared -Wl,-x' + RPATH_FLAG='-Wl,-R' + LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + else rm -rf conftest* - echo "$ac_t""no" 1>&6 + + echo "$ac_t""no" 1>&6 + SHLIB_LD="ld -Bshareable -x" + RPATH_FLAG='-R' + LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}' SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' + fi rm -f conftest* @@@@ -2055,6 +2065,9 @@@@ DL_LIBS="-ldl" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + TCL_LIB_VERSIONS_OK=nodots ;; SunOS-5*) SHLIB_CFLAGS="-KPIC" @@@@ -2094,6 +2107,9 @@@@ else LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + TCL_LIB_VERSIONS_OK=nodots ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" @@@@ -2116,17 +2132,17 @@@@ # that don't grok the -Bexport option. Test that it does. hold_ldflags=$LDFLAGS echo $ac_n "checking for ld accepts -Bexport flag""... $ac_c" 1>&6 -echo "configure:2120: checking for ld accepts -Bexport flag" >&5 +echo "configure:2136: checking for ld accepts -Bexport flag" >&5 LDFLAGS="${LDFLAGS} -Wl,-Bexport" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* found=yes else @@@@ -2172,9 +2188,9 @@@@ if test "x$DL_OBJS" = "xtclLoadAout.o" ; then echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6 -echo "configure:2176: checking sys/exec.h" >&5 +echo "configure:2192: checking sys/exec.h" >&5 cat > conftest.$ac_ext < int main() { @@@@ -2192,7 +2208,7 @@@@ ; return 0; } EOF -if { (eval echo configure:2196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_ok=usable else @@@@ -2210,9 +2226,9 @@@@ else echo $ac_n "checking a.out.h""... $ac_c" 1>&6 -echo "configure:2214: checking a.out.h" >&5 +echo "configure:2230: checking a.out.h" >&5 cat > conftest.$ac_ext < int main() { @@@@ -2230,7 +2246,7 @@@@ ; return 0; } EOF -if { (eval echo configure:2234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_ok=usable else @@@@ -2248,9 +2264,9 @@@@ else echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6 -echo "configure:2252: checking sys/exec_aout.h" >&5 +echo "configure:2268: checking sys/exec_aout.h" >&5 cat > conftest.$ac_ext < int main() { @@@@ -2268,7 +2284,7 @@@@ ; return 0; } EOF -if { (eval echo configure:2272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_ok=usable else @@@@ -2361,7 +2377,7 @@@@ echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:2365: checking for build with symbols" >&5 +echo "configure:2381: checking for build with symbols" >&5 # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" @@@@ -2405,12 +2421,12 @@@@ #-------------------------------------------------------------------- echo $ac_n "checking for sin""... $ac_c" 1>&6 -echo "configure:2409: checking for sin" >&5 +echo "configure:2425: checking for sin" >&5 if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sin=yes" else @@@@ -2454,7 +2470,7 @@@@ fi echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6 -echo "configure:2458: checking for main in -lieee" >&5 +echo "configure:2474: checking for main in -lieee" >&5 ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@@@ -2462,14 +2478,14 @@@@ ac_save_LIBS="$LIBS" LIBS="-lieee $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -2500,7 +2516,7 @@@@ libbsd=no if test "`uname -s`" = "AIX" ; then echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6 -echo "configure:2504: checking for gettimeofday in -lbsd" >&5 +echo "configure:2520: checking for gettimeofday in -lbsd" >&5 ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@@@ -2508,7 +2524,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -2550,9 +2566,9 @@@@ #-------------------------------------------------------------------- echo $ac_n "checking stdlib.h""... $ac_c" 1>&6 -echo "configure:2554: checking stdlib.h" >&5 +echo "configure:2570: checking stdlib.h" >&5 cat > conftest.$ac_ext < EOF @@@@ -2567,7 +2583,7 @@@@ rm -f conftest* cat > conftest.$ac_ext < EOF @@@@ -2581,7 +2597,7 @@@@ rm -f conftest* cat > conftest.$ac_ext < EOF @@@@ -2613,16 +2629,16 @@@@ #-------------------------------------------------------------------- echo $ac_n "checking fd_set and sys/select""... $ac_c" 1>&6 -echo "configure:2617: checking fd_set and sys/select" >&5 +echo "configure:2633: checking fd_set and sys/select" >&5 cat > conftest.$ac_ext < int main() { fd_set readMask, writeMask; ; return 0; } EOF -if { (eval echo configure:2626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tk_ok=yes else @@@@ -2634,7 +2650,7 @@@@ rm -f conftest* if test $tk_ok = no; then cat > conftest.$ac_ext < EOF @@@@ -2666,12 +2682,12 @@@@ #-------------------------------------------------------------------- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2670: checking for ANSI C header files" >&5 +echo "configure:2686: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@@@ -2679,7 +2695,7 @@@@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -2696,7 +2712,7 @@@@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@@@ -2714,7 +2730,7 @@@@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@@@ -2735,7 +2751,7 @@@@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@@@ -2746,7 +2762,7 @@@@ exit (0); } EOF -if { (eval echo configure:2750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@@@ -2770,12 +2786,12 @@@@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:2774: checking for mode_t" >&5 +echo "configure:2790: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@@@ -2803,12 +2819,12 @@@@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2807: checking for pid_t" >&5 +echo "configure:2823: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@@@ -2836,12 +2852,12 @@@@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2840: checking for size_t" >&5 +echo "configure:2856: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@@@ -2869,12 +2885,12 @@@@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2873: checking for uid_t in sys/types.h" >&5 +echo "configure:2889: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@@@ -2911,17 +2927,17 @@@@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2915: checking for $ac_hdr" >&5 +echo "configure:2931: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -2948,12 +2964,12 @@@@ done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2952: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2968: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@@@ -2962,7 +2978,7 @@@@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@@@ -2988,16 +3004,16 @@@@ #------------------------------------------- echo $ac_n "checking pw_gecos in struct pwd""... $ac_c" 1>&6 -echo "configure:2992: checking pw_gecos in struct pwd" >&5 +echo "configure:3008: checking pw_gecos in struct pwd" >&5 cat > conftest.$ac_ext < int main() { struct passwd pwd; pwd.pw_gecos; ; return 0; } EOF -if { (eval echo configure:3001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tk_ok=yes else @@@@ -3030,7 +3046,7 @@@@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:3034: checking for X" >&5 +echo "configure:3050: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@@@ -3092,12 +3108,12 @@@@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -3166,14 +3182,14 @@@@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@@@ -3263,12 +3279,12 @@@@ if test "$no_x" = ""; then if test "$x_includes" = ""; then cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@@@ -3288,15 +3304,15 @@@@ fi if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then echo $ac_n "checking for X11 header files""... $ac_c" 1>&6 -echo "configure:3292: checking for X11 header files" >&5 +echo "configure:3308: checking for X11 header files" >&5 XINCLUDES="# no special path needed" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@@@ -3332,13 +3348,17 @@@@ if test "$no_x" = yes; then echo $ac_n "checking for X11 libraries""... $ac_c" 1>&6 -echo "configure:3336: checking for X11 libraries" >&5 +echo "configure:3352: checking for X11 libraries" >&5 XLIBSW=nope dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib" for i in $dirs ; do if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then echo "$ac_t""$i" 1>&6 - XLIBSW="-L$i -lX11" + if test "${RPATH_FLAG}" != ""; then + XLIBSW="-L$i ${RPATH_FLAG}$i -lX11" + else + XLIBSW="-L$i -lX11" + fi x_libraries="$i" break fi @@@@ -3347,12 +3367,16 @@@@ if test "$x_libraries" = ""; then XLIBSW=-lX11 else - XLIBSW="-L$x_libraries -lX11" + if test "${RPATH_FLAG}" != ""; then + XLIBSW="-L$x_libraries ${RPATH_FLAG}$x_libraries -lX11" + else + XLIBSW="-L$x_libraries -lX11" + fi fi fi if test "$XLIBSW" = nope ; then echo $ac_n "checking for XCreateWindow in -lXwindow""... $ac_c" 1>&6 -echo "configure:3356: checking for XCreateWindow in -lXwindow" >&5 +echo "configure:3380: checking for XCreateWindow in -lXwindow" >&5 ac_lib_var=`echo Xwindow'_'XCreateWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@@@ -3360,7 +3384,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lXwindow $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -3417,6 +3441,10 @@@@ d16 1 a16 1 @@@@ -3456,7 +3484,7 @@@@ d20 2 a21 2 -echo "configure:3460: checking for main in -lXbsd" >&5 +echo "configure:3488: checking for main in -lXbsd" >&5 d25 1 a25 1 @@@@ -3464,14 +3492,14 @@@@ d29 2 a30 2 -#line 3468 "configure" +#line 3496 "configure" d37 2 a38 2 -if { (eval echo configure:3475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d42 1 a42 1 @@@@ -3494,12 +3522,12 @@@@ d46 2 a47 2 -echo "configure:3498: checking for connect" >&5 +echo "configure:3526: checking for connect" >&5 d52 2 a53 2 -#line 3503 "configure" +#line 3531 "configure" d57 1 a57 1 @@@@ -3522,7 +3550,7 @@@@ d61 2 a62 2 -if { (eval echo configure:3526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d66 1 a66 1 @@@@ -3544,7 +3572,7 @@@@ d70 2 a71 2 -echo "configure:3548: checking for main in -lsocket" >&5 +echo "configure:3576: checking for main in -lsocket" >&5 d75 1 a75 1 @@@@ -3552,14 +3580,14 @@@@ d79 2 a80 2 -#line 3556 "configure" +#line 3584 "configure" d87 2 a88 2 -if { (eval echo configure:3563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d92 1 a92 1 @@@@ -3585,12 +3613,12 @@@@ d96 2 a97 2 -echo "configure:3589: checking for accept" >&5 +echo "configure:3617: checking for accept" >&5 d102 2 a103 2 -#line 3594 "configure" +#line 3622 "configure" d107 1 a107 1 @@@@ -3613,7 +3641,7 @@@@ d111 2 a112 2 -if { (eval echo configure:3617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d116 1 a116 1 @@@@ -3635,12 +3663,12 @@@@ d120 2 a121 2 -echo "configure:3639: checking for gethostbyname" >&5 +echo "configure:3667: checking for gethostbyname" >&5 d126 2 a127 2 -#line 3644 "configure" +#line 3672 "configure" d131 1 a131 1 @@@@ -3663,7 +3691,7 @@@@ d135 2 a136 2 -if { (eval echo configure:3667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d140 1 a140 1 @@@@ -3681,7 +3709,7 @@@@ d144 2 a145 2 -echo "configure:3685: checking for main in -lnsl" >&5 +echo "configure:3713: checking for main in -lnsl" >&5 d149 1 a149 1 @@@@ -3689,14 +3717,14 @@@@ d153 2 a154 2 -#line 3693 "configure" +#line 3721 "configure" d161 2 a162 2 -if { (eval echo configure:3700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d166 1 a166 1 @@@@ -3736,13 +3764,13 @@@@ d170 2 a171 2 -echo "configure:3740: checking MIT X libraries" >&5 +echo "configure:3768: checking MIT X libraries" >&5 d177 2 a178 2 -#line 3746 "configure" +#line 3774 "configure" d182 1 a182 1 @@@@ -3753,7 +3781,7 @@@@ d186 2 a187 2 -if { (eval echo configure:3757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d191 1 a191 1 @@@@ -3780,12 +3808,12 @@@@ d195 2 a196 2 -echo "configure:3784: checking for sin" >&5 +echo "configure:3812: checking for sin" >&5 d201 2 a202 2 -#line 3789 "configure" +#line 3817 "configure" d206 1 a206 1 @@@@ -3808,7 +3836,7 @@@@ d210 2 a211 2 -if { (eval echo configure:3812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d215 1 a215 1 @@@@ -3829,7 +3857,7 @@@@ d219 2 a220 2 -echo "configure:3833: checking for main in -lieee" >&5 +echo "configure:3861: checking for main in -lieee" >&5 d224 1 a224 1 @@@@ -3837,14 +3865,14 @@@@ d228 2 a229 2 -#line 3841 "configure" +#line 3869 "configure" d236 2 a237 2 -if { (eval echo configure:3848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d241 1 a241 1 @@@@ -3871,14 +3899,14 @@@@ d245 2 a246 2 -echo "configure:3875: checking whether char is unsigned" >&5 +echo "configure:3903: checking whether char is unsigned" >&5 d253 2 a254 2 -#line 3882 "configure" +#line 3910 "configure" d258 1 a258 1 @@@@ -3900,7 +3928,7 @@@@ d262 2 a263 2 -#line 3904 "configure" +#line 3932 "configure" d267 1 a267 1 @@@@ -3910,7 +3938,7 @@@@ d271 2 a272 2 -if { (eval echo configure:3914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null d276 1 a276 1 @@@@ -3943,12 +3971,12 @@@@ d280 2 a281 2 -echo "configure:3947: checking for strtod" >&5 +echo "configure:3975: checking for strtod" >&5 d286 2 a287 2 -#line 3952 "configure" +#line 3980 "configure" d291 1 a291 1 @@@@ -3971,7 +3999,7 @@@@ d295 2 a296 2 -if { (eval echo configure:3975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d300 1 a300 1 @@@@ -3993,12 +4021,12 @@@@ d302 4 a305 4 if test "$tk_strtod" = 1; then echo $ac_n "checking for Solaris 2.4 strtod bug""... $ac_c" 1>&6 -echo "configure:3997: checking for Solaris 2.4 strtod bug" >&5 +echo "configure:4025: checking for Solaris 2.4 strtod bug" >&5 d307 1 a307 1 tk_ok=0 d310 2 a311 2 -#line 4002 "configure" +#line 4030 "configure" d315 1 a315 1 @@@@ -4018,7 +4046,7 @@@@ d319 2 a320 2 -if { (eval echo configure:4022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null d322 1 a322 1 tk_ok=1 d324 1 a324 1 @@@@ -4049,7 +4077,7 @@@@ d328 2 a329 2 -echo "configure:4053: checking how to build libraries" >&5 +echo "configure:4081: checking how to build libraries" >&5 d333 1 a333 1 @@@@ -4088,7 +4116,7 @@@@ d337 2 a338 2 - MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${LIBS}" + MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE:C/\.so.*/.la/} \${OBJS:.o=.lo} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${LIBS} -version-info 1:0" d342 1 a342 1 @@@@ -4111,11 +4139,17 @@@@ d350 3 a352 1 + fi d357 1 a357 3 fi - TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" - TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}" @ 1.7 log @Use the library naming scheme under Solaris as under NetBSD. While it's not really necessary to strip dots from library names under Solaris it makes the packages more compatible which should ease maintenance. @ text @d1 1 a1 1 $NetBSD$ d98 2 a99 2 + RPATH_FLAG='-Wl,-rpath,' + LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' d688 2 a689 2 +elif test "${TCL_LD_SEARCH_FLAGS}" = '-Wl,-rpath,${LIB_RUNTIME_DIR}'; then + LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -Wl,-rpath,/g'` @ 1.6 log @Fix the installed tkConfig.sh so it's possible to use its values to generate a shared library that depends on libtk83.so. Patch the configure script to set TK_LIB_SPEC to include -Wl,-rpath,... or -R... depending on whether we are ELF or a.out. Bump version number to 8.3.2nb1. @ text @d3 2 a4 2 --- configure.orig Tue Aug 8 15:19:32 2000 +++ configure d13 69 d116 510 a625 1 @@@@ -3332,13 +3342,17 @@@@ d630 1 a630 1 +echo "configure:3346: checking for X11 libraries" >&5 d645 1 a645 1 @@@@ -3347,12 +3361,16 @@@@ d660 1 a660 1 +echo "configure:3374: checking for XCreateWindow in -lXwindow" >&5 d664 19 a682 1 @@@@ -3417,6 +3435,10 @@@@ d693 318 a1010 1 @@@@ -4088,7 +4110,7 @@@@ d1019 1 a1019 1 @@@@ -4111,11 +4133,17 @@@@ @ 1.5 log @Fix problem with libtk .la file generated by new libtool. Pointed out (and patch provided by) Jason Beegan (jtb@@netbsd.org) @ text @d3 1 a3 1 --- configure.orig Tue Aug 8 19:19:32 2000 d5 13 a17 2 @@@@ -1873,6 +1873,7 @@@@ SHLIB_LD="ld -Bshareable -x" a19 1 + SHARED_LIB_SUFFIX=".so" d21 34 a54 3 DL_LIBS="" LDFLAGS="" @@@@ -3338,7 +3339,7 @@@@ d59 5 a63 1 + XLIBSW="-L$i -Wl,-R$i -lX11" d67 1 a67 1 @@@@ -3347,7 +3348,7 @@@@ d72 5 a76 1 + XLIBSW="-L$x_libraries -Wl,-R$x_libraries -lX11" d80 7 a86 3 @@@@ -3415,8 +3416,8 @@@@ if test "x${x_libraries}" != "x"; then LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${x_libraries}" d88 5 a92 3 -if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then - LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'` +if test "${TCL_LD_SEARCH_FLAGS}" = '-Wl,-rpath,${LIB_RUNTIME_DIR}'; then d97 1 a97 1 @@@@ -4088,7 +4089,7 @@@@ d106 5 a110 1 @@@@ -4114,8 +4115,8 @@@@ d113 6 d122 1 a122 2 + TK_BUILD_LIB_SPEC=libtk83.la + TK_LIB_SPEC="-L${exec_prefix}/lib -Wl,-R${exec_prefix}/lib ${TK_LIB_FLAG}" @ 1.4 log @Since the configure script comes up with different shared lib suffixes on different versions/platforms of NetBSD, use $(TK_LIB_FILE:C/\.so.*/.la/) instead of $(TK_LIB_FILE:.so=.la) to derive the libtool archive name from the shared library name. From Frederick Bruckman, addresses PR pkg/10924. @ text @d1 4 a4 3 $NetBSD: patch-ab,v 1.3 2000/08/31 16:48:11 jwise Exp $ --- configure.orig Tue Aug 8 15:19:32 2000 +++ configure Thu Aug 31 12:35:15 2000 d31 11 @ 1.3 log @Fix inconsistent use of SHLIB_SUFFIX vs. SHARED_LIB_SUFFIX in configure script. I believe this is what resulted in 1.4.3/ELF ports not building tk correctly. he is testing on 1.4.3_ALPHA/alpha. @ text @d1 1 a1 1 $NetBSD$ d35 1 a35 1 + MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE:.so=.la} \${OBJS:.o=.lo} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${LIBS} -version-info 1:0" @ 1.2 log @Fix typo in generated tkConfig.sh. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1.1.1 2000/08/29 16:16:07 jwise Exp $ d3 10 a12 2 +++ configure Tue Aug 29 10:06:15 2000 @@@@ -3338,7 +3338,7 @@@@ d21 1 a21 1 @@@@ -3347,7 +3347,7 @@@@ d30 1 a30 1 @@@@ -4088,7 +4088,7 @@@@ d39 1 a39 1 @@@@ -4114,8 +4114,8 @@@@ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d38 1 a38 1 + TK_LIB_SPEC="-L${exec_prefix}/lib -Wl,R${exec_prefix}/lib ${TK_LIB_FLAG}" @ 1.1.1.1 log @Initial import of new pkgsrc/lang/tk (tk-8.3.2) package, partly derived from the older pkgsrc/lang/tk80 (tk-8.0.5) package. This is an update of the tk package from version 8.0.5 to version 8.3.2, and also a slight change in the organization of tcl/tk packages. This will be added disabled to pkgsrc/x11/Makefile until I finish updating all tcl/tk-based packags. Changes from out-of-the-box tk-8.3.2: Both static and shared libtcl83.* are installed, thanks to the magic of libtool. Changes to the package since tk-8.3.2: A symlink to ${PREFIX}/bin/wish8.3 is installed as ${PREFIX}/bin/wish This change is designed to allow tk-using packages to not depend on any particular version of tk. public tk include files and the tk configuration information script are now installed in their standard places (${PREFIX}/include/tk*.h, and ${PREFIX}/lib/tkConfig.sh), and private tcl include files are now installed in ${PREFIX}/include/tk. This change allows tcl extension packages to work out of the box, and to not need modification when tcl and tk are updated. When extension package authors use the new libtclstubs*.a API, this even allows binary packages of dynamically- loadable tcl extensions to be used with newer versions of tcl without recompilation. Here are the new features in tk-8.3.x as opposed to 8.0.x. I am not including bug fixes as this represents about 18 months of them. Img patch from Nijtmans, et al was adopted. This includes a Tcl_Obj-based image command, support for binary in -data args, adds an alpha channel to all photo types, as well as GIF write capability. Major portions of Dash patch from Nijtmans, et al was adopted. This includes a Tcl_Obj-based canvas command, dashed canvas item support, enhanced canvas tag searching capabilities, pointer warping with event -warp, entry widget validation routines, -elide tag option for of the text widget (TkMan runs on 8.3 without a patch), several new canvas item arguments, as well as postscript printing support for images and windows in the canvas. Listboxes support a -listvariable and have a new itemconfigure command to color individual items. Extended "wm state" command to accept a state to set for the toplevel, and added support for the zoomed (maximized) state on Windows. Standard Unix dialogs have been updated to use color icons and have improved behavior. New "tk useinputmethods" command. This changes the behavior of Tk on X where X Input Methods (XIM) were recognized and used without question. With 8.3, they will be recognized and initialized, but not used unless XIM is turned on (tk useinputmethods 1). This should only affect users with special input methods, and the new default behavior should be more beneficial to the average user. @ text @@