merge trunk

1 files changed, 100 insertions, 191 deletions

diff --git a/unix/configure b/unix/configure
index d7408c4..66b1581 100755
--- a/unix/configure
+++ b/unix/configure
@@ -661,6 +661,8 @@ TK_PATCH_LEVEL
 TK_MINOR_VERSION
 TK_MAJOR_VERSION
 TK_VERSION
+TK_DEMO_DIR
+DEMO_DIR
 UNIX_FONT_OBJS
 XFT_LIBS
 XFT_CFLAGS
@@ -707,6 +709,8 @@ LDFLAGS
 CFLAGS
 CC
 MAN_FLAGS
+BUILD_TCLSH
+TCLSH_PROG
 TCL_STUB_LIB_SPEC
 TCL_STUB_LIB_FLAG
 TCL_STUB_LIB_FILE
@@ -717,11 +721,6 @@ TCL_SRC_DIR
 TCL_BIN_DIR
 TCL_PATCH_LEVEL
 TCL_VERSION
-TCL_ACTUAL_SRC_DIR
-TCL_SOURCE_MINOR_VERSION
-TCL_SOURCE_MAJOR_VERSION
-BUILD_TCLSH
-TCLSH_PROG
 target_alias
 host_alias
 build_alias
@@ -741,6 +740,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -768,6 +768,7 @@ with_tcl
 enable_man_symlinks
 enable_man_compression
 enable_man_suffix
+with_encoding
 enable_shared
 enable_64bit
 enable_64bit_vis
@@ -829,6 +830,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1081,6 +1083,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1218,7 +1229,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1371,6 +1382,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1430,6 +1442,8 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-tcl              directory containing tcl configuration
                           (tclConfig.sh)
+  --with-encoding         encoding for configuration values (default:
+                          iso8859-1)
   --with-x                use the X Window System
 
 Some influential environment variables:
@@ -2291,47 +2305,6 @@ LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
 # Find and load the tclConfig.sh file
 #--------------------------------------------------------------------
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh" >&5
-$as_echo_n "checking for tclsh... " >&6; }
-    if ${ac_cv_path_tclsh+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-	search_path=`echo ${PATH} | sed -e 's/:/ /g'`
-	for dir in $search_path ; do
-	    for j in `ls -r $dir/tclsh[8-9]* 2> /dev/null` \
-		    `ls -r $dir/tclsh* 2> /dev/null` ; do
-		if test x"$ac_cv_path_tclsh" = x ; then
-		    if test -f "$j" ; then
-			ac_cv_path_tclsh=$j
-			break
-		    fi
-		fi
-	    done
-	done
-
-fi
-
-
-    if test -f "$ac_cv_path_tclsh" ; then
-	TCLSH_PROG="$ac_cv_path_tclsh"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH_PROG" >&5
-$as_echo "$TCLSH_PROG" >&6; }
-    else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: No tclsh avaliable" >&5
-$as_echo "No tclsh avaliable" >&6; }
-    fi
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh in Tcl build directory" >&5
-$as_echo_n "checking for tclsh in Tcl build directory... " >&6; }
-    BUILD_TCLSH="${TCL_BIN_DIR}"/tclsh
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_TCLSH" >&5
-$as_echo "$BUILD_TCLSH" >&6; }
-
-
-
 
     #
     # Ok, lets find the tcl configuration
@@ -2513,144 +2486,6 @@ $as_echo "could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
     eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""
 
 
-    TCL_ACTUAL_SRC_DIR=` <<-'EOF' "$TCLSH_PROG" - "$srcdir" "$TCL_SRC_DIR" \
-	"$TCL_MAJOR_VERSION" "$TCL_MINOR_VERSION"
-
-    proc cat fname {
-	set chan [open $fname]
-	try {
-	    read $chan
-	} finally {
-	    close $chan
-	}
-    }
-
-    proc main {argv0 argv} {
-	try {
-	    lassign $argv -> srcdir tcl_src_dir majortarget minortarget
-	    lappend candidates $tcl_src_dir
-	    set srcdir [file dirname [file normalize $srcdir/...]]
-	    set topsrcdir [file dirname $srcdir]
-	    set sources [file dirname $topsrcdir]
-	    foreach dirname [glob -nocomplain -directory $sources *] {
-		if {$dirname ni $candidates} {
-		    lappend candidates $dirname
-		}
-	    }
-	    foreach candidate $candidates {
-		set res [check $candidate $majortarget $minortarget]
-		if {$res eq {}} continue else {
-		    puts -nonewline $res
-		    break
-		}
-	    }
-	    set status 0
-	} on error {tres topts} {
-	    puts stderr [dict get $topts -errorinfo]
-	    set status 1
-	}
-	exit $status
-    }
-
-    proc check {candidate majortarget minortarget} {
-	set tclh $candidate/generic/tcl.h
-
-	if {![file exists $tclh]} {
-	    return {}
-	}
-
-	set version [tclhversion [cat $tclh]]
-	if {[llength $version]} {
-	    lassign $version major minor
-	    if {[package vcompare $major.$minor \
-		$majortarget.$minortarget] >= 0} {
-		return [list $candidate $major $minor]
-	    }
-	}
-
-	return {}
-    }
-
-    proc tclhversion data {
-	if {[regexp -line {^#define\s+_TCL} $data]} {
-	    if {[
-		regexp -line {^#define\s+TCL_VERSION\s+\"([^.])+\.([^.\"]+)} \
-		    $data -> major minor
-	    ]} {
-		return [list $major $minor]
-	    }
-	}
-	return {}
-    }
-    main $argv0 $argv
-    EOF
-
-    `
-
-    if test "x${TCL_ACTUAL_SRC_DIR}" = x; then
-	as_fn_error $? "could not find Tcl sources" "$LINENO" 5
-    else
-	TCL_SOURCE_MAJOR_VERSION=` <<-'EOF' "$TCLSH_PROG" - "$TCL_ACTUAL_SRC_DIR " "1"
-	proc main {argv0 argv} {
-	    try {
-		lassign $argv -> list index
-		puts -nonewline [lindex $list $index]
-		set status 0
-	    } on error {tres topts} {
-		puts stderr [dict get $topts -errorinfo]
-		set status 1
-	    }
-	    exit $status
-	}
-	main $argv0 $argv
-	EOF
-    `
-
-
-
-
-	TCL_SOURCE_MINOR_VERSION=` <<-'EOF' "$TCLSH_PROG" - "$TCL_ACTUAL_SRC_DIR " "2"
-	proc main {argv0 argv} {
-	    try {
-		lassign $argv -> list index
-		puts -nonewline [lindex $list $index]
-		set status 0
-	    } on error {tres topts} {
-		puts stderr [dict get $topts -errorinfo]
-		set status 1
-	    }
-	    exit $status
-	}
-	main $argv0 $argv
-	EOF
-    `
-
-
-
-
-	TCL_ACTUAL_SRC_DIR=` <<-'EOF' "$TCLSH_PROG" - "$TCL_ACTUAL_SRC_DIR " "0"
-	proc main {argv0 argv} {
-	    try {
-		lassign $argv -> list index
-		puts -nonewline [lindex $list $index]
-		set status 0
-	    } on error {tres topts} {
-		puts stderr [dict get $topts -errorinfo]
-		set status 1
-	    }
-	    exit $status
-	}
-	main $argv0 $argv
-	EOF
-    `
-
-
-
-
-    fi
-
-
-
 
 
 
