From 4607e1371752827ea0e60bb2008267b31ceb71eb Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Wed, 26 Jul 2000 20:58:34 +0000 Subject: -update to Dinotrace 9.0k Changes since 9.0g are (from the NEWS file): Changes in Dinotrace 9.0k 7/17/2000 Fixed bug with $comment after $enddefinitions. [Harunobu Miyashita] Fixed Tempest reading signals over 128 bits. [Ta-Chung Chang] This bug was introduced in 9.0i. Fixed portability bug with Value Examine showing 0s. [Ta-Chung Chang] Fixed Verilog reading with large time intervals. [Matthias Wenzel] Changes in Dinotrace 9.0i 5/1/2000 Major speed improvement in reading Tempest traces. All trace formats now have less processing when building busses from individual bits. [Steve Hoover] ASCII traces assume extra time so last line is not lost. ASCII traces which had timestamps would not show the last state of the bus, as Dinotrace did not guess at how long that last state was valid for. Now, it looks at the smallest time step in the trace, and uses that as a guess at the timescale. [Pani Kodandapani] --- cad/dinotrace/Makefile | 8 +- cad/dinotrace/files/md5 | 4 +- cad/dinotrace/files/patch-sum | 10 +- cad/dinotrace/patches/patch-aa | 13 - cad/dinotrace/patches/patch-ab | 15 +- cad/dinotrace/patches/patch-ac | 642 +++++++++++++++++++++++++++-------------- cad/dinotrace/patches/patch-ad | 10 +- cad/dinotrace/patches/patch-ae | 13 - 8 files changed, 446 insertions(+), 269 deletions(-) delete mode 100644 cad/dinotrace/patches/patch-aa delete mode 100644 cad/dinotrace/patches/patch-ae (limited to 'cad/dinotrace') diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile index 7f7662802ac..eb38c2ba222 100644 --- a/cad/dinotrace/Makefile +++ b/cad/dinotrace/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/03/14 19:52:47 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.2 2000/07/26 20:58:34 dmcmahill Exp $ # -DISTNAME= dinotrace-9.0g +DISTNAME= dinotrace-9.0k CATEGORIES= cad MASTER_SITES= http://www.ultranet.com/~wsnyder/veripool/ftp/ @@ -14,4 +14,8 @@ GNU_CONFIGURE= YES USE_MOTIF= YES +#avoid having this installed later +post-patch: + ${RM} ${WRKSRC}/dinotrace.info.orig + .include "../../mk/bsd.pkg.mk" diff --git a/cad/dinotrace/files/md5 b/cad/dinotrace/files/md5 index 0ef49d82357..ac67ea7df9e 100644 --- a/cad/dinotrace/files/md5 +++ b/cad/dinotrace/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/03/14 19:52:48 dmcmahill Exp $ +$NetBSD: md5,v 1.2 2000/07/26 20:58:36 dmcmahill Exp $ -MD5 (dinotrace-9.0g.tar.gz) = d69a5ac1466bdfea99d5164de91286b9 +MD5 (dinotrace-9.0k.tar.gz) = 8af38f6d0405ce535c5ba9afd3777037 diff --git a/cad/dinotrace/files/patch-sum b/cad/dinotrace/files/patch-sum index 772dadb1fc5..261f8692f95 100644 --- a/cad/dinotrace/files/patch-sum +++ b/cad/dinotrace/files/patch-sum @@ -1,7 +1,5 @@ -$NetBSD: patch-sum,v 1.4 2000/07/06 12:24:30 hubertf Exp $ +$NetBSD: patch-sum,v 1.5 2000/07/26 20:58:36 dmcmahill Exp $ -MD5 (patch-aa) = 3037b6084b8960e49a85bd46e7bf8182 -MD5 (patch-ab) = b2e9bd026a619b0cd16db25f73fcc985 -MD5 (patch-ac) = dcdf0277aa18ecd7a54429bd3f0cf97e -MD5 (patch-ad) = bb9412307501eb892b9dae40c02e20fa -MD5 (patch-ae) = f50cd5de31d6e8d6f6d847c874e3b9a8 +MD5 (patch-ab) = cd57dca5db20c15fa09b4bc0d619e101 +MD5 (patch-ac) = d3736000f01ec9977a1614b98a9aa421 +MD5 (patch-ad) = 97642c9bc917e38aa24af9a722130109 diff --git a/cad/dinotrace/patches/patch-aa b/cad/dinotrace/patches/patch-aa deleted file mode 100644 index 1898c44087c..00000000000 --- a/cad/dinotrace/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/03/14 19:52:48 dmcmahill Exp $ - -LDFLAGS is defined correctly and not used, LINKFLAGS isn't defined. - ---- src/Makefile.in.orig Tue Jan 25 16:38:29 2000 -+++ src/Makefile.in Tue Mar 7 20:54:10 2000 -@@ -92,5 +92,5 @@ - - ../dinotrace: $(OBJS) Makefile -- $(LINK) $(LINKFLAGS) -o ../dinotrace $(LINKOPT) $(OBJS) $(LIBS) -+ $(LINK) $(LDFLAGS) -o ../dinotrace $(LINKOPT) $(OBJS) $(LIBS) - - #### Derrived files diff --git a/cad/dinotrace/patches/patch-ab b/cad/dinotrace/patches/patch-ab index d947e21bfce..6f8fab90aab 100644 --- a/cad/dinotrace/patches/patch-ab +++ b/cad/dinotrace/patches/patch-ab @@ -1,13 +1,14 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/03/14 19:52:48 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.2 2000/07/26 20:58:38 dmcmahill Exp $ -don't override CFLAGS - ---- configure.in.orig Fri Jan 21 15:39:29 2000 -+++ configure.in Tue Mar 7 20:52:54 2000 -@@ -22,6 +22,4 @@ - +--- configure.in.orig Mon May 1 17:41:26 2000 ++++ configure.in Wed Jul 26 16:17:40 2000 +@@ -23,8 +23,7 @@ dnl Checks for programs. + dnl CFLAGS generally has a low optimization and -g. Annoying, and too slow. + dnl This may need to be changed to support other compilers -CFLAGS="-O2 -g -Wall -DDEBUG" -CFLAGS="-O3" ++CFLAGS=${CFLAGS:-"-O3"} AC_PROG_CC AC_PROG_INSTALL + AC_PATH_PROG(PERL,perl) diff --git a/cad/dinotrace/patches/patch-ac b/cad/dinotrace/patches/patch-ac index 2873f0be59f..d8a6e5a6c2d 100644 --- a/cad/dinotrace/patches/patch-ac +++ b/cad/dinotrace/patches/patch-ac @@ -1,30 +1,37 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/03/14 19:52:48 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.2 2000/07/26 20:58:38 dmcmahill Exp $ -reflect the patched 'configure.in' +regen from patched configure.in ---- configure.orig Tue Feb 8 11:49:11 2000 -+++ configure Tue Mar 7 20:52:59 2000 -@@ -2,5 +2,5 @@ +--- configure.orig Thu Jul 13 14:06:07 2000 ++++ configure Wed Jul 26 16:19:16 2000 +@@ -1,7 +1,7 @@ + #! /bin/sh - # From configure.in Revision: 1.10 # Guess values for system-dependent variables and create Makefiles. + # From configure.in Revision: 1.11 # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # -@@ -54,4 +54,5 @@ + # This configure script is free software; the Free Software Foundation +@@ -53,6 +53,7 @@ + # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. ac_max_here_lines=12 -@@ -337,5 +338,5 @@ + +@@ -336,7 +337,7 @@ + verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12" + echo "configure generated by autoconf version 2.13" exit 0 ;; -@@ -507,7 +508,9 @@ + -with-* | --with-*) +@@ -506,9 +507,11 @@ + # 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' @@ -35,7 +42,9 @@ reflect the patched 'configure.in' +ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. -@@ -550,10 +553,10 @@ + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then +@@ -549,26 +552,26 @@ + # Make sure we can run config.sub. -if $ac_config_sub sun4 >/dev/null 2>&1; then : @@ -48,33 +57,39 @@ reflect the patched 'configure.in' +echo "configure:561: checking host system type" >&5 host_alias=$host -@@ -562,5 +565,5 @@ + case "$host_alias" in + NONE) case $nonopt in NONE) - if host_alias=`$ac_config_guess`; then : + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } fi ;; -@@ -569,5 +572,5 @@ + *) host_alias=$nonopt ;; + esac ;; esac -host=`$ac_config_sub $host_alias` +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -@@ -589,10 +592,8 @@ + host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +@@ -588,20 +591,20 @@ + EOF -CFLAGS="-O2 -g -Wall -DDEBUG" -CFLAGS="-O3" ++CFLAGS=${CFLAGS:-"-O3"} # 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:597: checking for $ac_word" >&5 -+echo "configure:598: checking for $ac_word" >&5 ++echo "configure:599: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -601,6 +602,7 @@ + else + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" @@ -84,14 +99,17 @@ reflect the patched 'configure.in' + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then -@@ -623,5 +625,5 @@ + ac_cv_prog_CC="gcc" +@@ -622,16 +625,17 @@ + # 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:626: checking for $ac_word" >&5 -+echo "configure:628: checking for $ac_word" >&5 ++echo "configure:629: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -630,7 +632,8 @@ + else + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" @@ -102,7 +120,9 @@ reflect the patched 'configure.in' + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then -@@ -667,9 +670,43 @@ + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then +@@ -666,25 +670,61 @@ + echo "$ac_t""no" 1>&6 fi + if test -z "$CC"; then @@ -111,7 +131,7 @@ reflect the patched 'configure.in' + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:679: checking for $ac_word" >&5 ++echo "configure:680: 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 @@ -144,10 +164,10 @@ reflect the patched 'configure.in' echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:674: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:711: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:712: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c -@@ -677,13 +714,15 @@ + # 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' @@ -158,16 +178,18 @@ reflect the patched 'configure.in' -#line 684 "configure" +cat > conftest.$ac_ext << EOF + -+#line 722 "configure" ++#line 723 "configure" #include "confdefs.h" + main(){return(0);} EOF -if { (eval echo configure:688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. -@@ -699,4 +738,10 @@ + if (./conftest; exit) 2>/dev/null; then +@@ -698,18 +738,24 @@ + ac_cv_prog_cc_works=no fi rm -fr conftest* +ac_ext=c @@ -178,27 +200,32 @@ reflect the patched 'configure.in' +cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -@@ -705,10 +750,10 @@ + 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:708: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:753: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:754: 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:713: checking whether we are using GNU C" >&5 -+echo "configure:758: checking whether we are using GNU C" >&5 ++echo "configure:759: 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 -@@ -719,5 +764,5 @@ + else +@@ -718,7 +764,7 @@ + yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:722: \"$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:767: \"$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:768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else -@@ -730,9 +775,13 @@ + ac_cv_prog_gcc=no +@@ -729,11 +775,15 @@ + if test $ac_cv_prog_gcc = yes; then GCC=yes - ac_test_CFLAGS="${CFLAGS+set}" @@ -214,10 +241,12 @@ reflect the patched 'configure.in' +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -+echo "configure:786: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:787: 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 -@@ -749,14 +798,18 @@ + else +@@ -748,16 +798,20 @@ + fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then @@ -242,7 +271,9 @@ reflect the patched 'configure.in' + fi fi -@@ -768,14 +821,15 @@ + # Find a good install program. We prefer a C program (faster), +@@ -767,28 +821,30 @@ + # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag @@ -251,7 +282,7 @@ reflect the patched 'configure.in' # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:775: checking for a BSD compatible install" >&5 -+echo "configure:829: checking for a BSD compatible install" >&5 ++echo "configure:830: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -260,7 +291,8 @@ reflect the patched 'configure.in' + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. -@@ -784,10 +838,11 @@ + case "$ac_dir/" in + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. - for ac_prog in ginstall installbsd scoinst install; do @@ -274,21 +306,25 @@ reflect the patched 'configure.in' - # OSF/1 installbsd also uses dspmsg, but is usable. : else -@@ -819,4 +874,6 @@ + ac_cv_path_install="$ac_dir/$ac_prog -c" +@@ -818,12 +874,14 @@ + # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -@@ -824,5 +881,5 @@ + # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:827: checking for $ac_word" >&5 -+echo "configure:884: checking for $ac_word" >&5 ++echo "configure:885: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -832,7 +889,11 @@ + else +@@ -831,9 +889,13 @@ + /*) ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ;; + ?:/*) @@ -302,42 +338,48 @@ reflect the patched 'configure.in' + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then -@@ -854,5 +915,5 @@ + ac_cv_path_PERL="$ac_dir/$ac_word" +@@ -853,7 +915,7 @@ + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:857: checking how to run the C preprocessor" >&5 -+echo "configure:918: checking how to run the C preprocessor" >&5 ++echo "configure:919: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then -@@ -869,5 +930,5 @@ + CPP= +@@ -868,14 +930,14 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < -@@ -875,6 +936,6 @@ + Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` -+{ (eval echo configure:939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : -@@ -886,5 +947,5 @@ + else +@@ -885,14 +947,31 @@ + rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < -@@ -892,6 +953,23 @@ + Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` -+{ (eval echo configure:956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : @@ -348,46 +390,54 @@ reflect the patched 'configure.in' + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : -@@ -906,4 +984,6 @@ + else +@@ -905,6 +984,8 @@ + rm -f conftest* fi rm -f conftest* +fi +rm -f conftest* ac_cv_prog_CPP="$CPP" fi -@@ -919,5 +999,5 @@ + CPP="$ac_cv_prog_CPP" +@@ -918,7 +999,7 @@ + # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:922: checking for X" >&5 -+echo "configure:1002: checking for X" >&5 ++echo "configure:1003: checking for X" >&5 # Check whether --with-x or --without-x was given. -@@ -981,11 +1061,11 @@ + if test "${with_x+set}" = set; then +@@ -980,13 +1061,13 @@ + # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` -+{ (eval echo configure:1069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -1002,9 +1082,4 @@ + # We can compile using X headers with no special include directory. +@@ -1001,11 +1082,6 @@ + for ac_dir in \ /usr/X11/include \ /usr/X11R6/include \ - /usr/X11R6.6/include \ @@ -397,21 +447,26 @@ reflect the patched 'configure.in' - /usr/X11R6.2/include \ /usr/X11R5/include \ /usr/X11R4/include \ -@@ -1060,5 +1135,5 @@ + \ +@@ -1059,14 +1135,14 @@ + ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" -@@ -1082,9 +1157,4 @@ + # We can link X programs with no special library path. +@@ -1081,11 +1157,6 @@ + for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ /usr/X11/lib \ /usr/X11R6/lib \ - /usr/X11R6.6/lib \ @@ -421,291 +476,359 @@ reflect the patched 'configure.in' - /usr/X11R6.2/lib \ /usr/X11R5/lib \ /usr/X11R4/lib \ -@@ -1178,8 +1248,8 @@ + \ +@@ -1177,17 +1248,17 @@ + case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:1181: checking whether -R must be followed by a space" >&5 -+echo "configure:1251: checking whether -R must be followed by a space" >&5 ++echo "configure:1252: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes -@@ -1204,5 +1274,5 @@ + else +@@ -1203,14 +1274,14 @@ + else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes -@@ -1243,5 +1313,5 @@ + else +@@ -1242,7 +1313,7 @@ + # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:1246: checking for dnet_ntoa in -ldnet" >&5 -+echo "configure:1316: checking for dnet_ntoa in -ldnet" >&5 ++echo "configure:1317: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -1251,5 +1321,5 @@ + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1250,7 +1321,7 @@ + ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" -@@ -1284,5 +1354,5 @@ + else +@@ -1283,7 +1354,7 @@ + if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:1287: checking for dnet_ntoa in -ldnet_stub" >&5 -+echo "configure:1357: checking for dnet_ntoa in -ldnet_stub" >&5 ++echo "configure:1358: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -1292,5 +1362,5 @@ + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1291,7 +1362,7 @@ + ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" -@@ -1332,10 +1402,10 @@ + else +@@ -1331,12 +1402,12 @@ + # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1335: checking for gethostbyname" >&5 -+echo "configure:1405: checking for gethostbyname" >&5 ++echo "configure:1406: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" -@@ -1381,5 +1451,5 @@ + else +@@ -1380,7 +1451,7 @@ + if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1384: checking for gethostbyname in -lnsl" >&5 -+echo "configure:1454: checking for gethostbyname in -lnsl" >&5 ++echo "configure:1455: 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 -@@ -1389,5 +1459,5 @@ + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1388,7 +1459,7 @@ + ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" -@@ -1430,10 +1500,10 @@ + else +@@ -1429,12 +1500,12 @@ + # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1433: checking for connect" >&5 -+echo "configure:1503: checking for connect" >&5 ++echo "configure:1504: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" -@@ -1479,5 +1549,5 @@ + else +@@ -1478,7 +1549,7 @@ + if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1482: checking for connect in -lsocket" >&5 -+echo "configure:1552: checking for connect in -lsocket" >&5 ++echo "configure:1553: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -1487,5 +1557,5 @@ + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1486,7 +1557,7 @@ + ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" -@@ -1522,10 +1592,10 @@ + else +@@ -1521,12 +1592,12 @@ + # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:1525: checking for remove" >&5 -+echo "configure:1595: checking for remove" >&5 ++echo "configure:1596: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" -@@ -1571,5 +1641,5 @@ + else +@@ -1570,7 +1641,7 @@ + if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:1574: checking for remove in -lposix" >&5 -+echo "configure:1644: checking for remove in -lposix" >&5 ++echo "configure:1645: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -1579,5 +1649,5 @@ + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1578,7 +1649,7 @@ + ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" -@@ -1614,10 +1684,10 @@ + else +@@ -1613,12 +1684,12 @@ + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:1617: checking for shmat" >&5 -+echo "configure:1687: checking for shmat" >&5 ++echo "configure:1688: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" -@@ -1663,5 +1733,5 @@ + else +@@ -1662,7 +1733,7 @@ + if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:1666: checking for shmat in -lipc" >&5 -+echo "configure:1736: checking for shmat in -lipc" >&5 ++echo "configure:1737: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -1671,5 +1741,5 @@ + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1670,7 +1741,7 @@ + ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" -@@ -1715,5 +1785,5 @@ + else +@@ -1714,15 +1785,15 @@ + # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:1718: checking for IceConnectionNumber in -lICE" >&5 -+echo "configure:1788: checking for IceConnectionNumber in -lICE" >&5 ++echo "configure:1789: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -1721,7 +1791,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lICE $LIBS" +LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" -@@ -1766,5 +1836,5 @@ + else +@@ -1765,7 +1836,7 @@ + # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1769: checking for X" >&5 -+echo "configure:1839: checking for X" >&5 ++echo "configure:1840: checking for X" >&5 # Check whether --with-x or --without-x was given. -@@ -1828,11 +1898,11 @@ + if test "${with_x+set}" = set; then +@@ -1827,13 +1898,13 @@ + # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` -+{ (eval echo configure:1906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -1849,9 +1919,4 @@ + # We can compile using X headers with no special include directory. +@@ -1848,11 +1919,6 @@ + for ac_dir in \ /usr/X11/include \ /usr/X11R6/include \ - /usr/X11R6.6/include \ @@ -715,21 +838,26 @@ reflect the patched 'configure.in' - /usr/X11R6.2/include \ /usr/X11R5/include \ /usr/X11R4/include \ -@@ -1907,5 +1972,5 @@ + \ +@@ -1906,14 +1972,14 @@ + ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" -@@ -1929,9 +1994,4 @@ + # We can link X programs with no special library path. +@@ -1928,11 +1994,6 @@ + for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ /usr/X11/lib \ /usr/X11R6/lib \ - /usr/X11R6.6/lib \ @@ -739,320 +867,387 @@ reflect the patched 'configure.in' - /usr/X11R6.2/lib \ /usr/X11R5/lib \ /usr/X11R4/lib \ -@@ -2006,10 +2066,10 @@ + \ +@@ -2005,12 +2066,12 @@ + fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2009: checking for ANSI C header files" >&5 -+echo "configure:2069: checking for ANSI C header files" >&5 ++echo "configure:2070: 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 < -@@ -2019,6 +2079,6 @@ + #include +@@ -2018,8 +2079,8 @@ + #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` -+{ (eval echo configure:2082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -2036,5 +2096,5 @@ + ac_cv_header_stdc=yes +@@ -2035,7 +2096,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 < -@@ -2054,5 +2114,5 @@ + EOF +@@ -2053,7 +2114,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 < -@@ -2075,5 +2135,5 @@ + EOF +@@ -2074,7 +2135,7 @@ + : else cat > conftest.$ac_ext < -@@ -2086,5 +2146,5 @@ + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -2085,7 +2146,7 @@ + exit (0); } EOF -if { (eval echo configure:2089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:2150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : -@@ -2110,10 +2170,10 @@ + else +@@ -2109,12 +2170,12 @@ + fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2113: checking for sys/wait.h that is POSIX.1 compatible" >&5 -+echo "configure:2173: checking for sys/wait.h that is POSIX.1 compatible" >&5 ++echo "configure:2174: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -@@ -2131,5 +2191,5 @@ + #include +@@ -2130,7 +2191,7 @@ + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes -@@ -2155,16 +2215,16 @@ + else +@@ -2154,18 +2215,18 @@ + do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2158: checking for $ac_hdr" >&5 -+echo "configure:2218: checking for $ac_hdr" >&5 ++echo "configure:2219: 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:2168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` -+{ (eval echo configure:2228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -2193,10 +2253,10 @@ + eval "ac_cv_header_$ac_safe=yes" +@@ -2192,12 +2253,12 @@ + echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2196: checking for size_t" >&5 -+echo "configure:2256: checking for size_t" >&5 ++echo "configure:2257: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -@@ -2207,5 +2267,5 @@ + #if STDC_HEADERS +@@ -2206,7 +2267,7 @@ + #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_size_t=yes -@@ -2226,10 +2286,10 @@ + else +@@ -2225,12 +2286,12 @@ + fi echo $ac_n "checking for uint_t""... $ac_c" 1>&6 -echo "configure:2229: checking for uint_t" >&5 -+echo "configure:2289: checking for uint_t" >&5 ++echo "configure:2290: checking for uint_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_uint_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -@@ -2240,5 +2300,5 @@ + #if STDC_HEADERS +@@ -2239,7 +2300,7 @@ + #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "uint_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])uint_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_uint_t=yes -@@ -2259,10 +2319,10 @@ + else +@@ -2258,12 +2319,12 @@ + fi echo $ac_n "checking for ulong_t""... $ac_c" 1>&6 -echo "configure:2262: checking for ulong_t" >&5 -+echo "configure:2322: checking for ulong_t" >&5 ++echo "configure:2323: checking for ulong_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ulong_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -@@ -2273,5 +2333,5 @@ + #if STDC_HEADERS +@@ -2272,7 +2333,7 @@ + #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ulong_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])ulong_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_ulong_t=yes -@@ -2292,10 +2352,10 @@ + else +@@ -2291,12 +2352,12 @@ + fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2295: checking for size_t" >&5 -+echo "configure:2355: checking for size_t" >&5 ++echo "configure:2356: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -@@ -2306,5 +2366,5 @@ + #if STDC_HEADERS +@@ -2305,7 +2366,7 @@ + #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_size_t=yes -@@ -2325,10 +2385,10 @@ + else +@@ -2324,12 +2385,12 @@ + fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:2328: checking whether struct tm is in sys/time.h or time.h" >&5 -+echo "configure:2388: checking whether struct tm is in sys/time.h or time.h" >&5 ++echo "configure:2389: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -@@ -2338,5 +2398,5 @@ + #include +@@ -2337,7 +2398,7 @@ + struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:2341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h -@@ -2360,5 +2420,5 @@ + else +@@ -2359,21 +2420,21 @@ + echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2363: checking for inline" >&5 -+echo "configure:2423: checking for inline" >&5 ++echo "configure:2424: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2367,5 +2427,5 @@ + else + ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break -@@ -2400,5 +2460,5 @@ + else +@@ -2399,14 +2460,14 @@ + esac echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2403: checking whether byte ordering is bigendian" >&5 -+echo "configure:2463: checking whether byte ordering is bigendian" >&5 ++echo "configure:2464: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2407,5 +2467,5 @@ + else + ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < -@@ -2418,9 +2478,9 @@ + #include +@@ -2417,11 +2478,11 @@ + #endif ; return 0; } EOF -if { (eval echo configure:2421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < -@@ -2433,5 +2493,5 @@ + #include +@@ -2432,7 +2493,7 @@ + #endif ; return 0; } EOF -if { (eval echo configure:2436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes -@@ -2453,5 +2513,5 @@ + else +@@ -2452,7 +2513,7 @@ + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:2530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no -@@ -2491,10 +2551,10 @@ + else +@@ -2490,12 +2551,12 @@ + echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2494: checking return type of signal handlers" >&5 -+echo "configure:2554: checking return type of signal handlers" >&5 ++echo "configure:2555: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -@@ -2513,5 +2573,5 @@ + #include +@@ -2512,7 +2573,7 @@ + int i; ; return 0; } EOF -if { (eval echo configure:2516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void -@@ -2534,10 +2594,10 @@ + else +@@ -2533,12 +2594,12 @@ + for ac_func in gethostname strdup strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2537: checking for $ac_func" >&5 -+echo "configure:2597: checking for $ac_func" >&5 ++echo "configure:2598: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" -@@ -2618,5 +2678,5 @@ + else +@@ -2617,7 +2678,7 @@ + # 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 | - case `(ac_space=' '; set) 2>&1` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution -@@ -2685,5 +2745,5 @@ + # turns \\\\ into \\, and sed turns \\ into \). +@@ -2684,7 +2745,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.12" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) -@@ -2705,7 +2765,9 @@ + echo "\$ac_cs_usage"; exit 0 ;; +@@ -2704,9 +2765,11 @@ + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s%@SHELL@%$SHELL%g @@ -1062,9 +1257,12 @@ reflect the patched 'configure.in' +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g -@@ -2735,4 +2797,5 @@ + s%@LIBS@%$LIBS%g +@@ -2734,6 +2797,7 @@ + s%@CONFIG_DATE_STRG@%$CONFIG_DATE_STRG%g s%@CC@%$CC%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@PERL@%$PERL%g + s%@CPP@%$CPP%g diff --git a/cad/dinotrace/patches/patch-ad b/cad/dinotrace/patches/patch-ad index 44d279a534c..49b86e5fea9 100644 --- a/cad/dinotrace/patches/patch-ad +++ b/cad/dinotrace/patches/patch-ad @@ -1,15 +1,17 @@ -$NetBSD: patch-ad,v 1.2 2000/06/12 20:30:41 dmcmahill Exp $ +$NetBSD: patch-ad,v 1.3 2000/07/26 20:58:39 dmcmahill Exp $ makes install-info --delete %D/info/dinotrace.info %D/info/dir actually work. ---- dinotrace.info.orig Tue Jan 25 16:39:51 2000 -+++ dinotrace.info Mon Jun 12 16:08:18 2000 -@@ -4,5 +4,5 @@ +--- dinotrace.info.orig Thu Jul 13 14:09:17 2000 ++++ dinotrace.info Wed Jul 26 15:06:50 2000 +@@ -3,7 +3,7 @@ + INFO-DIR-SECTION Signal waveform tracing tool START-INFO-DIR-ENTRY -* Dinotrace: (Dinotrace). Signal waveform tracing tool. +* Dinotrace: (dinotrace). Signal waveform tracing tool. END-INFO-DIR-ENTRY + This file documents the Dinotrace package for viewing signal diff --git a/cad/dinotrace/patches/patch-ae b/cad/dinotrace/patches/patch-ae deleted file mode 100644 index c4eff6a850c..00000000000 --- a/cad/dinotrace/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2000/07/06 12:24:31 hubertf Exp $ - ---- Makefile.in.orig Thu Jul 6 14:18:21 2000 -+++ Makefile.in Thu Jul 6 14:18:32 2000 -@@ -157,7 +157,7 @@ - - install: all info installdirs install-info - for p in dinotrace; do \ -- $(INSTALL_PROGRAM) $$p $(bindir)/$p; \ -+ $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \ - done - @echo "" - @echo "*** Lisp files not installed, you may want to" -- cgit v1.2.3