From 76c0406bcb0c8f05fa54ae9da6933462bd91b6a3 Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 26 Jan 2000 22:14:18 +0000 Subject: * Get -lgsm from ${PREFIX}/lib * Get Tcl and Tk build variables from tcl/tkConfig.sh instead of pawing through directory trees. --- mbone/vat/Makefile | 23 +- mbone/vat/files/patch-sum | 8 +- mbone/vat/patches/patch-aa | 47 +- mbone/vat/patches/patch-ae | 1485 -------------------------------------------- mbone/vat/patches/patch-ah | 272 ++++---- mbone/vat/patches/patch-ak | 23 + mbone/vat/pkg/PLIST | 4 +- 7 files changed, 227 insertions(+), 1635 deletions(-) delete mode 100644 mbone/vat/patches/patch-ae create mode 100644 mbone/vat/patches/patch-ak (limited to 'mbone/vat') diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile index 52a7e3db0e1..853aa366445 100644 --- a/mbone/vat/Makefile +++ b/mbone/vat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2000/01/09 01:39:14 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2000/01/26 22:14:18 jlam Exp $ # DISTNAME= vatsrc-4.0b2 @@ -10,26 +10,31 @@ MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/ MAINTAINER= mycroft@netbsd.org HOMEPAGE= http://www-nrg.ee.lbl.gov/vat/ -# If configure is changed to look for libgsm.a in ${PREFIX}/lib, then -# we can use this first BUILD_DEPENDS and save some work. -#BUILD_DEPENDS= ${GSM_WORK}/inc/private.h:${GSM_DIR}:patch -BUILD_DEPENDS= ${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build +BUILD_DEPENDS+= ${GSM_WORK}/inc/private.h:${GSM_DIR}:patch +BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf DEPENDS+= tk-8.0.5:../../x11/tk80 -#DEPENDS+= gsm-1.0.10:${GSM_DIR} +DEPENDS+= gsm-1.0.10:${GSM_DIR} -NOT_FOR_PLATFORM= *-*-alpha #filter.cc compiler error +NOT_FOR_PLATFORM= *-*-alpha # filter.cc compiler error GSM_DIR= ${.CURDIR}/../../audio/gsm GSM_WORK= ${GSM_DIR}/${WRKDIR:T}/gsm-1.0-pl10 +USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gsm=${GSM_WORK} +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" + +CPPFLAGS+= -I${LOCALBASE}/include -I${GSM_WORK}/inc + INSTALL_TARGET= install install-man +pre-configure: + cd ${WRKSRC}; ${LOCALBASE}/bin/autoconf + post-install: @strip ${PREFIX}/bin/vat pre-clean: - @cd ${GSM_DIR} && ${MAKE} clean + @cd ${GSM_DIR}; ${MAKE} clean .include "../../mk/bsd.pkg.mk" diff --git a/mbone/vat/files/patch-sum b/mbone/vat/files/patch-sum index d0ace689a54..e956e1eddc6 100644 --- a/mbone/vat/files/patch-sum +++ b/mbone/vat/files/patch-sum @@ -1,12 +1,12 @@ -$NetBSD: patch-sum,v 1.2 1999/12/08 10:20:37 rh Exp $ +$NetBSD: patch-sum,v 1.3 2000/01/26 22:14:25 jlam Exp $ -MD5 (patch-aa) = f5d5cbfa1234ac41af5a3ead8d250d4b +MD5 (patch-aa) = adbc86533f716bcac29ffc312e8518f1 MD5 (patch-ab) = f43d163bafd5a5cce7911643306df48a MD5 (patch-ac) = 3e6a6054afe4f4cb94803428f52d0253 MD5 (patch-ad) = 061830188d2189942d45fb7d15d7f29c -MD5 (patch-ae) = 8a00845503fea0e9d2eea7ffe42d3704 MD5 (patch-af) = 9c2f9ad852afae00ba1fcad4f3af214a MD5 (patch-ag) = b716809fe747bf21c0a422d42f079810 -MD5 (patch-ah) = a72bfd8638721dffd284175d51377379 +MD5 (patch-ah) = c3eca24423b09721cc93a63c885ae7f2 MD5 (patch-ai) = ec5faaebd35a8dc0cb49dae09ef12746 MD5 (patch-aj) = 8a785a1447ec2c6d76d041fe004eeff3 +MD5 (patch-ak) = dbbcb038a8433e6f2e80f221058ddc59 diff --git a/mbone/vat/patches/patch-aa b/mbone/vat/patches/patch-aa index 7844d57748e..70e46ed213b 100644 --- a/mbone/vat/patches/patch-aa +++ b/mbone/vat/patches/patch-aa @@ -1,27 +1,46 @@ -$NetBSD: patch-aa,v 1.5 1999/12/08 10:20:37 rh Exp $ +$NetBSD: patch-aa,v 1.6 2000/01/26 22:14:26 jlam Exp $ ---- configure.in.orig Thu May 16 14:21:17 1996 -+++ configure.in Wed Dec 8 11:06:17 1999 -@@ -35,10 +35,10 @@ +--- configure.in.orig Thu May 16 08:21:17 1996 ++++ configure.in Wed Jan 26 15:34:04 2000 +@@ -33,22 +33,15 @@ + exit 1 + fi else - echo "checking for libgsm.a" +- echo "checking for libgsm.a" ++ echo "checking for -lgsm" V_LIB_GSM=FAIL - places="$PWD/../gsm-1.0-pl7 \ -+ places="$PWD/../gsm-1.0-pl10 \ - $PWD/../gsm-1.0 \ - $PWD/../gsm \ +- $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,8 @@ +- /usr/src/local/gsm-1.0 \ +- /usr/src/local/gsm" +- for dir in $places; do +- if test -r $dir/lib/libgsm.a -a -r $dir/inc/private.h ; then +- V_LIB_GSM=$dir/lib/libgsm.a +- V_INCLUDE_GSM=-I$dir/inc +- break +- fi +- done +- if test "$V_LIB_GSM" = FAIL; then ++ V_INCLUDE_GSM=FAIL ++ AC_CHECK_LIB(gsm, gsm_create, V_LIB_GSM="-lgsm") ++ AC_CHECK_HEADERS(private.h) ++ if test "$ac_cv_header_private_h" = "yes"; then ++ V_INCLUDE_GSM= ++ fi ++ if test "$V_LIB_GSM" = FAIL || test "$V_INCLUDES_GSM" = FAIL ; then + echo "configure: can't find gsm library ... you can get it at" + echo " http://www.cs.tu-berlin.de/~jutta/toast.html" + exit 1 +@@ -165,7 +158,9 @@ ;; *-*-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_LIB="${LDFLAGS} $V_LIB -lossaudio" + V_OBJ_AUDIO="audio-voxware.o" ++ V_CCOPT="${CPPFLAGS}" ;; *-*-hpux*) V_DEFINE="$V_DEFINE" diff --git a/mbone/vat/patches/patch-ae b/mbone/vat/patches/patch-ae deleted file mode 100644 index b65d5e953fe..00000000000 --- a/mbone/vat/patches/patch-ae +++ /dev/null @@ -1,1485 +0,0 @@ -$NetBSD: patch-ae,v 1.4 1999/12/08 10:20:37 rh Exp $ - ---- 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 <&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 <&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 < - 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 < - 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 <&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 < - #include -@@ -934,13 +1022,15 @@ - #include - 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 -@@ -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 -@@ -987,8 +1077,8 @@ - if test "$cross_compiling" = yes; then - : - else --cat > conftest.$ac_ext < conftest.$ac_ext < - #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 - 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 <&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 <&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 <&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 <&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 <&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 - 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 <&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 <&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 -- 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 -@@ -1493,7 +1602,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 -@@ -1508,31 +1617,36 @@ - fi - else - cat > conftest.$ac_ext < - 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/contrib/include \ - /usr/include" - for dir in $places; do -@@ -1546,26 +1660,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 -ltcl80""... $ac_c" 1>&6 -+echo "configure:1668: checking for main in -ltcl80" >&5 -+ac_lib_var=`echo tcl80'_'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="-ltcl80 $LIBS" - cat > conftest.$ac_ext <&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 -+ 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="-ltcl7.5" -+ V_LIB_TCL="-ltcl80" - else - echo "$ac_t""no" 1>&6 - V_LIB_TCL="FAIL" -@@ -1586,20 +1702,21 @@ - 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 -@@ -1614,13 +1731,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 \ -@@ -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 -- 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 -@@ -1676,7 +1795,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 -@@ -1691,36 +1810,41 @@ - fi - else - cat > conftest.$ac_ext < - 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: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* - 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" -- 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 -@@ -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 -ltk80""... $ac_c" 1>&6 -+echo "configure:1865: checking for main in -ltk80" >&5 -+ac_lib_var=`echo tk80'_'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="-ltk80 $LIBS" - cat > conftest.$ac_ext <&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 -- V_LIB_TK="-ltk4.1" -+ V_LIB_TK="-ltk80" - else - echo "$ac_t""no" 1>&6 - V_LIB_TK="FAIL" -@@ -1771,21 +1897,22 @@ - 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 -@@ -1800,15 +1927,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 \ -@@ -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 - 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: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* - 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 - 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: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* - 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 -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_%'` - 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 <&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 -+ 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 -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_%'` - 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 <&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 <&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 <> $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 <> $CONFIG_STATUS <<\EOF - - exit 0 - EOF diff --git a/mbone/vat/patches/patch-ah b/mbone/vat/patches/patch-ah index 499ae7988fe..88a472011c6 100644 --- a/mbone/vat/patches/patch-ah +++ b/mbone/vat/patches/patch-ah @@ -1,98 +1,113 @@ $NetBSD$ ---- 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 @@ +--- configure.in.tk.orig Thu May 16 04:06:05 1996 ++++ configure.in.tk Wed Jan 26 16:03:04 2000 +@@ -2,6 +2,8 @@ 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" ++tcldir=tcl8.0 ++tcllib=tcl80 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" +@@ -12,8 +14,8 @@ + echo "can't find tcl.h in $d/include" 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 \ ++ places="$d/lib/lib${tcllib}.so \ ++ $d/lib/lib${tcllib}.a \ $d/lib/libtcl.so \ $d/lib/libtcl.a" V_LIB_TCL=FAIL -@@ -27,7 +28,7 @@ +@@ -27,7 +29,7 @@ echo "can't find libtcl.a in $d/lib" exit 1 fi - places="$d/lib/tcl7.5 \ -+ places="$d/lib/tcl8.0 \ ++ places="$d/lib/${tcldir} \ $d/lib/tcl" V_LIBRARY_TCL=FAIL for dir in $places; do -@@ -44,13 +45,16 @@ +@@ -44,10 +46,11 @@ AC_TEST_CPP([#include ], 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 \ ++ places="$PWD/../${tcldir} \ ++ /usr/src/local/${tcldir} \ ++ /import/tcl/include/${tcldir} \ $prefix/include \ ++ $prefix/include/${tcldir} \ $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 @@ +@@ -64,47 +67,43 @@ 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 \ +- if test "$V_LIB_TCL" = FAIL; then +- echo "checking for libtcl.a" +- places="\ +- $prefix/lib \ +- $x_libraries \ +- /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 +- " +- 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 +- 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 @@ +- break +- fi +- done +- if test "$V_LIB_TCL" = FAIL; then +- echo "can't find libtcl.a" +- exit 1 +- else +- if test $solaris ; then +- V_LIB_TCL="-R$dir $V_LIB_TCL" +- fi ++ V_TCL_CONFIG=FAIL ++ echo "checking for tclConfig.sh" ++ places="/usr/local/lib/${tcldir} \ ++ /usr/contrib/lib/${tcldir} \ ++ /usr/lib/${tcldir} \ ++ /usr/lib/tk/${tcldir} \ ++ /import/tcl/lib/${tcldir} \ ++ $prefix/lib/${tcldir} \ ++ $x_libraries/${tcldir} \ ++ /usr/local/lib/tcl \ ++ /usr/lib/tcl \ ++ /usr/lib/tk/tcl \ ++ /import/tcl/lib/tcl \ ++ $prefix/lib/tcl \ ++ $x_libraries/tcl \ ++ $x_libraries/tcl" ++ for dir in $places; do ++ if test -r $dir/tclConfig.sh ; then ++ V_TCL_CONFIG=$dir/tclConfig.sh ++ break + fi ++ done ++ if test "$V_TCL_CONFIG" = FAIL; then ++ echo "can't find tclConfig.sh" ++ exit 1 fi ++ . ${V_TCL_CONFIG} ++ V_LIB_TCL="${TCL_LIB_FLAG}" echo "checking for tcl/init.tcl" V_LIBRARY_TCL=FAIL - places="/usr/local/lib/tcl7.5 \ @@ -102,63 +117,51 @@ $NetBSD$ - /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 \ ++ places="/usr/local/lib/${tcldir} \ ++ /usr/contrib/lib/${tcldir} \ ++ /usr/lib/${tcldir} \ ++ /usr/lib/tk/${tcldir} \ ++ /import/tcl/lib/${tcldir} \ ++ $prefix/lib/${tcldir} \ ++ $x_libraries/${tcldir} \ /usr/local/lib/tcl \ /usr/lib/tcl \ /usr/lib/tk/tcl \ -@@ -128,18 +134,19 @@ +@@ -128,6 +127,8 @@ 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" ++tkdir=tk8.0 ++tklib=tk80 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" +@@ -138,8 +139,8 @@ + echo "can't find tk.h in $d/include" 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 \ ++ places="$d/lib/lib${tklib}.so \ ++ $d/lib/lib${tklib}.a \ $d/lib/libtk.so \ $d/lib/libtk.a" V_LIB_TK=FAIL -@@ -153,7 +160,7 @@ +@@ -153,7 +154,7 @@ echo "can't find libtk.a in $d/lib" exit 1 fi - places="$d/lib/tk4.1 \ -+ places="$d/lib/tk8.0 \ ++ places="$d/lib/${tkdir} \ $d/lib/tk" V_LIBRARY_TK=FAIL for dir in $places; do -@@ -170,18 +177,21 @@ - AC_TEST_CPP([#include ], 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" +@@ -173,15 +174,16 @@ + V_INCLUDE_TK="" places="\ $prefix/include \ -+ /usr/pkg/include \ -+ /usr/pkg/include/tk8.0 \ ++ $prefix/include/${tkdir} \ /usr/local/include \ -+ /usr/local/include/tk8.0 \ /usr/contrib/include \ /usr/include/tcl \ /usr/include\ @@ -167,47 +170,75 @@ $NetBSD$ - $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 \ ++ $PWD/../${tkdir} \ ++ /usr/src/local/${tkdir} \ ++ /import/tcl/include/${tkdir} \ " for dir in $places; do if test -r $dir/tk.h ; then -@@ -194,25 +204,26 @@ +@@ -194,48 +196,47 @@ 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 \ +- if test "$V_LIB_TK" = FAIL; then +- echo "checking for libtk.a" +- places="/usr/local/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 +- $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 +- 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 @@ +- break +- fi +- done +- if test "$V_LIB_TK" = FAIL; then +- echo "can't find libtk.a" +- exit 1 +- else +- if test $solaris ; then +- V_LIB_TK="-R$dir $V_LIB_TK" +- fi ++ V_TK_CONFIG=FAIL ++ echo "checking for tkConfig.sh" ++ places="/usr/local/lib/${tkdir} \ ++ /usr/contrib/lib/${tkdir} \ ++ /usr/lib/${tkdir} \ ++ /usr/lib/tk/${tkdir} \ ++ /import/tcl/lib/${tkdir} \ ++ $prefix/lib/${tkdir} \ ++ $x_libraries/${tkdir} \ ++ $PWD/../${tkdir}/library \ ++ /usr/src/local/${tkdir}/library \ ++ /usr/local/lib/tk \ ++ /usr/lib/tk \ ++ /usr/lib/tk/tk \ ++ /import/tcl/lib/tk \ ++ $prefix/lib/tk \ ++ $x_libraries/tk \ ++ $x_libraries/tk" ++ for dir in $places; do ++ if test -r $dir/tkConfig.sh ; then ++ V_TK_CONFIG=$dir/tkConfig.sh ++ break + fi ++ done ++ if test "$V_TK_CONFIG" = FAIL; then ++ echo "can't find tkConfig.sh" ++ exit 1 fi ++ . ${V_TK_CONFIG} ++ V_LIB_TK="${TK_LIB_FLAG}" echo "checking for tk/tk.tcl" V_LIBRARY_TK=FAIL - places="/usr/local/lib/tk4.1 \ @@ -219,16 +250,15 @@ $NetBSD$ - $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 \ ++ places="/usr/local/lib/${tkdir} \ ++ /usr/contrib/lib/${tkdir} \ ++ /usr/lib/${tkdir} \ ++ /usr/lib/tk/${tkdir} \ ++ /import/tcl/lib/${tkdir} \ ++ $prefix/lib/${tkdir} \ ++ $x_libraries/${tkdir} \ ++ $PWD/../${tkdir}/library \ ++ /usr/src/local/${tkdir}/library \ /usr/local/lib/tk \ /usr/lib/tk \ /usr/lib/tk/tk \ diff --git a/mbone/vat/patches/patch-ak b/mbone/vat/patches/patch-ak new file mode 100644 index 00000000000..de2a69bf7e3 --- /dev/null +++ b/mbone/vat/patches/patch-ak @@ -0,0 +1,23 @@ +$NetBSD: patch-ak,v 1.1 2000/01/26 22:14:27 jlam Exp $ + +--- Makefile.in.orig Thu Apr 25 09:20:32 1996 ++++ Makefile.in Wed Jan 26 16:37:34 2000 +@@ -209,16 +209,10 @@ + rm ../$$name; chmod 444 $$tar + + install: force +- cp vat @prefix@/bin/vat; \ +- chown bin @prefix@/bin/vat; \ +- chgrp bin @prefix@/bin/vat; \ +- chmod 555 @prefix@/bin/vat ++ ${BSD_INSTALL_PROGRAM} vat @prefix@/bin + + install-man: force +- cp vat.1 @prefix@/man/man1/vat.1 +- chown bin @prefix@/man/man1/vat.1 +- chgrp bin @prefix@/man/man1/vat.1 +- chmod 444 @prefix@/man/man1/vat.1 ++ ${BSD_INSTALL_MAN} vat.1 @prefix@/man/man1 + + CLEAN = vat core core.vat tcl2c++ config.log config.cache + clean: diff --git a/mbone/vat/pkg/PLIST b/mbone/vat/pkg/PLIST index be060c96fac..a1a6fd21aed 100644 --- a/mbone/vat/pkg/PLIST +++ b/mbone/vat/pkg/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.2 1998/01/24 20:48:01 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.3 2000/01/26 22:14:27 jlam Exp $ bin/vat -man/man1/vat.1.gz +man/man1/vat.1 -- cgit v1.2.3