summaryrefslogtreecommitdiff
path: root/mbone
diff options
context:
space:
mode:
authorrh <rh@pkgsrc.org>1999-12-08 10:20:37 +0000
committerrh <rh@pkgsrc.org>1999-12-08 10:20:37 +0000
commit75cb45d15395f00bed96dd99ab7efbe6aece190a (patch)
tree3372d25c6977a251989482a8c3346820e40f271f /mbone
parentd7a61e6219c174546f0e2fdccf9fd0f0304755f6 (diff)
downloadpkgsrc-75cb45d15395f00bed96dd99ab7efbe6aece190a.tar.gz
clean up multi-patch mess and defuzz.
Diffstat (limited to 'mbone')
-rw-r--r--mbone/vat/files/patch-sum10
-rw-r--r--mbone/vat/patches/patch-aa1738
-rw-r--r--mbone/vat/patches/patch-ae1592
-rw-r--r--mbone/vat/patches/patch-ag61
-rw-r--r--mbone/vat/patches/patch-ah269
5 files changed, 1540 insertions, 2130 deletions
diff --git a/mbone/vat/files/patch-sum b/mbone/vat/files/patch-sum
index d75644d9ecd..d0ace689a54 100644
--- a/mbone/vat/files/patch-sum
+++ b/mbone/vat/files/patch-sum
@@ -1,12 +1,12 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:12 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/12/08 10:20:37 rh Exp $
-MD5 (patch-aa) = 07f10633cf72d65a7fc2867572e582f8
+MD5 (patch-aa) = f5d5cbfa1234ac41af5a3ead8d250d4b
MD5 (patch-ab) = f43d163bafd5a5cce7911643306df48a
MD5 (patch-ac) = 3e6a6054afe4f4cb94803428f52d0253
MD5 (patch-ad) = 061830188d2189942d45fb7d15d7f29c
-MD5 (patch-ae) = f66731b1f89ecaf33f6d082afa504752
+MD5 (patch-ae) = 8a00845503fea0e9d2eea7ffe42d3704
MD5 (patch-af) = 9c2f9ad852afae00ba1fcad4f3af214a
-MD5 (patch-ag) = 5a428c398be526a3b3e8381c1f4d5366
-MD5 (patch-ah) = 1c64e257d9c51940376c464cb9892fa1
+MD5 (patch-ag) = b716809fe747bf21c0a422d42f079810
+MD5 (patch-ah) = a72bfd8638721dffd284175d51377379
MD5 (patch-ai) = ec5faaebd35a8dc0cb49dae09ef12746
MD5 (patch-aj) = 8a785a1447ec2c6d76d041fe004eeff3
diff --git a/mbone/vat/patches/patch-aa b/mbone/vat/patches/patch-aa
index d5d3cf87aa7..7844d57748e 100644
--- a/mbone/vat/patches/patch-aa
+++ b/mbone/vat/patches/patch-aa
@@ -1,1719 +1,27 @@
-$NetBSD: patch-aa,v 1.4 1999/06/04 15:21:12 mycroft Exp $
+$NetBSD: patch-aa,v 1.5 1999/12/08 10:20:37 rh Exp $
---- configure.orig Thu May 16 04:03:58 1996
-+++ configure Fri Jun 4 11:18:21 1999
-@@ -1,7 +1,7 @@
- #! /bin/sh
-
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.10
-+# Generated automatically using autoconf version 2.12
- # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
- #
- # This configure script is free software; the Free Software Foundation
-@@ -61,6 +61,8 @@
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-+# Maximum number of lines to put in a shell here document.
-+ac_max_here_lines=12
-
- ac_prev=
- for ac_option
-@@ -342,7 +344,7 @@
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers)
-- echo "configure generated by autoconf version 2.10"
-+ echo "configure generated by autoconf version 2.12"
- exit 0 ;;
-
- -with-* | --with-*)
-@@ -444,11 +446,14 @@
- done
-
- # NLS nuisances.
--# Only set LANG and LC_ALL to C if already set.
--# These must not be set unconditionally because not all systems understand
--# e.g. LANG=C (notably SCO).
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+# Only set these to C if already set. These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
- if test "${LANG+set}" = set; then LANG=C; export LANG; fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
-
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
-@@ -510,6 +515,7 @@
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
- ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-
- if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-@@ -577,6 +583,7 @@
- fi
-
- echo $ac_n "checking host system type""... $ac_c" 1>&6
-+echo "configure:587: checking host system type" >&5
-
- host_alias=$host
- case "$host_alias" in
-@@ -591,12 +598,13 @@
- esac
-
- host=`$ac_config_sub $host_alias`
--host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
--host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
--host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
-+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- echo "$ac_t""$host" 1>&6
-
- echo $ac_n "checking target system type""... $ac_c" 1>&6
-+echo "configure:608: checking target system type" >&5
-
- target_alias=$target
- case "$target_alias" in
-@@ -608,12 +616,13 @@
- esac
-
- target=`$ac_config_sub $target_alias`
--target_cpu=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
--target_vendor=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
--target_os=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
-+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- echo "$ac_t""$target" 1>&6
-
- echo $ac_n "checking build system type""... $ac_c" 1>&6
-+echo "configure:626: checking build system type" >&5
-
- build_alias=$build
- case "$build_alias" in
-@@ -625,9 +634,9 @@
- esac
-
- build=`$ac_config_sub $build_alias`
--build_cpu=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
--build_vendor=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
--build_os=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
-+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- echo "$ac_t""$build" 1>&6
-
- test "$host_alias" != "$target_alias" &&
-@@ -639,6 +648,7 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:652: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -667,6 +677,7 @@
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:681: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -713,7 +724,47 @@
- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
- fi
-
-+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-+echo "configure:729: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+cat > conftest.$ac_ext <<EOF
-+#line 739 "configure"
-+#include "confdefs.h"
-+main(){return(0);}
-+EOF
-+if { (eval echo configure:743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+ ac_cv_prog_cc_works=yes
-+ # If we can't run a trivial program, we are probably using a cross compiler.
-+ if (./conftest; exit) 2>/dev/null; then
-+ ac_cv_prog_cc_cross=no
-+ else
-+ ac_cv_prog_cc_cross=yes
-+ fi
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ ac_cv_prog_cc_works=no
-+fi
-+rm -fr conftest*
-+
-+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-+if test $ac_cv_prog_cc_works = no; then
-+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-+fi
-+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-+echo "configure:763: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-+cross_compiling=$ac_cv_prog_cc_cross
-+
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-+echo "configure:768: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -722,7 +773,7 @@
- yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
- ac_cv_prog_gcc=yes
- else
- ac_cv_prog_gcc=no
-@@ -730,40 +781,46 @@
- fi
-
- echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-+
- if test $ac_cv_prog_gcc = yes; then
- GCC=yes
-- if test "${CFLAGS+set}" != set; then
-- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
-+ ac_test_CFLAGS="${CFLAGS+set}"
-+ ac_save_CFLAGS="$CFLAGS"
-+ CFLAGS=
-+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-+echo "configure:792: checking whether ${CC-cc} accepts -g" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- echo 'void f(){}' > conftest.c
- if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-- ac_cv_prog_gcc_g=yes
-+ ac_cv_prog_cc_g=yes
- else
-- ac_cv_prog_gcc_g=no
-+ ac_cv_prog_cc_g=no
- fi
- rm -f conftest*
-
- fi
-
--echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
-- if test $ac_cv_prog_gcc_g = yes; then
-- CFLAGS="-g -O"
-- else
-- CFLAGS="-O"
-- fi
-+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-+ if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS="$ac_save_CFLAGS"
-+ elif test $ac_cv_prog_cc_g = yes; then
-+ CFLAGS="-g -O2"
-+ else
-+ CFLAGS="-O2"
- fi
- else
- GCC=
- test "${CFLAGS+set}" = set || CFLAGS="-g"
- fi
-
--for ac_prog in $CCC c++ g++ gcc CC cxx
-+for ac_prog in $CCC c++ g++ gcc CC cxx cc++
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:824: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -793,7 +850,53 @@
- test -n "$CXX" || CXX="gcc"
-
-
-+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-+echo "configure:855: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-+
-+ac_ext=C
-+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cxx_cross
-+
-+cat > conftest.$ac_ext <<EOF
-+#line 865 "configure"
-+#include "confdefs.h"
-+main(){return(0);}
-+EOF
-+if { (eval echo configure:869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+ ac_cv_prog_cxx_works=yes
-+ # If we can't run a trivial program, we are probably using a cross compiler.
-+ if (./conftest; exit) 2>/dev/null; then
-+ ac_cv_prog_cxx_cross=no
-+ else
-+ ac_cv_prog_cxx_cross=yes
-+ fi
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ ac_cv_prog_cxx_works=no
-+fi
-+rm -fr conftest*
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
-+if test $ac_cv_prog_cxx_works = no; then
-+ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
-+fi
-+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-+echo "configure:895: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
-+cross_compiling=$ac_cv_prog_cxx_cross
-+
- echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-+echo "configure:900: checking whether we are using GNU C++" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -802,7 +905,7 @@
- yes;
- #endif
- EOF
--if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
- ac_cv_prog_gxx=yes
- else
- ac_cv_prog_gxx=no
-@@ -810,29 +913,34 @@
- fi
-
- echo "$ac_t""$ac_cv_prog_gxx" 1>&6
-+
- if test $ac_cv_prog_gxx = yes; then
- GXX=yes
-- if test "${CXXFLAGS+set}" != set; then
-- echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
--if eval "test \"`echo '$''{'ac_cv_prog_gxx_g'+set}'`\" = set"; then
-+ ac_test_CXXFLAGS="${CXXFLAGS+set}"
-+ ac_save_CXXFLAGS="$CXXFLAGS"
-+ CXXFLAGS=
-+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-+echo "configure:924: checking whether ${CXX-g++} accepts -g" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- echo 'void f(){}' > conftest.cc
- if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
-- ac_cv_prog_gxx_g=yes
-+ ac_cv_prog_cxx_g=yes
- else
-- ac_cv_prog_gxx_g=no
-+ ac_cv_prog_cxx_g=no
- fi
- rm -f conftest*
-
- fi
-
--echo "$ac_t""$ac_cv_prog_gxx_g" 1>&6
-- if test $ac_cv_prog_gxx_g = yes; then
-- CXXFLAGS="-g -O"
-- else
-- CXXFLAGS="-O"
-- fi
-+echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
-+ if test "$ac_test_CXXFLAGS" = set; then
-+ CXXFLAGS="$ac_save_CXXFLAGS"
-+ elif test $ac_cv_prog_cxx_g = yes; then
-+ CXXFLAGS="-g -O2"
-+ else
-+ CXXFLAGS="-O2"
- fi
- else
- GXX=
-@@ -840,6 +948,7 @@
- fi
-
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-+echo "configure:952: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-@@ -854,33 +963,37 @@
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <<EOF
--#line 858 "configure"
-+#line 967 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out`
- if test -z "$ac_err"; then
- :
- else
- echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.$ac_ext <<EOF
--#line 873 "configure"
-+#line 984 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out`
- if test -z "$ac_err"; then
- :
- else
- echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- CPP=/lib/cpp
- fi
-@@ -895,38 +1008,13 @@
- fi
- echo "$ac_t""$CPP" 1>&6
-
--# If we cannot run a trivial program, we must be cross compiling.
--echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6
--if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- if test "$cross_compiling" = yes; then
-- ac_cv_c_cross=yes
--else
--cat > conftest.$ac_ext <<EOF
--#line 908 "configure"
--#include "confdefs.h"
--main(){return(0);}
--EOF
--{ (eval echo configure:912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
--if test -s conftest && (./conftest; exit) 2>/dev/null; then
-- ac_cv_c_cross=no
--else
-- ac_cv_c_cross=yes
--fi
--fi
--rm -fr conftest*
--fi
--
--echo "$ac_t""$ac_cv_c_cross" 1>&6
--cross_compiling=$ac_cv_c_cross
--
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-+echo "configure:1013: 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 <<EOF
--#line 930 "configure"
-+#line 1018 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -934,13 +1022,15 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out`
- if test -z "$ac_err"; then
- rm -rf conftest*
- ac_cv_header_stdc=yes
- else
- echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- ac_cv_header_stdc=no
- fi
-@@ -949,7 +1039,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
--#line 953 "configure"
-+#line 1043 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -967,7 +1057,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
--#line 971 "configure"
-+#line 1061 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -987,8 +1077,8 @@
- if test "$cross_compiling" = yes; then
- :
- else
--cat > conftest.$ac_ext <<EOF
--#line 992 "configure"
-+ cat > conftest.$ac_ext <<EOF
-+#line 1082 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -999,15 +1089,19 @@
- exit (0); }
-
- EOF
--{ (eval echo configure:1003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
--if test -s conftest && (./conftest; exit) 2>/dev/null; then
-+if { (eval echo configure:1093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+then
- :
- else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -fr conftest*
- ac_cv_header_stdc=no
- fi
--fi
- rm -fr conftest*
- fi
-+
-+fi
- fi
-
- echo "$ac_t""$ac_cv_header_stdc" 1>&6
-@@ -1020,24 +1114,27 @@
-
- for ac_hdr in string.h
- do
--ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:1120: 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
--#line 1030 "configure"
-+#line 1125 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out`
- if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
- else
- echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
- fi
-@@ -1045,7 +1142,7 @@
- fi
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-- ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'`
-+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
- #define $ac_tr_hdr 1
- EOF
-@@ -1066,26 +1163,28 @@
- V_TARCMD="tar cfh"
- V_SIGRET="void"
-
--echo $ac_n "checking for -lXbsd""... $ac_c" 1>&6
--ac_lib_var=`echo Xbsd'_'main | tr './+\055' '__p_'`
-+echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-+echo "configure:1168: 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
- else
- ac_save_LIBS="$LIBS"
- LIBS="-lXbsd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1078 "configure"
-+#line 1176 "configure"
- #include "confdefs.h"
-
--int main() { return 0; }
--int t() {
-+int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:1086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -1100,30 +1199,32 @@
- echo "$ac_t""no" 1>&6
- fi
-
--echo $ac_n "checking for -lsocket""... $ac_c" 1>&6
--ac_lib_var=`echo socket'_'poll | tr './+\055' '__p_'`
-+echo $ac_n "checking for poll in -lsocket""... $ac_c" 1>&6
-+echo "configure:1204: checking for poll in -lsocket" >&5
-+ac_lib_var=`echo socket'_'poll | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1112 "configure"
-+#line 1212 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char poll();
-
--int main() { return 0; }
--int t() {
-+int main() {
- poll()
- ; return 0; }
- EOF
--if { (eval echo configure:1124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -1138,30 +1239,32 @@
- echo "$ac_t""no" 1>&6
- fi
-
--echo $ac_n "checking for -lnsl""... $ac_c" 1>&6
--ac_lib_var=`echo nsl'_'gethostbyname | tr './+\055' '__p_'`
-+echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-+echo "configure:1244: checking for gethostbyname in -lnsl" >&5
-+ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
- LIBS="-lnsl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1150 "configure"
-+#line 1252 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char gethostbyname();
-
--int main() { return 0; }
--int t() {
-+int main() {
- gethostbyname()
- ; return 0; }
- EOF
--if { (eval echo configure:1162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -1176,30 +1279,32 @@
- echo "$ac_t""no" 1>&6
- fi
-
--echo $ac_n "checking for -ldnet_stub""... $ac_c" 1>&6
--ac_lib_var=`echo dnet_stub'_'getnodebyname | tr './+\055' '__p_'`
-+echo $ac_n "checking for getnodebyname in -ldnet_stub""... $ac_c" 1>&6
-+echo "configure:1284: checking for getnodebyname in -ldnet_stub" >&5
-+ac_lib_var=`echo dnet_stub'_'getnodebyname | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
- LIBS="-ldnet_stub $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1188 "configure"
-+#line 1292 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char getnodebyname();
-
--int main() { return 0; }
--int t() {
-+int main() {
- getnodebyname()
- ; return 0; }
- EOF
--if { (eval echo configure:1200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -1304,18 +1409,20 @@
- echo "checking for X11 header files"
- if test "$x_includes" = NONE ; then
- cat > conftest.$ac_ext <<EOF
--#line 1308 "configure"
-+#line 1413 "configure"
- #include "confdefs.h"
- #include <X11/Intrinsic.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out`
- if test -z "$ac_err"; then
- rm -rf conftest*
- x_includes=""
- else
- echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- x_includes=NONE
- fi
-@@ -1340,30 +1447,32 @@
-
- echo "checking for X11 library archive"
- if test "$x_libraries" = NONE ; then
-- echo $ac_n "checking for -lX11""... $ac_c" 1>&6
--ac_lib_var=`echo X11'_'XOpenDisplay | tr './+\055' '__p_'`
-+ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-+echo "configure:1452: checking for XOpenDisplay in -lX11" >&5
-+ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
- LIBS="-lX11 $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1352 "configure"
-+#line 1460 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char XOpenDisplay();
-
--int main() { return 0; }
--int t() {
-+int main() {
- XOpenDisplay()
- ; return 0; }
- EOF
--if { (eval echo configure:1364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -1397,30 +1506,32 @@
-
- if test -n "$V_SHM" ; then
- if test -z "$x_libraries" ; then
-- echo $ac_n "checking for -lXext""... $ac_c" 1>&6
--ac_lib_var=`echo Xext'_'XShmAttach | tr './+\055' '__p_'`
-+ echo $ac_n "checking for XShmAttach in -lXext""... $ac_c" 1>&6
-+echo "configure:1511: checking for XShmAttach in -lXext" >&5
-+ac_lib_var=`echo Xext'_'XShmAttach | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
- LIBS="-lXext -lX11 $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1409 "configure"
-+#line 1519 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char XShmAttach();
-
--int main() { return 0; }
--int t() {
-+int main() {
- XShmAttach()
- ; return 0; }
- EOF
--if { (eval echo configure:1421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -1452,10 +1563,7 @@
- fi
-
- if test -n "$x_libraries" ; then
-- V_LIB_X11="-L$x_libraries $V_LIB_X11"
-- if test $solaris ; then
-- V_LIB_X11="-R$x_libraries $V_LIB_X11"
-- fi
-+ V_LIB_X11="-Wl,-R$x_libraries -L$x_libraries $V_LIB_X11"
- fi
-
-
-@@ -1468,6 +1576,7 @@
- d=""
- fi
-
-+tclposs="tcl8.0 tcl80 tcl"
- if test "$d" != "" ; then
- if test ! -d $d ; then
- echo "'$d' is not a directory"
-@@ -1478,22 +1587,22 @@
- echo "can't find tcl.h in $d/include"
- exit 1
- fi
-- places="$d/lib/libtcl7.5.so \
-- $d/lib/libtcl7.5.a \
-- $d/lib/libtcl.so \
-- $d/lib/libtcl.a"
- V_LIB_TCL=FAIL
-- for dir in $places; do
-- if test -r $dir ; then
-- V_LIB_TCL=$dir
-+ for p in $tclposs; do
-+ if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
-+ V_LIB_TCL="-Wl,-R$d/lib -L$d/lib -l$p"
-+ break
-+ fi
-+ if test -r $d/lib/lib$p.a ; then
-+ V_LIB_TCL="-Wl,-R$d/lib -L$d/lib -l$p"
- break
- fi
- done
-- if test $V_LIB_TCL = FAIL ; then
-+ if test "$V_LIB_TCL" = FAIL ; then
- echo "can't find libtcl.a in $d/lib"
- exit 1
- fi
-- places="$d/lib/tcl7.5 \
-+ places="$d/lib/tcl8.0 \
- $d/lib/tcl"
- V_LIBRARY_TCL=FAIL
- for dir in $places; do
-@@ -1508,31 +1617,34 @@
- fi
- else
- cat > conftest.$ac_ext <<EOF
--#line 1512 "configure"
-+#line 1624 "configure"
- #include "confdefs.h"
- #include <tcl.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out`
- if test -z "$ac_err"; then
- rm -rf conftest*
- V_INCLUDE_TCL=""
- else
- echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- V_INCLUDE_TCL=FAIL
- fi
- rm -f conftest*
- if test "$V_INCLUDE_TCL" = FAIL; then
- echo "checking for tcl.h"
-- places="$PWD/../tcl7.5 \
-- /usr/src/local/tcl7.5 \
-- /import/tcl/include/tcl7.5 \
-+ places="$PWD/../tcl8.0 \
-+ /usr/src/local/tcl8.0 \
-+ /import/tcl/include/tcl8.0 \
- $prefix/include \
- $x_includes/tk \
- $x_includes \
- /usr/local/include \
-+ /usr/local/include/tcl8.0 \
- /usr/contrib/include \
- /usr/include"
- for dir in $places; do
-@@ -1546,26 +1658,28 @@
- exit 1
- fi
- fi
-- echo $ac_n "checking for -ltcl7.5""... $ac_c" 1>&6
--ac_lib_var=`echo tcl7.5'_'main | tr './+\055' '__p_'`
-+ echo $ac_n "checking for main in -ltcl8.0""... $ac_c" 1>&6
-+echo "configure:1666: checking for main in -ltcl8.0" >&5
-+ac_lib_var=`echo tcl8.0'_'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
- else
- ac_save_LIBS="$LIBS"
--LIBS="-ltcl7.5 $LIBS"
-+LIBS="-ltcl8.0 $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1558 "configure"
-+#line 1674 "configure"
- #include "confdefs.h"
-
--int main() { return 0; }
--int t() {
-+int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:1566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -1575,7 +1689,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-- V_LIB_TCL="-ltcl7.5"
-+ V_LIB_TCL="-ltcl8.0"
- else
- echo "$ac_t""no" 1>&6
- V_LIB_TCL="FAIL"
-@@ -1589,17 +1703,22 @@
- /usr/contrib/lib \
- /usr/local/lib \
- /usr/lib \
-- $PWD/../tcl7.5 \
-- /usr/src/local/tcl7.5 \
-- /import/tcl/lib/tcl7.5 \
-+ $PWD/../tcl8.0 \
-+ /usr/src/local/tcl8.0 \
-+ /import/tcl/lib/tcl8.0 \
- "
- for dir in $places; do
-- if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then
-- V_LIB_TCL="-L$dir -ltcl7.5"
-- break
-- fi
-- if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
-- V_LIB_TCL="-L$dir -ltcl"
-+ for p in $tclposs; do
-+ if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
-+ V_LIB_TCL="-Wl,-R$dir -L$dir -l$p"
-+ break
-+ fi
-+ if test -r $dir/lib$p.a ; then
-+ V_LIB_TCL="-Wl,-R$dir -L$dir -l$p"
-+ break
-+ fi
-+ done
-+ if test "$V_LIB_TCL" != FAIL; then
- break
- fi
- done
-@@ -1614,15 +1733,16 @@
- fi
- echo "checking for tcl/init.tcl"
- V_LIBRARY_TCL=FAIL
-- places="/usr/local/lib/tcl7.5 \
-- /usr/contrib/lib/tcl7.5 \
-- /usr/lib/tcl7.5 \
-- /usr/lib/tk/tcl7.5 \
-- /import/tcl/lib/tcl7.5 \
-- $prefix/lib/tcl7.5 \
-- $x_libraries/tcl7.5 \
-+ places="/usr/local/lib/tcl8.0 \
-+ /usr/contrib/lib/tcl8.0 \
-+ /usr/lib/tcl8.0 \
-+ /usr/lib/tk/tcl8.0 \
-+ /import/tcl/lib/tcl8.0 \
-+ $prefix/lib/tcl8.0 \
-+ $x_libraries/tcl8.0 \
- /usr/local/lib/tcl \
- /usr/lib/tcl \
-+ /usr/libdata/tcl \
- /usr/lib/tk/tcl \
- /import/tcl/lib/tcl \
- $prefix/lib/tcl \
-@@ -1651,6 +1771,7 @@
- d=""
- fi
-
-+tkposs="tk8.0 tk80 tk"
- if test "$d" != "" ; then
- if test ! -d $d ; then
- echo "'$d' is not a directory"
-@@ -1661,22 +1782,22 @@
- echo "can't find tk.h in $d/include"
- exit 1
- fi
-- places="$d/lib/libtk4.1.so \
-- $d/lib/libtk4.1.a \
-- $d/lib/libtk.so \
-- $d/lib/libtk.a"
- V_LIB_TK=FAIL
-- for dir in $places; do
-- if test -r $dir ; then
-- V_LIB_TK=$dir
-+ for p in $tkposs; do
-+ if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
-+ V_LIB_TK="-Wl,-R$d/lib -L$d/lib -l$p"
-+ break
-+ fi
-+ if test -r $d/lib/lib$p.a ; then
-+ V_LIB_TK="-Wl,-R$d/lib -L$d/lib -l$p"
- break
- fi
- done
-- if test $V_LIB_TK = FAIL ; then
-+ if test "$V_LIB_TK" = FAIL ; then
- echo "can't find libtk.a in $d/lib"
- exit 1
- fi
-- places="$d/lib/tk4.1 \
-+ places="$d/lib/tk8.0 \
- $d/lib/tk"
- V_LIBRARY_TK=FAIL
+--- configure.in.orig Thu May 16 14:21:17 1996
++++ configure.in Wed Dec 8 11:06:17 1999
+@@ -35,10 +35,10 @@
+ else
+ echo "checking for libgsm.a"
+ V_LIB_GSM=FAIL
+- places="$PWD/../gsm-1.0-pl7 \
++ places="$PWD/../gsm-1.0-pl10 \
+ $PWD/../gsm-1.0 \
+ $PWD/../gsm \
+- /usr/src/local/gsm-1.0-pl7 \
++ /usr/src/local/gsm-1.0-pl10 \
+ /usr/src/local/gsm-1.0 \
+ /usr/src/local/gsm"
for dir in $places; do
-@@ -1691,18 +1812,20 @@
- fi
- else
- cat > conftest.$ac_ext <<EOF
--#line 1695 "configure"
-+#line 1819 "configure"
- #include "confdefs.h"
- #include <tk.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out`
- if test -z "$ac_err"; then
- rm -rf conftest*
- V_INCLUDE_TK=""
- else
- echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- V_INCLUDE_TK=FAIL
- fi
-@@ -1713,14 +1836,15 @@
- places="\
- $prefix/include \
- /usr/local/include \
-+ /usr/local/include/tk8.0 \
- /usr/contrib/include \
- /usr/include/tcl \
- /usr/include\
- $x_includes/tk \
- $x_includes \
-- $PWD/../tk4.1 \
-- /usr/src/local/tk4.1 \
-- /import/tcl/include/tk4.1 \
-+ $PWD/../tk8.0 \
-+ /usr/src/local/tk8.0 \
-+ /import/tcl/include/tk8.0 \
- "
- for dir in $places; do
- if test -r $dir/tk.h ; then
-@@ -1733,26 +1857,28 @@
- exit 1
- fi
- fi
-- echo $ac_n "checking for -ltk4.1""... $ac_c" 1>&6
--ac_lib_var=`echo tk4.1'_'main | tr './+\055' '__p_'`
-+ echo $ac_n "checking for main in -ltk8.0""... $ac_c" 1>&6
-+echo "configure:1865: checking for main in -ltk8.0" >&5
-+ac_lib_var=`echo tk8.0'_'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
- else
- ac_save_LIBS="$LIBS"
--LIBS="-ltk4.1 $LIBS"
-+LIBS="-ltk8.0 $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1745 "configure"
-+#line 1873 "configure"
- #include "confdefs.h"
-
--int main() { return 0; }
--int t() {
-+int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:1753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:1880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -1775,17 +1901,22 @@
- /usr/lib \
- /usr/lib/tk \
- /import/tcl/lib \
-- $PWD/../tk4.1 \
-- /usr/src/local/tk4.1 \
-+ $PWD/../tk8.0 \
-+ /usr/src/local/tk8.0 \
- $prefix/lib \
- $x_libraries"
- for dir in $places; do
-- if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then
-- V_LIB_TK="-L$dir -ltk4.1"
-- break
-- fi
-- if test -r $dir/libtk.so -o -r $dir/libtk.a; then
-- V_LIB_TK="-L$dir -ltk"
-+ for p in $tkposs; do
-+ if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
-+ V_LIB_TK="-Wl,-R$dir -L$dir -l$p"
-+ break
-+ fi
-+ if test -r $dir/lib$p.a ; then
-+ V_LIB_TK="-Wl,-R$dir -L$dir -l$p"
-+ break
-+ fi
-+ done
-+ if test "$V_LIB_TK" != FAIL; then
- break
- fi
- done
-@@ -1800,15 +1931,15 @@
- fi
- echo "checking for tk/tk.tcl"
- V_LIBRARY_TK=FAIL
-- places="/usr/local/lib/tk4.1 \
-- /usr/contrib/lib/tk4.1 \
-- /usr/lib/tk4.1 \
-- /usr/lib/tk/tk4.1 \
-- /import/tcl/lib/tk4.1 \
-- $prefix/lib/tk4.1 \
-- $x_libraries/tk4.1 \
-- $PWD/../tk4.1/library \
-- /usr/src/local/tk4.1/library \
-+ places="/usr/local/lib/tk8.0 \
-+ /usr/contrib/lib/tk8.0 \
-+ /usr/lib/tk8.0 \
-+ /usr/lib/tk/tk8.0 \
-+ /import/tcl/lib/tk8.0 \
-+ $prefix/lib/tk8.0 \
-+ $x_libraries/tk8.0 \
-+ $PWD/../tk8.0/library \
-+ /usr/src/local/tk8.0/library \
- /usr/local/lib/tk \
- /usr/lib/tk \
- /usr/lib/tk/tk \
-@@ -1944,18 +2075,20 @@
- fi
-
- cat > conftest.$ac_ext <<EOF
--#line 1948 "configure"
-+#line 2082 "configure"
- #include "confdefs.h"
- #include <sys/audioio.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out`
- if test -z "$ac_err"; then
- rm -rf conftest*
- x=audio-sun.o
- else
- echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- x=""
- fi
-@@ -1963,18 +2096,20 @@
- V_OBJ_AUDIO="$V_OBJ_AUDIO $x"
-
- cat > conftest.$ac_ext <<EOF
--#line 1967 "configure"
-+#line 2103 "configure"
- #include "confdefs.h"
- #include <sun/audioio.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out`
- if test -z "$ac_err"; then
- rm -rf conftest*
- x=audio-sun.o
- else
- echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- x=""
- fi
-@@ -2000,17 +2135,20 @@
- V_DEFINE="$V_DEFINE -DNEED_SUNOS_PROTOS"
- V_STATIC="-static"
+@@ -165,7 +165,8 @@
;;
--*-sgi-irix5*)
-- V_DEFINE="$V_DEFINE -DIRIX5 -D_BSD_SIGNALS -D_BSD_COMPAT"
-- if test "$target_os" = irix5.3 ; then
-- V_DEFINE="$V_DEFINE -DIRIX5_3"
-+*-sgi-irix*)
-+ V_DEFINE="$V_DEFINE -D_BSD_SIGNALS -D_BSD_COMPAT"
-+ if test "$target_os" = irix6.2 ; then
-+ V_DEFINE="$V_DEFINE -DSIGARGS=__sigargs"
- fi
- V_TARCMD="tar cfL"
- V_SHELL="SHELL = /bin/sh"
- if test $CC != gcc ; then
-- V_DEFINE="$V_DEFINE -signed -g3"
-- CC="cc -xansi -D__STDC__ -Dinline="
-- CXX="CC +p -float -DSGI_COMPAT"
-+ V_DEFINE="$V_DEFINE -signed -g3"
-+ CC="cc -Dinline="
-+ if test "$target_os" = irix5.2 ; then
-+ CC="$CC -xansi -D__STDC__"
-+ fi
-+ CXX="CC +p -float -woff 3262 -DSGI_COMPAT"
- fi
- V_LIB_AUDIO="$V_LIB_AUDIO -laudio"
- V_OBJ_AUDIO="$V_OBJ_AUDIO audio-sgi.o"
-@@ -2051,7 +2189,7 @@
- CXX="xlC -+ -qlanglvl=compat -I/usr/lpp/xlC/include -I/usr/include"
- CC="cc -Dinline="
- V_OBJ_AUDIO="$V_OBJ_AUDIO audio-ibm.o"
-- V_LIB="$V_LIB -lbsd"
-+ V_LIB="$V_LIB -lm -lbsd"
+ *-*-netbsd*)
+ V_TARCMD="tar -h -c -f"
+- V_LIB="$V_LIB -L/usr/local/lib"
++ V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lossaudio"
++ V_OBJ_AUDIO="audio-voxware.o"
;;
- *-*-aix4*)
- V_DEFINE="$V_DEFINE -DSIGARGS=int -D_AIX41"
-@@ -2086,30 +2224,32 @@
- V_LIB_DL="dld"
- ;;
- *-*-linux*)
-- echo $ac_n "checking for -ldl""... $ac_c" 1>&6
--ac_lib_var=`echo dl'_'dlopen | tr './+\055' '__p_'`
-+ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-+echo "configure:2232: checking for dlopen in -ldl" >&5
-+ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_save_LIBS="$LIBS"
- LIBS="-ldl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2098 "configure"
-+#line 2240 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char dlopen();
-
--int main() { return 0; }
--int t() {
-+int main() {
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:2110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -2128,26 +2268,28 @@
- ;;
- esac
- if test ! -z "$V_LIB_DL" ; then
-- echo $ac_n "checking for -l$V_LIB_DL""... $ac_c" 1>&6
--ac_lib_var=`echo $V_LIB_DL'_'main | tr './+\055' '__p_'`
-+ echo $ac_n "checking for main in -l$V_LIB_DL""... $ac_c" 1>&6
-+echo "configure:2276: checking for main in -l$V_LIB_DL" >&5
-+ac_lib_var=`echo $V_LIB_DL'_'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
- else
- ac_save_LIBS="$LIBS"
- LIBS="-l$V_LIB_DL $V_STATIC $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2140 "configure"
-+#line 2284 "configure"
- #include "confdefs.h"
-
--int main() { return 0; }
--int t() {
-+int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:2148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+if { (eval echo configure:2291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
- fi
-@@ -2157,7 +2299,8 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-- ac_tr_lib=HAVE_LIB`echo $V_LIB_DL | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+ ac_tr_lib=HAVE_LIB`echo $V_LIB_DL | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
- #define $ac_tr_lib 1
- EOF
-@@ -2231,11 +2374,25 @@
- # --recheck option to rerun configure.
- #
- EOF
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, don't put newlines in cache variables' values.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
- (set) 2>&1 |
-- sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
-- >> confcache
-+ case `(ac_space=' '; set) 2>&1` in
-+ *ac_space=\ *)
-+ # `set' does not quote correctly, so add quotes (double-quote substitution
-+ # turns \\\\ into \\, and sed turns \\ into \).
-+ sed -n \
-+ -e "s/'/'\\\\''/g" \
-+ -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-+ ;;
-+ *)
-+ # `set' quotes correctly as required by POSIX, so do not add quotes.
-+ sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-+ ;;
-+ esac >> confcache
- if cmp -s $cache_file confcache; then
- :
- else
-@@ -2302,7 +2459,7 @@
- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
- -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-- echo "$CONFIG_STATUS generated by autoconf version 2.10"
-+ echo "$CONFIG_STATUS generated by autoconf version 2.12"
- exit 0 ;;
- -help | --help | --hel | --he | --h)
- echo "\$ac_cs_usage"; exit 0 ;;
-@@ -2392,20 +2549,56 @@
-
- CEOF
- EOF
-+
-+cat >> $CONFIG_STATUS <<\EOF
-+
-+# Split the substitutions into bite-sized pieces for seds with
-+# small command number limits, like on Digital OSF/1 and HP-UX.
-+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-+ac_file=1 # Number of current file.
-+ac_beg=1 # First line for current file.
-+ac_end=$ac_max_sed_cmds # Line after last line for current file.
-+ac_more_lines=:
-+ac_sed_cmds=""
-+while $ac_more_lines; do
-+ if test $ac_beg -gt 1; then
-+ sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-+ else
-+ sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-+ fi
-+ if test ! -s conftest.s$ac_file; then
-+ ac_more_lines=false
-+ rm -f conftest.s$ac_file
-+ else
-+ if test -z "$ac_sed_cmds"; then
-+ ac_sed_cmds="sed -f conftest.s$ac_file"
-+ else
-+ ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-+ fi
-+ ac_file=`expr $ac_file + 1`
-+ ac_beg=$ac_end
-+ ac_end=`expr $ac_end + $ac_max_sed_cmds`
-+ fi
-+done
-+if test -z "$ac_sed_cmds"; then
-+ ac_sed_cmds=cat
-+fi
-+EOF
-+
- cat >> $CONFIG_STATUS <<EOF
-
- CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-- # Support "outfile[:infile]", defaulting infile="outfile.in".
-+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
- case "$ac_file" in
-- *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
-+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- *) ac_file_in="${ac_file}.in" ;;
- esac
-
-- # Adjust relative srcdir, etc. for subdirectories.
-+ # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
- # Remove last slash and all that follows it. Not all systems have dirname.
- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-@@ -2429,6 +2622,7 @@
- top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
-
-+
- echo creating "$ac_file"
- rm -f "$ac_file"
- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-@@ -2437,15 +2631,21 @@
- # $configure_input" ;;
- *) ac_comsub= ;;
- esac
-+
-+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
- sed -e "$ac_comsub
- s%@configure_input@%$configure_input%g
- s%@srcdir@%$srcdir%g
- s%@top_srcdir@%$top_srcdir%g
--" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
-+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
- fi; done
--rm -f conftest.subs
-+rm -f conftest.s*
-
-+EOF
-+cat >> $CONFIG_STATUS <<EOF
-
-+EOF
-+cat >> $CONFIG_STATUS <<\EOF
-
- exit 0
- EOF
---- configure.in.tk.orig Thu May 16 01:06:05 1996
-+++ configure.in.tk Tue Sep 9 11:35:45 1997
-@@ -2,6 +2,7 @@
- dnl $Header: /cvsroot/pkgsrc/mbone/vat/patches/patch-aa,v 1.4 1999/06/04 15:21:12 mycroft Exp $ (LBL)
-
- AC_ARG_WITH(tcl, --with-tcl=path specify a pathname for tcl, d=$withval, d="")
-+tclposs="tcl8.0 tcl80 tcl"
- if test "$d" != "" ; then
- if test ! -d $d ; then
- echo "'$d' is not a directory"
-@@ -12,22 +13,22 @@
- echo "can't find tcl.h in $d/include"
- exit 1
- fi
-- places="$d/lib/libtcl7.5.so \
-- $d/lib/libtcl7.5.a \
-- $d/lib/libtcl.so \
-- $d/lib/libtcl.a"
- V_LIB_TCL=FAIL
-- for dir in $places; do
-- if test -r $dir ; then
-- V_LIB_TCL=$dir
-+ for p in $tclposs; do
-+ if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
-+ V_LIB_TCL="-Wl,-R$d/lib -L$d/lib -l$p"
-+ break
-+ fi
-+ if test -r $d/lib/lib$p.a ; then
-+ V_LIB_TCL="-Wl,-R$d/lib -L$d/lib -l$p"
- break
- fi
- done
-- if test $V_LIB_TCL = FAIL ; then
-+ if test "$V_LIB_TCL" = FAIL ; then
- echo "can't find libtcl.a in $d/lib"
- exit 1
- fi
-- places="$d/lib/tcl7.5 \
-+ places="$d/lib/tcl8.0 \
- $d/lib/tcl"
- V_LIBRARY_TCL=FAIL
- for dir in $places; do
-@@ -44,13 +45,14 @@
- AC_TEST_CPP([#include <tcl.h>], V_INCLUDE_TCL="", V_INCLUDE_TCL=FAIL)
- if test "$V_INCLUDE_TCL" = FAIL; then
- echo "checking for tcl.h"
-- places="$PWD/../tcl7.5 \
-- /usr/src/local/tcl7.5 \
-- /import/tcl/include/tcl7.5 \
-+ places="$PWD/../tcl8.0 \
-+ /usr/src/local/tcl8.0 \
-+ /import/tcl/include/tcl8.0 \
- $prefix/include \
- $x_includes/tk \
- $x_includes \
- /usr/local/include \
-+ /usr/local/include/tcl8.0 \
- /usr/contrib/include \
- /usr/include"
- for dir in $places; do
-@@ -64,7 +66,7 @@
- exit 1
- fi
- fi
-- AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL")
-+ AC_CHECK_LIB(tcl8.0, main, V_LIB_TCL="-ltcl8.0", V_LIB_TCL="FAIL")
- if test "$V_LIB_TCL" = FAIL; then
- echo "checking for libtcl.a"
- places="\
-@@ -73,17 +75,22 @@
- /usr/contrib/lib \
- /usr/local/lib \
- /usr/lib \
-- $PWD/../tcl7.5 \
-- /usr/src/local/tcl7.5 \
-- /import/tcl/lib/tcl7.5 \
-+ $PWD/../tcl8.0 \
-+ /usr/src/local/tcl8.0 \
-+ /import/tcl/lib/tcl8.0 \
- "
- for dir in $places; do
-- if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then
-- V_LIB_TCL="-L$dir -ltcl7.5"
-- break
-- fi
-- if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
-- V_LIB_TCL="-L$dir -ltcl"
-+ for p in $tclposs; do
-+ if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
-+ V_LIB_TCL="-Wl,-R$dir -L$dir -l$p"
-+ break
-+ fi
-+ if test -r $dir/lib$p.a ; then
-+ V_LIB_TCL="-Wl,-R$dir -L$dir -l$p"
-+ break
-+ fi
-+ done
-+ if test "$V_LIB_TCL" != FAIL; then
- break
- fi
- done
-@@ -98,15 +105,16 @@
- fi
- echo "checking for tcl/init.tcl"
- V_LIBRARY_TCL=FAIL
-- places="/usr/local/lib/tcl7.5 \
-- /usr/contrib/lib/tcl7.5 \
-- /usr/lib/tcl7.5 \
-- /usr/lib/tk/tcl7.5 \
-- /import/tcl/lib/tcl7.5 \
-- $prefix/lib/tcl7.5 \
-- $x_libraries/tcl7.5 \
-+ places="/usr/local/lib/tcl8.0 \
-+ /usr/contrib/lib/tcl8.0 \
-+ /usr/lib/tcl8.0 \
-+ /usr/lib/tk/tcl8.0 \
-+ /import/tcl/lib/tcl8.0 \
-+ $prefix/lib/tcl8.0 \
-+ $x_libraries/tcl8.0 \
- /usr/local/lib/tcl \
- /usr/lib/tcl \
-+ /usr/libdata/tcl \
- /usr/lib/tk/tcl \
- /import/tcl/lib/tcl \
- $prefix/lib/tcl \
-@@ -128,6 +136,7 @@
- AC_SUBST(V_LIBRARY_TCL)
-
- AC_ARG_WITH(tk, --with-tk=path specify a pathname for tk, d=$withval, d="")
-+tkposs="tk8.0 tk80 tk"
- if test "$d" != "" ; then
- if test ! -d $d ; then
- echo "'$d' is not a directory"
-@@ -138,22 +147,22 @@
- echo "can't find tk.h in $d/include"
- exit 1
- fi
-- places="$d/lib/libtk4.1.so \
-- $d/lib/libtk4.1.a \
-- $d/lib/libtk.so \
-- $d/lib/libtk.a"
- V_LIB_TK=FAIL
-- for dir in $places; do
-- if test -r $dir ; then
-- V_LIB_TK=$dir
-+ for p in $tkposs; do
-+ if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
-+ V_LIB_TK="-Wl,-R$d/lib -L$d/lib -l$p"
-+ break
-+ fi
-+ if test -r $d/lib/lib$p.a ; then
-+ V_LIB_TK="-Wl,-R$d/lib -L$d/lib -l$p"
- break
- fi
- done
-- if test $V_LIB_TK = FAIL ; then
-+ if test "$V_LIB_TK" = FAIL ; then
- echo "can't find libtk.a in $d/lib"
- exit 1
- fi
-- places="$d/lib/tk4.1 \
-+ places="$d/lib/tk8.0 \
- $d/lib/tk"
- V_LIBRARY_TK=FAIL
- for dir in $places; do
-@@ -174,14 +183,15 @@
- places="\
- $prefix/include \
- /usr/local/include \
-+ /usr/local/include/tk8.0 \
- /usr/contrib/include \
- /usr/include/tcl \
- /usr/include\
- $x_includes/tk \
- $x_includes \
-- $PWD/../tk4.1 \
-- /usr/src/local/tk4.1 \
-- /import/tcl/include/tk4.1 \
-+ $PWD/../tk8.0 \
-+ /usr/src/local/tk8.0 \
-+ /import/tcl/include/tk8.0 \
- "
- for dir in $places; do
- if test -r $dir/tk.h ; then
-@@ -194,7 +204,7 @@
- exit 1
- fi
- fi
-- AC_CHECK_LIB(tk4.1, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL")
-+ AC_CHECK_LIB(tk8.0, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL")
- if test "$V_LIB_TK" = FAIL; then
- echo "checking for libtk.a"
- places="/usr/local/lib \
-@@ -202,17 +212,22 @@
- /usr/lib \
- /usr/lib/tk \
- /import/tcl/lib \
-- $PWD/../tk4.1 \
-- /usr/src/local/tk4.1 \
-+ $PWD/../tk8.0 \
-+ /usr/src/local/tk8.0 \
- $prefix/lib \
- $x_libraries"
- for dir in $places; do
-- if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then
-- V_LIB_TK="-L$dir -ltk4.1"
-- break
-- fi
-- if test -r $dir/libtk.so -o -r $dir/libtk.a; then
-- V_LIB_TK="-L$dir -ltk"
-+ for p in $tkposs; do
-+ if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
-+ V_LIB_TK="-Wl,-R$dir -L$dir -l$p"
-+ break
-+ fi
-+ if test -r $dir/lib$p.a ; then
-+ V_LIB_TK="-Wl,-R$dir -L$dir -l$p"
-+ break
-+ fi
-+ done
-+ if test "$V_LIB_TK" != FAIL; then
- break
- fi
- done
-@@ -227,15 +242,15 @@
- fi
- echo "checking for tk/tk.tcl"
- V_LIBRARY_TK=FAIL
-- places="/usr/local/lib/tk4.1 \
-- /usr/contrib/lib/tk4.1 \
-- /usr/lib/tk4.1 \
-- /usr/lib/tk/tk4.1 \
-- /import/tcl/lib/tk4.1 \
-- $prefix/lib/tk4.1 \
-- $x_libraries/tk4.1 \
-- $PWD/../tk4.1/library \
-- /usr/src/local/tk4.1/library \
-+ places="/usr/local/lib/tk8.0 \
-+ /usr/contrib/lib/tk8.0 \
-+ /usr/lib/tk8.0 \
-+ /usr/lib/tk/tk8.0 \
-+ /import/tcl/lib/tk8.0 \
-+ $prefix/lib/tk8.0 \
-+ $x_libraries/tk8.0 \
-+ $PWD/../tk8.0/library \
-+ /usr/src/local/tk8.0/library \
- /usr/local/lib/tk \
- /usr/lib/tk \
- /usr/lib/tk/tk \
+ *-*-hpux*)
+ V_DEFINE="$V_DEFINE"
diff --git a/mbone/vat/patches/patch-ae b/mbone/vat/patches/patch-ae
index 4f879bfbcf4..b65d5e953fe 100644
--- a/mbone/vat/patches/patch-ae
+++ b/mbone/vat/patches/patch-ae
@@ -1,8 +1,825 @@
-$NetBSD: patch-ae,v 1.3 1999/06/04 15:11:27 mycroft Exp $
+$NetBSD: patch-ae,v 1.4 1999/12/08 10:20:37 rh Exp $
---- configure.in.tk.freebsd Thu Nov 20 13:22:35 1997
-+++ configure.in.tk Fri Nov 21 13:35:46 1997
-@@ -8,23 +8,23 @@
+--- configure.orig Thu May 16 10:03:58 1996
++++ configure Wed Dec 8 11:06:17 1999
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated automatically using autoconf version 2.10
++# Generated automatically using autoconf version 2.12
+ # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -61,6 +61,8 @@
+ # Initialize some other variables.
+ subdirs=
+ MFLAGS= MAKEFLAGS=
++# Maximum number of lines to put in a shell here document.
++ac_max_here_lines=12
+
+ ac_prev=
+ for ac_option
+@@ -342,7 +344,7 @@
+ verbose=yes ;;
+
+ -version | --version | --versio | --versi | --vers)
+- echo "configure generated by autoconf version 2.10"
++ echo "configure generated by autoconf version 2.12"
+ exit 0 ;;
+
+ -with-* | --with-*)
+@@ -444,11 +446,14 @@
+ done
+
+ # NLS nuisances.
+-# Only set LANG and LC_ALL to C if already set.
+-# These must not be set unconditionally because not all systems understand
+-# e.g. LANG=C (notably SCO).
+-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
++# Only set these to C if already set. These must not be set unconditionally
++# because not all systems understand e.g. LANG=C (notably SCO).
++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
++# Non-C LC_CTYPE values break the ctype check.
+ if test "${LANG+set}" = set; then LANG=C; export LANG; fi
++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
++if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
+
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+ rm -rf conftest* confdefs.h
+@@ -510,6 +515,7 @@
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
+
+ if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+ # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+@@ -577,6 +583,7 @@
+ fi
+
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
++echo "configure:587: checking host system type" >&5
+
+ host_alias=$host
+ case "$host_alias" in
+@@ -591,12 +598,13 @@
+ esac
+
+ host=`$ac_config_sub $host_alias`
+-host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
+-host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
++host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ echo "$ac_t""$host" 1>&6
+
+ echo $ac_n "checking target system type""... $ac_c" 1>&6
++echo "configure:608: checking target system type" >&5
+
+ target_alias=$target
+ case "$target_alias" in
+@@ -608,12 +616,13 @@
+ esac
+
+ target=`$ac_config_sub $target_alias`
+-target_cpu=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
+-target_vendor=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
+-target_os=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
++target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ echo "$ac_t""$target" 1>&6
+
+ echo $ac_n "checking build system type""... $ac_c" 1>&6
++echo "configure:626: checking build system type" >&5
+
+ build_alias=$build
+ case "$build_alias" in
+@@ -625,9 +634,9 @@
+ esac
+
+ build=`$ac_config_sub $build_alias`
+-build_cpu=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
+-build_vendor=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
+-build_os=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
++build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ echo "$ac_t""$build" 1>&6
+
+ test "$host_alias" != "$target_alias" &&
+@@ -639,6 +648,7 @@
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:652: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -667,6 +677,7 @@
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:681: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -713,7 +724,47 @@
+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+ fi
+
++echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
++echo "configure:729: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++cat > conftest.$ac_ext <<EOF
++#line 739 "configure"
++#include "confdefs.h"
++main(){return(0);}
++EOF
++if { (eval echo configure:743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++ ac_cv_prog_cc_works=yes
++ # If we can't run a trivial program, we are probably using a cross compiler.
++ if (./conftest; exit) 2>/dev/null; then
++ ac_cv_prog_cc_cross=no
++ else
++ ac_cv_prog_cc_cross=yes
++ fi
++else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
++ ac_cv_prog_cc_works=no
++fi
++rm -fr conftest*
++
++echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
++if test $ac_cv_prog_cc_works = no; then
++ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
++fi
++echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
++echo "configure:763: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
++cross_compiling=$ac_cv_prog_cc_cross
++
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
++echo "configure:768: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -722,7 +773,7 @@
+ yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+ ac_cv_prog_gcc=yes
+ else
+ ac_cv_prog_gcc=no
+@@ -730,40 +781,46 @@
+ fi
+
+ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
++
+ if test $ac_cv_prog_gcc = yes; then
+ GCC=yes
+- if test "${CFLAGS+set}" != set; then
++ ac_test_CFLAGS="${CFLAGS+set}"
++ ac_save_CFLAGS="$CFLAGS"
++ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
++echo "configure:792: checking whether ${CC-cc} accepts -g" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ echo 'void f(){}' > conftest.c
+ if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+- ac_cv_prog_gcc_g=yes
++ ac_cv_prog_cc_g=yes
+ else
+- ac_cv_prog_gcc_g=no
++ ac_cv_prog_cc_g=no
+ fi
+ rm -f conftest*
+
+ fi
+
+-echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
+- if test $ac_cv_prog_gcc_g = yes; then
+- CFLAGS="-g -O"
++echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
++ if test "$ac_test_CFLAGS" = set; then
++ CFLAGS="$ac_save_CFLAGS"
++ elif test $ac_cv_prog_cc_g = yes; then
++ CFLAGS="-g -O2"
+ else
+- CFLAGS="-O"
+- fi
++ CFLAGS="-O2"
+ fi
+ else
+ GCC=
+ test "${CFLAGS+set}" = set || CFLAGS="-g"
+ fi
+
+-for ac_prog in $CCC c++ g++ gcc CC cxx
++for ac_prog in $CCC c++ g++ gcc CC cxx cc++
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:824: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -793,7 +850,53 @@
+ test -n "$CXX" || CXX="gcc"
+
+
++echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
++echo "configure:855: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++
++ac_ext=C
++# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cxx_cross
++
++cat > conftest.$ac_ext <<EOF
++#line 865 "configure"
++#include "confdefs.h"
++main(){return(0);}
++EOF
++if { (eval echo configure:869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++ ac_cv_prog_cxx_works=yes
++ # If we can't run a trivial program, we are probably using a cross compiler.
++ if (./conftest; exit) 2>/dev/null; then
++ ac_cv_prog_cxx_cross=no
++ else
++ ac_cv_prog_cxx_cross=yes
++ fi
++else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
++ ac_cv_prog_cxx_works=no
++fi
++rm -fr conftest*
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
++if test $ac_cv_prog_cxx_works = no; then
++ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
++fi
++echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
++echo "configure:895: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
++cross_compiling=$ac_cv_prog_cxx_cross
++
+ echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
++echo "configure:900: checking whether we are using GNU C++" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -802,7 +905,7 @@
+ yes;
+ #endif
+ EOF
+-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+ ac_cv_prog_gxx=yes
+ else
+ ac_cv_prog_gxx=no
+@@ -810,29 +913,34 @@
+ fi
+
+ echo "$ac_t""$ac_cv_prog_gxx" 1>&6
++
+ if test $ac_cv_prog_gxx = yes; then
+ GXX=yes
+- if test "${CXXFLAGS+set}" != set; then
++ ac_test_CXXFLAGS="${CXXFLAGS+set}"
++ ac_save_CXXFLAGS="$CXXFLAGS"
++ CXXFLAGS=
+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-if eval "test \"`echo '$''{'ac_cv_prog_gxx_g'+set}'`\" = set"; then
++echo "configure:924: checking whether ${CXX-g++} accepts -g" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ echo 'void f(){}' > conftest.cc
+ if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
+- ac_cv_prog_gxx_g=yes
++ ac_cv_prog_cxx_g=yes
+ else
+- ac_cv_prog_gxx_g=no
++ ac_cv_prog_cxx_g=no
+ fi
+ rm -f conftest*
+
+ fi
+
+-echo "$ac_t""$ac_cv_prog_gxx_g" 1>&6
+- if test $ac_cv_prog_gxx_g = yes; then
+- CXXFLAGS="-g -O"
++echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
++ if test "$ac_test_CXXFLAGS" = set; then
++ CXXFLAGS="$ac_save_CXXFLAGS"
++ elif test $ac_cv_prog_cxx_g = yes; then
++ CXXFLAGS="-g -O2"
+ else
+- CXXFLAGS="-O"
+- fi
++ CXXFLAGS="-O2"
+ fi
+ else
+ GXX=
+@@ -840,6 +948,7 @@
+ fi
+
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
++echo "configure:952: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+@@ -854,33 +963,37 @@
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp.
+ cat > conftest.$ac_ext <<EOF
+-#line 858 "configure"
++#line 967 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ :
+ else
+ echo "$ac_err" >&5
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CPP="${CC-cc} -E -traditional-cpp"
+ cat > conftest.$ac_ext <<EOF
+-#line 873 "configure"
++#line 984 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ :
+ else
+ echo "$ac_err" >&5
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CPP=/lib/cpp
+ fi
+@@ -895,38 +1008,13 @@
+ fi
+ echo "$ac_t""$CPP" 1>&6
+
+-# If we cannot run a trivial program, we must be cross compiling.
+-echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6
+-if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- if test "$cross_compiling" = yes; then
+- ac_cv_c_cross=yes
+-else
+-cat > conftest.$ac_ext <<EOF
+-#line 908 "configure"
+-#include "confdefs.h"
+-main(){return(0);}
+-EOF
+-{ (eval echo configure:912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+-if test -s conftest && (./conftest; exit) 2>/dev/null; then
+- ac_cv_c_cross=no
+-else
+- ac_cv_c_cross=yes
+-fi
+-fi
+-rm -fr conftest*
+-fi
+-
+-echo "$ac_t""$ac_cv_c_cross" 1>&6
+-cross_compiling=$ac_cv_c_cross
+-
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
++echo "configure:1013: 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 <<EOF
+-#line 930 "configure"
++#line 1018 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -934,13 +1022,15 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+ ac_cv_header_stdc=yes
+ else
+ echo "$ac_err" >&5
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_header_stdc=no
+ fi
+@@ -949,7 +1039,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
+-#line 953 "configure"
++#line 1043 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -967,7 +1057,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
+-#line 971 "configure"
++#line 1061 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -987,8 +1077,8 @@
+ if test "$cross_compiling" = yes; then
+ :
+ else
+-cat > conftest.$ac_ext <<EOF
+-#line 992 "configure"
++ cat > conftest.$ac_ext <<EOF
++#line 1082 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -999,15 +1089,19 @@
+ exit (0); }
+
+ EOF
+-{ (eval echo configure:1003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+-if test -s conftest && (./conftest; exit) 2>/dev/null; then
++if { (eval echo configure:1093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++then
+ :
+ else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
++ rm -fr conftest*
+ ac_cv_header_stdc=no
+ fi
+-fi
+ rm -fr conftest*
+ fi
++
++fi
+ fi
+
+ echo "$ac_t""$ac_cv_header_stdc" 1>&6
+@@ -1020,24 +1114,27 @@
+
+ for ac_hdr in string.h
+ do
+-ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:1120: 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
+-#line 1030 "configure"
++#line 1125 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+ else
+ echo "$ac_err" >&5
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+ fi
+@@ -1045,7 +1142,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'`
++ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+ #define $ac_tr_hdr 1
+ EOF
+@@ -1066,26 +1163,28 @@
+ V_TARCMD="tar cfh"
+ V_SIGRET="void"
+
+-echo $ac_n "checking for -lXbsd""... $ac_c" 1>&6
+-ac_lib_var=`echo Xbsd'_'main | tr './+\055' '__p_'`
++echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
++echo "configure:1168: 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
+ else
+ ac_save_LIBS="$LIBS"
+ LIBS="-lXbsd $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1078 "configure"
++#line 1176 "configure"
+ #include "confdefs.h"
+
+-int main() { return 0; }
+-int t() {
++int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:1183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -1100,30 +1199,32 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+-echo $ac_n "checking for -lsocket""... $ac_c" 1>&6
+-ac_lib_var=`echo socket'_'poll | tr './+\055' '__p_'`
++echo $ac_n "checking for poll in -lsocket""... $ac_c" 1>&6
++echo "configure:1204: checking for poll in -lsocket" >&5
++ac_lib_var=`echo socket'_'poll | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+ LIBS="-lsocket $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1112 "configure"
++#line 1212 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+ char poll();
+
+-int main() { return 0; }
+-int t() {
++int main() {
+ poll()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:1223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -1138,30 +1239,32 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+-echo $ac_n "checking for -lnsl""... $ac_c" 1>&6
+-ac_lib_var=`echo nsl'_'gethostbyname | tr './+\055' '__p_'`
++echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
++echo "configure:1244: checking for gethostbyname in -lnsl" >&5
++ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+ LIBS="-lnsl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1150 "configure"
++#line 1252 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+ char gethostbyname();
+
+-int main() { return 0; }
+-int t() {
++int main() {
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:1263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -1176,30 +1279,32 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+-echo $ac_n "checking for -ldnet_stub""... $ac_c" 1>&6
+-ac_lib_var=`echo dnet_stub'_'getnodebyname | tr './+\055' '__p_'`
++echo $ac_n "checking for getnodebyname in -ldnet_stub""... $ac_c" 1>&6
++echo "configure:1284: checking for getnodebyname in -ldnet_stub" >&5
++ac_lib_var=`echo dnet_stub'_'getnodebyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+ LIBS="-ldnet_stub $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1188 "configure"
++#line 1292 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+ char getnodebyname();
+
+-int main() { return 0; }
+-int t() {
++int main() {
+ getnodebyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:1303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -1304,18 +1409,20 @@
+ echo "checking for X11 header files"
+ if test "$x_includes" = NONE ; then
+ cat > conftest.$ac_ext <<EOF
+-#line 1308 "configure"
++#line 1413 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+ x_includes=""
+ else
+ echo "$ac_err" >&5
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ x_includes=NONE
+ fi
+@@ -1340,30 +1447,32 @@
+
+ echo "checking for X11 library archive"
+ if test "$x_libraries" = NONE ; then
+- echo $ac_n "checking for -lX11""... $ac_c" 1>&6
+-ac_lib_var=`echo X11'_'XOpenDisplay | tr './+\055' '__p_'`
++ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
++echo "configure:1452: checking for XOpenDisplay in -lX11" >&5
++ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+ LIBS="-lX11 $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1352 "configure"
++#line 1460 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+ char XOpenDisplay();
+
+-int main() { return 0; }
+-int t() {
++int main() {
+ XOpenDisplay()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -1397,30 +1506,32 @@
+
+ if test -n "$V_SHM" ; then
+ if test -z "$x_libraries" ; then
+- echo $ac_n "checking for -lXext""... $ac_c" 1>&6
+-ac_lib_var=`echo Xext'_'XShmAttach | tr './+\055' '__p_'`
++ echo $ac_n "checking for XShmAttach in -lXext""... $ac_c" 1>&6
++echo "configure:1511: checking for XShmAttach in -lXext" >&5
++ac_lib_var=`echo Xext'_'XShmAttach | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+ LIBS="-lXext -lX11 $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1409 "configure"
++#line 1519 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+ char XShmAttach();
+
+-int main() { return 0; }
+-int t() {
++int main() {
+ XShmAttach()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:1530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -1452,10 +1563,7 @@
+ fi
+
+ if test -n "$x_libraries" ; then
+- V_LIB_X11="-L$x_libraries $V_LIB_X11"
+- if test $solaris ; then
+- V_LIB_X11="-R$x_libraries $V_LIB_X11"
+- fi
++ V_LIB_X11="-Wl,-R$x_libraries -L$x_libraries $V_LIB_X11"
+ fi
+
+
+@@ -1468,18 +1576,19 @@
+ d=""
+ fi
+
++tclposs="tcl8.0 tcl80 tcl"
+ if test "$d" != "" ; then
+ if test ! -d $d ; then
echo "'$d' is not a directory"
exit 1
fi
@@ -14,239 +831,70 @@ $NetBSD: patch-ae,v 1.3 1999/06/04 15:11:27 mycroft Exp $
+ echo "can't find tcl.h in $d"
exit 1
fi
+- places="$d/lib/libtcl7.5.so \
+- $d/lib/libtcl7.5.a \
+ places="$d/lib/libtcl8.0.so \
+ $d/lib/libtcl8.0.a \
-+ $d/lib/libtcl.so \
-+ $d/lib/libtcl.a"
+ $d/lib/libtcl.so \
+ $d/lib/libtcl.a"
V_LIB_TCL=FAIL
-- for p in $tclposs; do
-- if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
-- V_LIB_TCL="-Wl,-R$d/lib -L$d/lib -l$p"
-- break
-- fi
-- if test -r $d/lib/lib$p.a ; then
-- V_LIB_TCL="-Wl,-R$d/lib -L$d/lib -l$p"
-+ for dir in $places; do
-+ if test -r $dir ; then
-+ V_LIB_TCL=$dir
- break
- fi
- done
-- if test "$V_LIB_TCL" = FAIL ; then
-+ if test $V_LIB_TCL = FAIL ; then
+@@ -1493,7 +1602,7 @@
echo "can't find libtcl.a in $d/lib"
exit 1
fi
-@@ -51,6 +51,8 @@
- $prefix/include \
- $x_includes/tk \
- $x_includes \
-+ /usr/pkg/include \
-+ /usr/pkg/include/tcl8.0 \
- /usr/local/include \
- /usr/local/include/tcl8.0 \
- /usr/contrib/include \
-@@ -66,12 +68,13 @@
- exit 1
- fi
- fi
-- AC_CHECK_LIB(tcl8.0, main, V_LIB_TCL="-ltcl8.0", V_LIB_TCL="FAIL")
-+ AC_CHECK_LIB(tcl80, main, V_LIB_TCL="-ltcl80", V_LIB_TCL="FAIL")
- if test "$V_LIB_TCL" = FAIL; then
- echo "checking for libtcl.a"
- places="\
- $prefix/lib \
- $x_libraries \
-+ /usr/pkg/lib \
- /usr/contrib/lib \
- /usr/local/lib \
- /usr/lib \
-@@ -80,17 +83,12 @@
- /import/tcl/lib/tcl8.0 \
- "
- for dir in $places; do
-- for p in $tclposs; do
-- if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
-- V_LIB_TCL="-Wl,-R$dir -L$dir -l$p"
-- break
-- fi
-- if test -r $dir/lib$p.a ; then
-- V_LIB_TCL="-Wl,-R$dir -L$dir -l$p"
-- break
-- fi
-- done
-- if test "$V_LIB_TCL" != FAIL; then
-+ if test -r $dir/libtcl80.so -o -r $dir/libtcl80.a; then
-+ V_LIB_TCL="-Wl,-R$dir -L$dir -ltcl80"
-+ break
-+ fi
-+ if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
-+ V_LIB_TCL="-Wl,-R$dir -L$dir -ltcl"
- break
- fi
- done
-@@ -106,6 +104,7 @@
- echo "checking for tcl/init.tcl"
+- places="$d/lib/tcl7.5 \
++ places="$d/lib/tcl8.0 \
+ $d/lib/tcl"
V_LIBRARY_TCL=FAIL
- places="/usr/local/lib/tcl8.0 \
-+ /usr/pkg/lib/tcl8.0 \
- /usr/contrib/lib/tcl8.0 \
- /usr/lib/tcl8.0 \
- /usr/lib/tk/tcl8.0 \
-@@ -114,7 +113,6 @@
- $x_libraries/tcl8.0 \
- /usr/local/lib/tcl \
- /usr/lib/tcl \
-- /usr/libdata/tcl \
- /usr/lib/tk/tcl \
- /import/tcl/lib/tcl \
- $prefix/lib/tcl \
-@@ -142,23 +140,23 @@
- echo "'$d' is not a directory"
- exit 1
- fi
-- V_INCLUDE_TK=-I$d/include
-- if test ! -r $d/include/tk.h ; then
-- echo "can't find tk.h in $d/include"
-+ V_INCLUDE_TK=-I$d
-+ if test ! -r $d/tk.h ; then
-+ echo "can't find tk.h in $d"
- exit 1
- fi
-+ places="$d/lib/libtk8.0.so \
-+ $d/lib/libtk8.0.a \
-+ $d/lib/libtk.so \
-+ $d/lib/libtk.a"
- V_LIB_TK=FAIL
-- for p in $tkposs; do
-- if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
-- V_LIB_TK="-Wl,-R$d/lib -L$d/lib -l$p"
-- break
-- fi
-- if test -r $d/lib/lib$p.a ; then
-- V_LIB_TK="-Wl,-R$d/lib -L$d/lib -l$p"
-+ for dir in $places; do
-+ if test -r $dir ; then
-+ V_LIB_TK=$dir
- break
- fi
- done
-- if test "$V_LIB_TK" = FAIL ; then
-+ if test $V_LIB_TK = FAIL ; then
- echo "can't find libtk.a in $d/lib"
- exit 1
- fi
-@@ -179,9 +177,11 @@
- AC_TEST_CPP([#include <tk.h>], V_INCLUDE_TK="", V_INCLUDE_TK=FAIL)
- if test "$V_INCLUDE_TK" = FAIL; then
- echo "checking for tk.h"
-- V_INCLUDE_TK=""
-+ V_INCLUDE_TK="FAIL"
- places="\
- $prefix/include \
-+ /usr/pkg/include \
-+ /usr/pkg/include/tk8.0 \
- /usr/local/include \
- /usr/local/include/tk8.0 \
- /usr/contrib/include \
-@@ -204,10 +204,11 @@
- exit 1
- fi
- fi
-- AC_CHECK_LIB(tk8.0, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL")
-+ AC_CHECK_LIB(tk80, main, V_LIB_TK="-ltk80", V_LIB_TK="FAIL")
- if test "$V_LIB_TK" = FAIL; then
- echo "checking for libtk.a"
- places="/usr/local/lib \
-+ /usr/pkg/lib \
- /usr/contrib/lib \
- /usr/lib \
- /usr/lib/tk \
-@@ -217,17 +218,12 @@
- $prefix/lib \
- $x_libraries"
- for dir in $places; do
-- for p in $tkposs; do
-- if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
-- V_LIB_TK="-Wl,-R$dir -L$dir -l$p"
-- break
-- fi
-- if test -r $dir/lib$p.a ; then
-- V_LIB_TK="-Wl,-R$dir -L$dir -l$p"
-- break
-- fi
-- done
-- if test "$V_LIB_TK" != FAIL; then
-+ if test -r $dir/libtk80.so -o -r $dir/libtk80.a; then
-+ V_LIB_TK="-Wl,-R$dir -L$dir -ltk80"
-+ break
-+ fi
-+ if test -r $dir/libtk.so -o -r $dir/libtk.a; then
-+ V_LIB_TK="-Wl,-R$dir -L$dir -ltk"
- break
- fi
- done
-@@ -243,6 +239,7 @@
- echo "checking for tk/tk.tcl"
- V_LIBRARY_TK=FAIL
- places="/usr/local/lib/tk8.0 \
-+ /usr/pkg/lib/tk8.0 \
- /usr/contrib/lib/tk8.0 \
- /usr/lib/tk8.0 \
- /usr/lib/tk/tk8.0 \
---- configure.freebsd Thu Dec 11 17:52:08 1997
-+++ configure Thu Dec 11 17:53:07 1997
-@@ -1585,23 +1585,23 @@
- echo "'$d' is not a directory"
- exit 1
- fi
-- V_INCLUDE_TCL=-I$d/include
-- if test ! -r $d/include/tcl.h ; then
-- echo "can't find tcl.h in $d/include"
-+ V_INCLUDE_TCL=-I$d
-+ if test ! -r $d/tcl.h ; then
-+ echo "can't find tcl.h in $d"
- exit 1
- fi
-+ places="$d/lib/libtcl8.0.so \
-+ $d/lib/libtcl8.0.a \
-+ $d/lib/libtcl.so \
-+ $d/lib/libtcl.a"
- V_LIB_TCL=FAIL
-- for p in $tclposs; do
-- if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
-- V_LIB_TCL="-Wl,-R$d/lib -L$d/lib -l$p"
-- break
-- fi
-- if test -r $d/lib/lib$p.a ; then
-- V_LIB_TCL="-Wl,-R$d/lib -L$d/lib -l$p"
-+ for dir in $places; do
-+ if test -r $dir ; then
-+ V_LIB_TCL=$dir
- break
- fi
- done
-- if test "$V_LIB_TCL" = FAIL ; then
-+ if test $V_LIB_TCL = FAIL ; then
- echo "can't find libtcl.a in $d/lib"
- exit 1
+ for dir in $places; do
+@@ -1508,31 +1617,36 @@
fi
-@@ -1646,6 +1646,8 @@
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1512 "configure"
++#line 1624 "configure"
+ #include "confdefs.h"
+ #include <tcl.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+ V_INCLUDE_TCL=""
+ else
+ echo "$ac_err" >&5
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ V_INCLUDE_TCL=FAIL
+ fi
+ rm -f conftest*
+ if test "$V_INCLUDE_TCL" = FAIL; then
+ echo "checking for tcl.h"
+- places="$PWD/../tcl7.5 \
+- /usr/src/local/tcl7.5 \
+- /import/tcl/include/tcl7.5 \
++ places="$PWD/../tcl8.0 \
++ /usr/src/local/tcl8.0 \
++ /import/tcl/include/tcl8.0 \
$prefix/include \
$x_includes/tk \
$x_includes \
+ /usr/pkg/include \
+ /usr/pkg/include/tcl8.0 \
/usr/local/include \
- /usr/local/include/tcl8.0 \
++ /usr/local/include/tcl8.0 \
/usr/contrib/include \
-@@ -1661,23 +1663,23 @@
+ /usr/include"
+ for dir in $places; do
+@@ -1546,26 +1660,28 @@
exit 1
fi
fi
-- echo $ac_n "checking for main in -ltcl8.0""... $ac_c" 1>&6
--echo "configure:1666: checking for main in -ltcl8.0" >&5
--ac_lib_var=`echo tcl8.0'_'main | sed 'y%./+-%__p_%'`
+- echo $ac_n "checking for -ltcl7.5""... $ac_c" 1>&6
+-ac_lib_var=`echo tcl7.5'_'main | tr './+\055' '__p_'`
+ echo $ac_n "checking for main in -ltcl80""... $ac_c" 1>&6
+echo "configure:1668: checking for main in -ltcl80" >&5
+ac_lib_var=`echo tcl80'_'main | sed 'y%./+-%__p_%'`
@@ -254,32 +902,39 @@ $NetBSD: patch-ae,v 1.3 1999/06/04 15:11:27 mycroft Exp $
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
--LIBS="-ltcl8.0 $LIBS"
+-LIBS="-ltcl7.5 $LIBS"
+LIBS="-ltcl80 $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 1674 "configure"
+-#line 1558 "configure"
+#line 1676 "configure"
#include "confdefs.h"
- int main() {
+-int main() { return 0; }
+-int t() {
++int main() {
main()
; return 0; }
EOF
--if { (eval echo configure:1681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+-if { (eval echo configure:1566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
-@@ -1692,7 +1694,7 @@
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -1575,7 +1691,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
-- V_LIB_TCL="-ltcl8.0"
+- V_LIB_TCL="-ltcl7.5"
+ V_LIB_TCL="-ltcl80"
else
echo "$ac_t""no" 1>&6
V_LIB_TCL="FAIL"
-@@ -1703,6 +1705,7 @@
+@@ -1586,20 +1702,21 @@
places="\
$prefix/lib \
$x_libraries \
@@ -287,47 +942,55 @@ $NetBSD: patch-ae,v 1.3 1999/06/04 15:11:27 mycroft Exp $
/usr/contrib/lib \
/usr/local/lib \
/usr/lib \
-@@ -1711,17 +1714,12 @@
- /import/tcl/lib/tcl8.0 \
+- $PWD/../tcl7.5 \
+- /usr/src/local/tcl7.5 \
+- /import/tcl/lib/tcl7.5 \
++ $PWD/../tcl8.0 \
++ /usr/src/local/tcl8.0 \
++ /import/tcl/lib/tcl8.0 \
"
for dir in $places; do
-- for p in $tclposs; do
-- if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
-- V_LIB_TCL="-Wl,-R$dir -L$dir -l$p"
-- break
-- fi
-- if test -r $dir/lib$p.a ; then
-- V_LIB_TCL="-Wl,-R$dir -L$dir -l$p"
-- break
-- fi
-- done
-- if test "$V_LIB_TCL" != FAIL; then
+- if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then
+- V_LIB_TCL="-L$dir -ltcl7.5"
+ if test -r $dir/libtcl80.so -o -r $dir/libtcl80.a; then
+ V_LIB_TCL="-Wl,-R$dir -L$dir -ltcl80"
-+ break
-+ fi
-+ if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
+ break
+ fi
+ if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
+- V_LIB_TCL="-L$dir -ltcl"
+ V_LIB_TCL="-Wl,-R$dir -L$dir -ltcl"
break
fi
done
-@@ -1737,6 +1735,7 @@
+@@ -1614,13 +1731,14 @@
+ fi
echo "checking for tcl/init.tcl"
V_LIBRARY_TCL=FAIL
- places="/usr/local/lib/tcl8.0 \
+- places="/usr/local/lib/tcl7.5 \
+- /usr/contrib/lib/tcl7.5 \
+- /usr/lib/tcl7.5 \
+- /usr/lib/tk/tcl7.5 \
+- /import/tcl/lib/tcl7.5 \
+- $prefix/lib/tcl7.5 \
+- $x_libraries/tcl7.5 \
++ places="/usr/local/lib/tcl8.0 \
+ /usr/pkg/lib/tcl8.0 \
- /usr/contrib/lib/tcl8.0 \
- /usr/lib/tcl8.0 \
- /usr/lib/tk/tcl8.0 \
-@@ -1745,7 +1744,6 @@
- $x_libraries/tcl8.0 \
++ /usr/contrib/lib/tcl8.0 \
++ /usr/lib/tcl8.0 \
++ /usr/lib/tk/tcl8.0 \
++ /import/tcl/lib/tcl8.0 \
++ $prefix/lib/tcl8.0 \
++ $x_libraries/tcl8.0 \
/usr/local/lib/tcl \
/usr/lib/tcl \
-- /usr/libdata/tcl \
/usr/lib/tk/tcl \
- /import/tcl/lib/tcl \
- $prefix/lib/tcl \
-@@ -1780,23 +1778,23 @@
+@@ -1651,18 +1769,19 @@
+ d=""
+ fi
+
++tkposs="tk8.0 tk80 tk"
+ if test "$d" != "" ; then
+ if test ! -d $d ; then
echo "'$d' is not a directory"
exit 1
fi
@@ -339,45 +1002,45 @@ $NetBSD: patch-ae,v 1.3 1999/06/04 15:11:27 mycroft Exp $
+ echo "can't find tk.h in $d"
exit 1
fi
+- places="$d/lib/libtk4.1.so \
+- $d/lib/libtk4.1.a \
+ places="$d/lib/libtk8.0.so \
+ $d/lib/libtk8.0.a \
-+ $d/lib/libtk.so \
-+ $d/lib/libtk.a"
+ $d/lib/libtk.so \
+ $d/lib/libtk.a"
V_LIB_TK=FAIL
-- for p in $tkposs; do
-- if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
-- V_LIB_TK="-Wl,-R$d/lib -L$d/lib -l$p"
-- break
-- fi
-- if test -r $d/lib/lib$p.a ; then
-- V_LIB_TK="-Wl,-R$d/lib -L$d/lib -l$p"
-+ for dir in $places; do
-+ if test -r $dir ; then
-+ V_LIB_TK=$dir
- break
- fi
- done
-- if test "$V_LIB_TK" = FAIL ; then
-+ if test $V_LIB_TK = FAIL ; then
+@@ -1676,7 +1795,7 @@
echo "can't find libtk.a in $d/lib"
exit 1
fi
-@@ -1815,12 +1813,12 @@
+- places="$d/lib/tk4.1 \
++ places="$d/lib/tk8.0 \
+ $d/lib/tk"
+ V_LIBRARY_TK=FAIL
+ for dir in $places; do
+@@ -1691,36 +1810,41 @@
fi
else
cat > conftest.$ac_ext <<EOF
--#line 1819 "configure"
+-#line 1695 "configure"
+#line 1817 "configure"
#include "confdefs.h"
#include <tk.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:1700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
-@@ -1835,9 +1833,11 @@
+ V_INCLUDE_TK=""
+ else
+ echo "$ac_err" >&5
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ V_INCLUDE_TK=FAIL
+ fi
rm -f conftest*
if test "$V_INCLUDE_TK" = FAIL; then
echo "checking for tk.h"
@@ -388,15 +1051,27 @@ $NetBSD: patch-ae,v 1.3 1999/06/04 15:11:27 mycroft Exp $
+ /usr/pkg/include \
+ /usr/pkg/include/tk8.0 \
/usr/local/include \
- /usr/local/include/tk8.0 \
++ /usr/local/include/tk8.0 \
/usr/contrib/include \
-@@ -1860,14 +1860,14 @@
+ /usr/include/tcl \
+ /usr/include\
+ $x_includes/tk \
+ $x_includes \
+- $PWD/../tk4.1 \
+- /usr/src/local/tk4.1 \
+- /import/tcl/include/tk4.1 \
++ $PWD/../tk8.0 \
++ /usr/src/local/tk8.0 \
++ /import/tcl/include/tk8.0 \
+ "
+ for dir in $places; do
+ if test -r $dir/tk.h ; then
+@@ -1733,26 +1857,28 @@
exit 1
fi
fi
-- echo $ac_n "checking for main in -ltk8.0""... $ac_c" 1>&6
--echo "configure:1865: checking for main in -ltk8.0" >&5
--ac_lib_var=`echo tk8.0'_'main | sed 'y%./+-%__p_%'`
+- echo $ac_n "checking for -ltk4.1""... $ac_c" 1>&6
+-ac_lib_var=`echo tk4.1'_'main | tr './+\055' '__p_'`
+ echo $ac_n "checking for main in -ltk80""... $ac_c" 1>&6
+echo "configure:1865: checking for main in -ltk80" >&5
+ac_lib_var=`echo tk80'_'main | sed 'y%./+-%__p_%'`
@@ -404,12 +1079,30 @@ $NetBSD: patch-ae,v 1.3 1999/06/04 15:11:27 mycroft Exp $
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
--LIBS="-ltk8.0 $LIBS"
+-LIBS="-ltk4.1 $LIBS"
+LIBS="-ltk80 $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 1873 "configure"
+-#line 1745 "configure"
++#line 1873 "configure"
#include "confdefs.h"
-@@ -1891,7 +1891,7 @@
+
+-int main() { return 0; }
+-int t() {
++int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:1880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -1762,7 +1888,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
@@ -418,7 +1111,7 @@ $NetBSD: patch-ae,v 1.3 1999/06/04 15:11:27 mycroft Exp $
else
echo "$ac_t""no" 1>&6
V_LIB_TK="FAIL"
-@@ -1900,6 +1900,7 @@
+@@ -1771,21 +1897,22 @@
if test "$V_LIB_TK" = FAIL; then
echo "checking for libtk.a"
places="/usr/local/lib \
@@ -426,118 +1119,367 @@ $NetBSD: patch-ae,v 1.3 1999/06/04 15:11:27 mycroft Exp $
/usr/contrib/lib \
/usr/lib \
/usr/lib/tk \
-@@ -1909,17 +1910,12 @@
+ /import/tcl/lib \
+- $PWD/../tk4.1 \
+- /usr/src/local/tk4.1 \
++ $PWD/../tk8.0 \
++ /usr/src/local/tk8.0 \
$prefix/lib \
$x_libraries"
for dir in $places; do
-- for p in $tkposs; do
-- if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
-- V_LIB_TK="-Wl,-R$dir -L$dir -l$p"
-- break
-- fi
-- if test -r $dir/lib$p.a ; then
-- V_LIB_TK="-Wl,-R$dir -L$dir -l$p"
-- break
-- fi
-- done
-- if test "$V_LIB_TK" != FAIL; then
+- if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then
+- V_LIB_TK="-L$dir -ltk4.1"
+ if test -r $dir/libtk80.so -o -r $dir/libtk80.a; then
+ V_LIB_TK="-Wl,-R$dir -L$dir -ltk80"
-+ break
-+ fi
-+ if test -r $dir/libtk.so -o -r $dir/libtk.a; then
+ break
+ fi
+ if test -r $dir/libtk.so -o -r $dir/libtk.a; then
+- V_LIB_TK="-L$dir -ltk"
+ V_LIB_TK="-Wl,-R$dir -L$dir -ltk"
break
fi
done
-@@ -1935,6 +1931,7 @@
+@@ -1800,15 +1927,16 @@
+ fi
echo "checking for tk/tk.tcl"
V_LIBRARY_TK=FAIL
- places="/usr/local/lib/tk8.0 \
+- places="/usr/local/lib/tk4.1 \
+- /usr/contrib/lib/tk4.1 \
+- /usr/lib/tk4.1 \
+- /usr/lib/tk/tk4.1 \
+- /import/tcl/lib/tk4.1 \
+- $prefix/lib/tk4.1 \
+- $x_libraries/tk4.1 \
+- $PWD/../tk4.1/library \
+- /usr/src/local/tk4.1/library \
++ places="/usr/local/lib/tk8.0 \
+ /usr/pkg/lib/tk8.0 \
- /usr/contrib/lib/tk8.0 \
- /usr/lib/tk8.0 \
- /usr/lib/tk/tk8.0 \
-@@ -2078,12 +2075,12 @@
++ /usr/contrib/lib/tk8.0 \
++ /usr/lib/tk8.0 \
++ /usr/lib/tk/tk8.0 \
++ /import/tcl/lib/tk8.0 \
++ $prefix/lib/tk8.0 \
++ $x_libraries/tk8.0 \
++ $PWD/../tk8.0/library \
++ /usr/src/local/tk8.0/library \
+ /usr/local/lib/tk \
+ /usr/lib/tk \
+ /usr/lib/tk/tk \
+@@ -1874,10 +2002,10 @@
+ else
+ echo "checking for libgsm.a"
+ V_LIB_GSM=FAIL
+- places="$PWD/../gsm-1.0-pl7 \
++ places="$PWD/../gsm-1.0-pl10 \
+ $PWD/../gsm-1.0 \
+ $PWD/../gsm \
+- /usr/src/local/gsm-1.0-pl7 \
++ /usr/src/local/gsm-1.0-pl10 \
+ /usr/src/local/gsm-1.0 \
+ /usr/src/local/gsm"
+ for dir in $places; do
+@@ -1944,18 +2072,20 @@
fi
cat > conftest.$ac_ext <<EOF
--#line 2082 "configure"
+-#line 1948 "configure"
+#line 2079 "configure"
#include "confdefs.h"
#include <sys/audioio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:1953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
-@@ -2099,12 +2096,12 @@
+ x=audio-sun.o
+ else
+ echo "$ac_err" >&5
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ x=""
+ fi
+@@ -1963,18 +2093,20 @@
V_OBJ_AUDIO="$V_OBJ_AUDIO $x"
cat > conftest.$ac_ext <<EOF
--#line 2103 "configure"
+-#line 1967 "configure"
+#line 2100 "configure"
#include "confdefs.h"
#include <sun/audioio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:1972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
-@@ -2228,7 +2225,7 @@
+ x=audio-sun.o
+ else
+ echo "$ac_err" >&5
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ x=""
+ fi
+@@ -2000,17 +2132,20 @@
+ V_DEFINE="$V_DEFINE -DNEED_SUNOS_PROTOS"
+ V_STATIC="-static"
+ ;;
+-*-sgi-irix5*)
+- V_DEFINE="$V_DEFINE -DIRIX5 -D_BSD_SIGNALS -D_BSD_COMPAT"
+- if test "$target_os" = irix5.3 ; then
+- V_DEFINE="$V_DEFINE -DIRIX5_3"
++*-sgi-irix*)
++ V_DEFINE="$V_DEFINE -D_BSD_SIGNALS -D_BSD_COMPAT"
++ if test "$target_os" = irix6.2 ; then
++ V_DEFINE="$V_DEFINE -DSIGARGS=__sigargs"
+ fi
+ V_TARCMD="tar cfL"
+ V_SHELL="SHELL = /bin/sh"
+ if test $CC != gcc ; then
+ V_DEFINE="$V_DEFINE -signed -g3"
+- CC="cc -xansi -D__STDC__ -Dinline="
+- CXX="CC +p -float -DSGI_COMPAT"
++ CC="cc -Dinline="
++ if test "$target_os" = irix5.2 ; then
++ CC="$CC -xansi -D__STDC__"
++ fi
++ CXX="CC +p -float -woff 3262 -DSGI_COMPAT"
+ fi
+ V_LIB_AUDIO="$V_LIB_AUDIO -laudio"
+ V_OBJ_AUDIO="$V_OBJ_AUDIO audio-sgi.o"
+@@ -2040,7 +2175,8 @@
+ ;;
+ *-*-netbsd*)
+ V_TARCMD="tar -h -c -f"
+- V_LIB="$V_LIB -L/usr/local/lib"
++ V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lossaudio"
++ V_OBJ_AUDIO="audio-voxware.o"
+ ;;
+ *-*-hpux*)
+ V_DEFINE="$V_DEFINE"
+@@ -2051,7 +2187,7 @@
+ CXX="xlC -+ -qlanglvl=compat -I/usr/lpp/xlC/include -I/usr/include"
+ CC="cc -Dinline="
+ V_OBJ_AUDIO="$V_OBJ_AUDIO audio-ibm.o"
+- V_LIB="$V_LIB -lbsd"
++ V_LIB="$V_LIB -lm -lbsd"
+ ;;
+ *-*-aix4*)
+ V_DEFINE="$V_DEFINE -DSIGARGS=int -D_AIX41"
+@@ -2086,30 +2222,32 @@
+ V_LIB_DL="dld"
;;
*-*-linux*)
- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:2232: checking for dlopen in -ldl" >&5
+- echo $ac_n "checking for -ldl""... $ac_c" 1>&6
+-ac_lib_var=`echo dl'_'dlopen | tr './+\055' '__p_'`
++ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+echo "configure:2229: checking for dlopen in -ldl" >&5
- ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
++ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2236,7 +2233,7 @@
+ else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 2240 "configure"
+-#line 2098 "configure"
+#line 2237 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
-@@ -2247,7 +2244,7 @@
+ builtin and then its argument prototype would still apply. */
+ char dlopen();
+
+-int main() { return 0; }
+-int t() {
++int main() {
dlopen()
; return 0; }
EOF
--if { (eval echo configure:2251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+-if { (eval echo configure:2110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
-@@ -2272,7 +2269,7 @@
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -2128,26 +2266,28 @@
+ ;;
esac
if test ! -z "$V_LIB_DL" ; then
- echo $ac_n "checking for main in -l$V_LIB_DL""... $ac_c" 1>&6
--echo "configure:2276: checking for main in -l$V_LIB_DL" >&5
+- echo $ac_n "checking for -l$V_LIB_DL""... $ac_c" 1>&6
+-ac_lib_var=`echo $V_LIB_DL'_'main | tr './+\055' '__p_'`
++ echo $ac_n "checking for main in -l$V_LIB_DL""... $ac_c" 1>&6
+echo "configure:2273: checking for main in -l$V_LIB_DL" >&5
- ac_lib_var=`echo $V_LIB_DL'_'main | sed 'y%./+-%__p_%'`
++ac_lib_var=`echo $V_LIB_DL'_'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
-@@ -2280,14 +2277,14 @@
+ else
ac_save_LIBS="$LIBS"
LIBS="-l$V_LIB_DL $V_STATIC $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 2284 "configure"
+-#line 2140 "configure"
+#line 2281 "configure"
#include "confdefs.h"
- int main() {
+-int main() { return 0; }
+-int t() {
++int main() {
main()
; return 0; }
EOF
--if { (eval echo configure:2291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+-if { (eval echo configure:2148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -2157,7 +2297,8 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- ac_tr_lib=HAVE_LIB`echo $V_LIB_DL | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++ ac_tr_lib=HAVE_LIB`echo $V_LIB_DL | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <<EOF
+ #define $ac_tr_lib 1
+ EOF
+@@ -2231,11 +2372,25 @@
+ # --recheck option to rerun configure.
+ #
+ EOF
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, don't put newlines in cache variables' values.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+ (set) 2>&1 |
+- sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
+- >> confcache
++ case `(ac_space=' '; set) 2>&1` in
++ *ac_space=\ *)
++ # `set' does not quote correctly, so add quotes (double-quote substitution
++ # turns \\\\ into \\, and sed turns \\ into \).
++ sed -n \
++ -e "s/'/'\\\\''/g" \
++ -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
++ ;;
++ *)
++ # `set' quotes correctly as required by POSIX, so do not add quotes.
++ sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
++ ;;
++ esac >> confcache
+ if cmp -s $cache_file confcache; then
+ :
+ else
+@@ -2302,7 +2457,7 @@
+ echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+ exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+ -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+- echo "$CONFIG_STATUS generated by autoconf version 2.10"
++ echo "$CONFIG_STATUS generated by autoconf version 2.12"
+ exit 0 ;;
+ -help | --help | --hel | --he | --h)
+ echo "\$ac_cs_usage"; exit 0 ;;
+@@ -2392,20 +2547,56 @@
+
+ CEOF
+ EOF
++
++cat >> $CONFIG_STATUS <<\EOF
++
++# Split the substitutions into bite-sized pieces for seds with
++# small command number limits, like on Digital OSF/1 and HP-UX.
++ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
++ac_file=1 # Number of current file.
++ac_beg=1 # First line for current file.
++ac_end=$ac_max_sed_cmds # Line after last line for current file.
++ac_more_lines=:
++ac_sed_cmds=""
++while $ac_more_lines; do
++ if test $ac_beg -gt 1; then
++ sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
++ else
++ sed "${ac_end}q" conftest.subs > conftest.s$ac_file
++ fi
++ if test ! -s conftest.s$ac_file; then
++ ac_more_lines=false
++ rm -f conftest.s$ac_file
++ else
++ if test -z "$ac_sed_cmds"; then
++ ac_sed_cmds="sed -f conftest.s$ac_file"
++ else
++ ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
++ fi
++ ac_file=`expr $ac_file + 1`
++ ac_beg=$ac_end
++ ac_end=`expr $ac_end + $ac_max_sed_cmds`
++ fi
++done
++if test -z "$ac_sed_cmds"; then
++ ac_sed_cmds=cat
++fi
++EOF
++
+ cat >> $CONFIG_STATUS <<EOF
+
+ CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+ EOF
+ cat >> $CONFIG_STATUS <<\EOF
+ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+- # Support "outfile[:infile]", defaulting infile="outfile.in".
++ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+ case "$ac_file" in
+- *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
++ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+ ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+ *) ac_file_in="${ac_file}.in" ;;
+ esac
+
+- # Adjust relative srcdir, etc. for subdirectories.
++ # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+
+ # Remove last slash and all that follows it. Not all systems have dirname.
+ ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+@@ -2429,6 +2620,7 @@
+ top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+
++
+ echo creating "$ac_file"
+ rm -f "$ac_file"
+ configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+@@ -2437,15 +2629,21 @@
+ # $configure_input" ;;
+ *) ac_comsub= ;;
+ esac
++
++ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+ sed -e "$ac_comsub
+ s%@configure_input@%$configure_input%g
+ s%@srcdir@%$srcdir%g
+ s%@top_srcdir@%$top_srcdir%g
+-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
++" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+ fi; done
+-rm -f conftest.subs
++rm -f conftest.s*
+
++EOF
++cat >> $CONFIG_STATUS <<EOF
+
++EOF
++cat >> $CONFIG_STATUS <<\EOF
+
+ exit 0
+ EOF
diff --git a/mbone/vat/patches/patch-ag b/mbone/vat/patches/patch-ag
index e394797019c..009c639fa58 100644
--- a/mbone/vat/patches/patch-ag
+++ b/mbone/vat/patches/patch-ag
@@ -1,50 +1,13 @@
-$NetBSD: patch-ag,v 1.3 1999/06/04 15:11:27 mycroft Exp $
+$NetBSD: patch-ag,v 1.4 1999/12/08 10:20:37 rh Exp $
---- configure.in.freebsd Thu Nov 20 13:27:04 1997
-+++ configure.in Tue Nov 25 17:24:32 1997
-@@ -35,10 +35,10 @@
- else
- echo "checking for libgsm.a"
- V_LIB_GSM=FAIL
-- places="$PWD/../gsm-1.0-pl7 \
-+ places="$PWD/../gsm-1.0-pl10 \
- $PWD/../gsm-1.0 \
- $PWD/../gsm \
-- /usr/src/local/gsm-1.0-pl7 \
-+ /usr/src/local/gsm-1.0-pl10 \
- /usr/src/local/gsm-1.0 \
- /usr/src/local/gsm"
- for dir in $places; do
-@@ -165,7 +165,7 @@
- ;;
- *-*-netbsd*)
- V_TARCMD="tar -h -c -f"
-- V_LIB="$V_LIB -L/usr/local/lib"
-+ V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib"
- ;;
- *-*-hpux*)
- V_DEFINE="$V_DEFINE"
---- configure.old Thu Dec 11 18:01:29 1997
-+++ configure Thu Dec 11 18:08:11 1997
-@@ -2005,10 +2005,10 @@
- else
- echo "checking for libgsm.a"
- V_LIB_GSM=FAIL
-- places="$PWD/../gsm-1.0-pl7 \
-+ places="$PWD/../gsm-1.0-pl10 \
- $PWD/../gsm-1.0 \
- $PWD/../gsm \
-- /usr/src/local/gsm-1.0-pl7 \
-+ /usr/src/local/gsm-1.0-pl10 \
- /usr/src/local/gsm-1.0 \
- /usr/src/local/gsm"
- for dir in $places; do
-@@ -2178,7 +2178,7 @@
- ;;
- *-*-netbsd*)
- V_TARCMD="tar -h -c -f"
-- V_LIB="$V_LIB -L/usr/local/lib"
-+ V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib"
- ;;
- *-*-hpux*)
- V_DEFINE="$V_DEFINE"
+--- audio-voxware.cc.orig Fri Apr 26 14:22:37 1996
++++ audio-voxware.cc Wed Dec 8 11:06:17 1999
+@@ -44,6 +44,8 @@
+ #include <sys/uio.h>
+ #include <unistd.h>
+ #include <machine/soundcard.h>
++#elif defined(__NetBSD__)
++#include <soundcard.h>
+ #else
+ #include <sys/soundcard.h>
+ #endif
diff --git a/mbone/vat/patches/patch-ah b/mbone/vat/patches/patch-ah
index a7435e01a7c..499ae7988fe 100644
--- a/mbone/vat/patches/patch-ah
+++ b/mbone/vat/patches/patch-ah
@@ -1,37 +1,234 @@
-$NetBSD: patch-ah,v 1.2 1998/08/07 11:10:04 agc Exp $
+$NetBSD$
---- configure.in.original Thu Dec 11 18:14:48 1997
-+++ configure.in Thu Dec 11 18:14:58 1997
-@@ -166,6 +166,7 @@
- *-*-netbsd*)
- V_TARCMD="tar -h -c -f"
-- V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib"
-+ V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lossaudio"
-+ V_OBJ_AUDIO="audio-voxware.o"
- ;;
- *-*-hpux*)
- V_DEFINE="$V_DEFINE"
---- configure.original Thu Dec 11 18:21:14 1997
-+++ configure Thu Dec 11 18:22:08 1997
-@@ -2179,6 +2179,7 @@
- *-*-netbsd*)
- V_TARCMD="tar -h -c -f"
-- V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib"
-+ V_LIB="$V_LIB -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lossaudio"
-+ V_OBJ_AUDIO="audio-voxware.o"
- ;;
- *-*-hpux*)
- V_DEFINE="$V_DEFINE"
---- audio-voxware.cc.original Thu Nov 20 14:44:07 1997
-+++ audio-voxware.cc Thu Dec 11 17:47:55 1997
-@@ -44,8 +44,10 @@
- #include <sys/uio.h>
- #include <unistd.h>
- #include <machine/soundcard.h>
-+#elif defined(__NetBSD__)
-+#include <soundcard.h>
- #else
- #include <sys/soundcard.h>
- #endif
- #include "audio.h"
- #include "Tcl.h"
+--- configure.in.tk.orig Wed Dec 8 11:19:14 1999
++++ configure.in.tk Wed Dec 8 11:18:55 1999
+@@ -2,18 +2,19 @@
+ dnl $Header: configure.in.tk,v 1.2 96/05/16 01:03:40 van Exp $ (LBL)
+
+ AC_ARG_WITH(tcl, --with-tcl=path specify a pathname for tcl, d=$withval, d="")
++tclposs="tcl8.0 tcl80 tcl"
+ if test "$d" != "" ; then
+ if test ! -d $d ; then
+ echo "'$d' is not a directory"
+ exit 1
+ fi
+- V_INCLUDE_TCL=-I$d/include
+- if test ! -r $d/include/tcl.h ; then
+- echo "can't find tcl.h in $d/include"
++ V_INCLUDE_TCL=-I$d
++ if test ! -r $d/tcl.h ; then
++ echo "can't find tcl.h in $d"
+ exit 1
+ fi
+- places="$d/lib/libtcl7.5.so \
+- $d/lib/libtcl7.5.a \
++ places="$d/lib/libtcl8.0.so \
++ $d/lib/libtcl8.0.a \
+ $d/lib/libtcl.so \
+ $d/lib/libtcl.a"
+ V_LIB_TCL=FAIL
+@@ -27,7 +28,7 @@
+ echo "can't find libtcl.a in $d/lib"
+ exit 1
+ fi
+- places="$d/lib/tcl7.5 \
++ places="$d/lib/tcl8.0 \
+ $d/lib/tcl"
+ V_LIBRARY_TCL=FAIL
+ for dir in $places; do
+@@ -44,13 +45,16 @@
+ AC_TEST_CPP([#include <tcl.h>], V_INCLUDE_TCL="", V_INCLUDE_TCL=FAIL)
+ if test "$V_INCLUDE_TCL" = FAIL; then
+ echo "checking for tcl.h"
+- places="$PWD/../tcl7.5 \
+- /usr/src/local/tcl7.5 \
+- /import/tcl/include/tcl7.5 \
++ places="$PWD/../tcl8.0 \
++ /usr/src/local/tcl8.0 \
++ /import/tcl/include/tcl8.0 \
+ $prefix/include \
+ $x_includes/tk \
+ $x_includes \
++ /usr/pkg/include \
++ /usr/pkg/include/tcl8.0 \
+ /usr/local/include \
++ /usr/local/include/tcl8.0 \
+ /usr/contrib/include \
+ /usr/include"
+ for dir in $places; do
+@@ -64,26 +68,27 @@
+ exit 1
+ fi
+ fi
+- AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL")
++ AC_CHECK_LIB(tcl80, main, V_LIB_TCL="-ltcl80", V_LIB_TCL="FAIL")
+ if test "$V_LIB_TCL" = FAIL; then
+ echo "checking for libtcl.a"
+ places="\
+ $prefix/lib \
+ $x_libraries \
++ /usr/pkg/lib \
+ /usr/contrib/lib \
+ /usr/local/lib \
+ /usr/lib \
+- $PWD/../tcl7.5 \
+- /usr/src/local/tcl7.5 \
+- /import/tcl/lib/tcl7.5 \
++ $PWD/../tcl8.0 \
++ /usr/src/local/tcl8.0 \
++ /import/tcl/lib/tcl8.0 \
+ "
+ for dir in $places; do
+- if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then
+- V_LIB_TCL="-L$dir -ltcl7.5"
++ if test -r $dir/libtcl80.so -o -r $dir/libtcl80.a; then
++ V_LIB_TCL="-Wl,-R$dir -L$dir -ltcl80"
+ break
+ fi
+ if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
+- V_LIB_TCL="-L$dir -ltcl"
++ V_LIB_TCL="-Wl,-R$dir -L$dir -ltcl"
+ break
+ fi
+ done
+@@ -98,13 +103,14 @@
+ fi
+ echo "checking for tcl/init.tcl"
+ V_LIBRARY_TCL=FAIL
+- places="/usr/local/lib/tcl7.5 \
+- /usr/contrib/lib/tcl7.5 \
+- /usr/lib/tcl7.5 \
+- /usr/lib/tk/tcl7.5 \
+- /import/tcl/lib/tcl7.5 \
+- $prefix/lib/tcl7.5 \
+- $x_libraries/tcl7.5 \
++ places="/usr/local/lib/tcl8.0 \
++ /usr/pkg/lib/tcl8.0 \
++ /usr/contrib/lib/tcl8.0 \
++ /usr/lib/tcl8.0 \
++ /usr/lib/tk/tcl8.0 \
++ /import/tcl/lib/tcl8.0 \
++ $prefix/lib/tcl8.0 \
++ $x_libraries/tcl8.0 \
+ /usr/local/lib/tcl \
+ /usr/lib/tcl \
+ /usr/lib/tk/tcl \
+@@ -128,18 +134,19 @@
+ AC_SUBST(V_LIBRARY_TCL)
+
+ AC_ARG_WITH(tk, --with-tk=path specify a pathname for tk, d=$withval, d="")
++tkposs="tk8.0 tk80 tk"
+ if test "$d" != "" ; then
+ if test ! -d $d ; then
+ echo "'$d' is not a directory"
+ exit 1
+ fi
+- V_INCLUDE_TK=-I$d/include
+- if test ! -r $d/include/tk.h ; then
+- echo "can't find tk.h in $d/include"
++ V_INCLUDE_TK=-I$d
++ if test ! -r $d/tk.h ; then
++ echo "can't find tk.h in $d"
+ exit 1
+ fi
+- places="$d/lib/libtk4.1.so \
+- $d/lib/libtk4.1.a \
++ places="$d/lib/libtk8.0.so \
++ $d/lib/libtk8.0.a \
+ $d/lib/libtk.so \
+ $d/lib/libtk.a"
+ V_LIB_TK=FAIL
+@@ -153,7 +160,7 @@
+ echo "can't find libtk.a in $d/lib"
+ exit 1
+ fi
+- places="$d/lib/tk4.1 \
++ places="$d/lib/tk8.0 \
+ $d/lib/tk"
+ V_LIBRARY_TK=FAIL
+ for dir in $places; do
+@@ -170,18 +177,21 @@
+ AC_TEST_CPP([#include <tk.h>], V_INCLUDE_TK="", V_INCLUDE_TK=FAIL)
+ if test "$V_INCLUDE_TK" = FAIL; then
+ echo "checking for tk.h"
+- V_INCLUDE_TK=""
++ V_INCLUDE_TK="FAIL"
+ places="\
+ $prefix/include \
++ /usr/pkg/include \
++ /usr/pkg/include/tk8.0 \
+ /usr/local/include \
++ /usr/local/include/tk8.0 \
+ /usr/contrib/include \
+ /usr/include/tcl \
+ /usr/include\
+ $x_includes/tk \
+ $x_includes \
+- $PWD/../tk4.1 \
+- /usr/src/local/tk4.1 \
+- /import/tcl/include/tk4.1 \
++ $PWD/../tk8.0 \
++ /usr/src/local/tk8.0 \
++ /import/tcl/include/tk8.0 \
+ "
+ for dir in $places; do
+ if test -r $dir/tk.h ; then
+@@ -194,25 +204,26 @@
+ exit 1
+ fi
+ fi
+- AC_CHECK_LIB(tk4.1, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL")
++ AC_CHECK_LIB(tk80, main, V_LIB_TK="-ltk80", V_LIB_TK="FAIL")
+ if test "$V_LIB_TK" = FAIL; then
+ echo "checking for libtk.a"
+ places="/usr/local/lib \
++ /usr/pkg/lib \
+ /usr/contrib/lib \
+ /usr/lib \
+ /usr/lib/tk \
+ /import/tcl/lib \
+- $PWD/../tk4.1 \
+- /usr/src/local/tk4.1 \
++ $PWD/../tk8.0 \
++ /usr/src/local/tk8.0 \
+ $prefix/lib \
+ $x_libraries"
+ for dir in $places; do
+- if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then
+- V_LIB_TK="-L$dir -ltk4.1"
++ if test -r $dir/libtk80.so -o -r $dir/libtk80.a; then
++ V_LIB_TK="-Wl,-R$dir -L$dir -ltk80"
+ break
+ fi
+ if test -r $dir/libtk.so -o -r $dir/libtk.a; then
+- V_LIB_TK="-L$dir -ltk"
++ V_LIB_TK="-Wl,-R$dir -L$dir -ltk"
+ break
+ fi
+ done
+@@ -227,15 +238,16 @@
+ fi
+ echo "checking for tk/tk.tcl"
+ V_LIBRARY_TK=FAIL
+- places="/usr/local/lib/tk4.1 \
+- /usr/contrib/lib/tk4.1 \
+- /usr/lib/tk4.1 \
+- /usr/lib/tk/tk4.1 \
+- /import/tcl/lib/tk4.1 \
+- $prefix/lib/tk4.1 \
+- $x_libraries/tk4.1 \
+- $PWD/../tk4.1/library \
+- /usr/src/local/tk4.1/library \
++ places="/usr/local/lib/tk8.0 \
++ /usr/pkg/lib/tk8.0 \
++ /usr/contrib/lib/tk8.0 \
++ /usr/lib/tk8.0 \
++ /usr/lib/tk/tk8.0 \
++ /import/tcl/lib/tk8.0 \
++ $prefix/lib/tk8.0 \
++ $x_libraries/tk8.0 \
++ $PWD/../tk8.0/library \
++ /usr/src/local/tk8.0/library \
+ /usr/local/lib/tk \
+ /usr/lib/tk \
+ /usr/lib/tk/tk \