@@ -2676,6 +2511,49 @@ fi
 fi
 
 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh" >&5
+$as_echo_n "checking for tclsh... " >&6; }
+    if ${ac_cv_path_tclsh+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+	search_path=`echo ${PATH} | sed -e 's/:/ /g'`
+	for dir in $search_path ; do
+	    for j in `ls -r $dir/tclsh[8-9]* 2> /dev/null` \
+		    `ls -r $dir/tclsh* 2> /dev/null` ; do
+		if test x"$ac_cv_path_tclsh" = x ; then
+		    if test -f "$j" ; then
+			ac_cv_path_tclsh=$j
+			break
+		    fi
+		fi
+	    done
+	done
+
+fi
+
+
+    if test -f "$ac_cv_path_tclsh" ; then
+	TCLSH_PROG="$ac_cv_path_tclsh"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH_PROG" >&5
+$as_echo "$TCLSH_PROG" >&6; }
+    else
+	# It is not an error if an installed version of Tcl can't be located.
+	TCLSH_PROG=""
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: No tclsh found on PATH" >&5
+$as_echo "No tclsh found on PATH" >&6; }
+    fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh in Tcl build directory" >&5
+$as_echo_n "checking for tclsh in Tcl build directory... " >&6; }
+    BUILD_TCLSH="${TCL_BIN_DIR}"/tclsh
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_TCLSH" >&5
+$as_echo "$BUILD_TCLSH" >&6; }
+
+
+
 #------------------------------------------------------------------------
 # Handle the --prefix=... option
 #------------------------------------------------------------------------
@@ -4090,6 +3968,31 @@ $as_echo "$tcl_cv_cc_pipe" >&6; }
     fi
 fi
 
+#------------------------------------------------------------------------
+# Embedded configuration information, encoding to use for the values, TIP #59
+#------------------------------------------------------------------------
+
+
+
+# Check whether --with-encoding was given.
+if test "${with_encoding+set}" = set; then :
+  withval=$with_encoding; with_tcencoding=${withval}
+fi
+
+
+    if test x"${with_tcencoding}" != x ; then
+
+cat >>confdefs.h <<_ACEOF
+#define TCL_CFGVAL_ENCODING "${with_tcencoding}"
+_ACEOF
+
+    else
+
+$as_echo "#define TCL_CFGVAL_ENCODING \"iso8859-1\"" >>confdefs.h
+
+    fi
+
+
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build libraries" >&5
 $as_echo_n "checking how to build libraries... " >&6; }
@@ -5368,12 +5271,6 @@ fi
 	    SHLIB_SUFFIX=".dylib"
 	    DL_OBJS="tclLoadDyld.o"
 	    DL_LIBS=""
-	    # Don't use -prebind when building for Mac OS X 10.4 or later only:
-	    if test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F '10\\.' '{print int($2)}'`" -lt 4 -a \
-		"`echo "${CPPFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int($2)}'`" -lt 4; then :
-
-		LDFLAGS="$LDFLAGS -prebind"
-fi
 	    LDFLAGS="$LDFLAGS -headerpad_max_install_names"
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -search_paths_first flag" >&5
 $as_echo_n "checking if ld accepts -search_paths_first flag... " >&6; }
@@ -8466,6 +8363,18 @@ TK_STUB_LIB_PATH="${TK_STUB_LIB_DIR}/${TK_STUB_LIB_FILE}"
 eval "TK_INCLUDE_SPEC=\"-I${includedir}\""
 
 #------------------------------------------------------------------------
+# Demo dir
+#------------------------------------------------------------------------
+
+if test x"${DEMO_DIR}" = x; then :
+  DEMO_DIR='$(TK_LIBRARY)/demos'
+fi
+eval "TK_DEMO_DIR=\"`echo ${DEMO_DIR} | tr '()' '{}'`\""
+eval "TK_DEMO_DIR=\"`echo ${TK_DEMO_DIR} | tr '()' '{}'`\""
+
+
+
+#------------------------------------------------------------------------
 # tkConfig.sh refers to this by a different name
 #------------------------------------------------------------------------