*** configure.orig	Fri May 14 08:52:43 1999
--- configure	Wed Jun  9 16:04:15 1999
***************
*** 875,885 ****
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
! test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
! test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
  
! test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
--- 875,885 ----
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
! INSTALL_PROGRAM='${INSTALL}'
  
! INSTALL_SCRIPT='${INSTALL_PROGRAM}'
  
! INSTALL_DATA='${INSTALL} -m 644'
  
  # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
***************
*** 2642,2648 ****
  itcl=''
  if test "x$with_tcl" = "xyes" || test "x$with_tcl" = "x" ; then
  	for tcl_path in /usr/local/tcl8.0 /usr/local/tcl7.6 /usr/local/tcl7.5 /usr/local /usr /usr/local/tcl7.4; do
! 		if test -f $tcl_path/lib/tclConfig.sh; then
  			with_tcl=$tcl_path; break
  		elif test -f $tcl_path/lib/itcl/tclConfig.sh; then
  			itcl='/itcl'
--- 2642,2650 ----
  itcl=''
  if test "x$with_tcl" = "xyes" || test "x$with_tcl" = "x" ; then
  	for tcl_path in /usr/local/tcl8.0 /usr/local/tcl7.6 /usr/local/tcl7.5 /usr/local /usr /usr/local/tcl7.4; do
! 		if test -f $tcl_path/lib/tcl8.0/tclConfig.sh; then
! 			with_tcl=$tcl_path; break
! 		elif test -f $tcl_path/lib/tclConfig.sh; then
  			with_tcl=$tcl_path; break
  		elif test -f $tcl_path/lib/itcl/tclConfig.sh; then
  			itcl='/itcl'
***************
*** 2683,2695 ****
  elif test "x$with_tcl" = "xno"; then
  	echo "$ac_t""not used" 1>&6
  else
! 	tclConfig="$with_tcl/lib$itcl/tclConfig.sh"
  	if test ! -f $tclConfig; then
  		echo "$ac_t""Unable to find tclConfig.sh" 1>&6
  	else
  		. $tclConfig
  		echo "$ac_t""version $TCL_VERSION from $tclConfig" 1>&6
! 		TCL_INC="-I$TCL_PREFIX/include$itcl"
  		TCL_BIN="$TCL_EXEC_PREFIX/bin"
  		TCLLIBS="$TCL_LIB_SPEC $TCL_LIBS"
  		TCLTKLIBS="$TCLLIBS"
--- 2685,2697 ----
  elif test "x$with_tcl" = "xno"; then
  	echo "$ac_t""not used" 1>&6
  else
! 	tclConfig="$with_tcl/lib/tcl8.0$itcl/tclConfig.sh"
  	if test ! -f $tclConfig; then
  		echo "$ac_t""Unable to find tclConfig.sh" 1>&6
  	else
  		. $tclConfig
  		echo "$ac_t""version $TCL_VERSION from $tclConfig" 1>&6
! 		TCL_INC="-I$TCL_PREFIX/include/tcl8.0$itcl"
  		TCL_BIN="$TCL_EXEC_PREFIX/bin"
  		TCLLIBS="$TCL_LIB_SPEC $TCL_LIBS"
  		TCLTKLIBS="$TCLLIBS"
***************
*** 2700,2706 ****
  		
  		if test "x$with_itcl" = "xyes" || test "x$with_itcl" = "x"; then
  			for itcl_path in $with_tcl; do
! 				if test -f $itcl_path/lib$itcl/itclConfig.sh; then
  					with_itcl=$itcl_path; break
  				fi
  			done
--- 2702,2708 ----
  		
  		if test "x$with_itcl" = "xyes" || test "x$with_itcl" = "x"; then
  			for itcl_path in $with_tcl; do
! 				if test -f $itcl_path/lib/tcl8.0$itcl/itclConfig.sh; then
  					with_itcl=$itcl_path; break
  				fi
  			done
***************
*** 2718,2730 ****
  		elif test "x$with_itcl" = "xno"; then
  			echo "$ac_t""not used" 1>&6
  		else
! 			itclConfig="$with_itcl/lib$itcl/itclConfig.sh"
  			if test ! -f $itclConfig; then
  				echo "$ac_t""Unable to find itclConfig.sh" 1>&6
  			else
  				. $itclConfig
  				echo "$ac_t""version $ITCL_VERSION from $itclConfig" 1>&6
! 				ITCL_INC="-I$TK_PREFIX/include$itcl"
  				#TK_BIN="$TK_EXEC_PREFIX/bin"
  				#TKLIBS="$TK_LIB_SPEC $TCL_LIB_SPEC $TK_LIBS"
  				#TCLTK_LIBS="\$(TK_LIB_SPEC) \$(TCL_LIB_SPEC) \$(TK_LIBS)"
--- 2720,2732 ----
  		elif test "x$with_itcl" = "xno"; then
  			echo "$ac_t""not used" 1>&6
  		else
! 			itclConfig="$with_itcl/lib/tcl8.0$itcl/itclConfig.sh"
  			if test ! -f $itclConfig; then
  				echo "$ac_t""Unable to find itclConfig.sh" 1>&6
  			else
  				. $itclConfig
  				echo "$ac_t""version $ITCL_VERSION from $itclConfig" 1>&6
! 				ITCL_INC="-I$TK_PREFIX/include/tcl8.0$itcl"
  				#TK_BIN="$TK_EXEC_PREFIX/bin"
  				#TKLIBS="$TK_LIB_SPEC $TCL_LIB_SPEC $TK_LIBS"
  				#TCLTK_LIBS="\$(TK_LIB_SPEC) \$(TCL_LIB_SPEC) \$(TK_LIBS)"
***************
*** 2742,2748 ****
  
  		if test "x$with_tk" = "xyes" || test "x$with_tk" = "x"; then
  			for tk_path in $with_tcl; do
! 				if test -f $tk_path/lib$itcl/tkConfig.sh; then
  					with_tk=$tk_path; break
  				fi
  			done
--- 2744,2750 ----
  
  		if test "x$with_tk" = "xyes" || test "x$with_tk" = "x"; then
  			for tk_path in $with_tcl; do
! 				if test -f $tk_path/lib/tk8.0$itcl/tkConfig.sh; then
  					with_tk=$tk_path; break
  				fi
  			done
***************
*** 2760,2772 ****
  		elif test "x$with_tk" = "xno"; then
  			echo "$ac_t""not used" 1>&6
  		else
! 			tkConfig="$with_tk/lib$itcl/tkConfig.sh"
  			if test ! -f $tkConfig; then
  				echo "$ac_t""Unable to find tkConfig.sh" 1>&6
  			else
  				. $tkConfig
  				echo "$ac_t""version $TK_VERSION from $tkConfig" 1>&6
! 				TK_INC="-I$TK_PREFIX/include$itcl"
  				TK_BIN="$TK_EXEC_PREFIX/bin"
  				TKLIBS="$TK_LIB_SPEC $TCL_LIB_SPEC $TK_LIBS"
  				TCLTK_LIBS="\$(TK_LIB_SPEC) \$(TCL_LIB_SPEC) \$(TK_LIBS)"
--- 2762,2774 ----
  		elif test "x$with_tk" = "xno"; then
  			echo "$ac_t""not used" 1>&6
  		else
! 			tkConfig="$with_tk/lib/tk8.0$itcl/tkConfig.sh"
  			if test ! -f $tkConfig; then
  				echo "$ac_t""Unable to find tkConfig.sh" 1>&6
  			else
  				. $tkConfig
  				echo "$ac_t""version $TK_VERSION from $tkConfig" 1>&6
! 				TK_INC="-I$TK_PREFIX/include/tk8.0$itcl"
  				TK_BIN="$TK_EXEC_PREFIX/bin"
  				TKLIBS="$TK_LIB_SPEC $TCL_LIB_SPEC $TK_LIBS"
  				TCLTK_LIBS="\$(TK_LIB_SPEC) \$(TCL_LIB_SPEC) \$(TK_LIBS)"
