summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/scotty/files/patch-sum11
-rw-r--r--net/scotty/patches/patch-aa51
-rw-r--r--net/scotty/patches/patch-af1255
-rw-r--r--net/scotty/patches/patch-ag23
-rw-r--r--net/scotty/patches/patch-ah23
-rw-r--r--net/scotty/patches/patch-aj28
6 files changed, 1344 insertions, 47 deletions
diff --git a/net/scotty/files/patch-sum b/net/scotty/files/patch-sum
index c454f856cb8..f2a93ef9853 100644
--- a/net/scotty/files/patch-sum
+++ b/net/scotty/files/patch-sum
@@ -1,10 +1,11 @@
-$NetBSD: patch-sum,v 1.2 2000/03/21 10:06:44 he Exp $
+$NetBSD: patch-sum,v 1.3 2000/07/05 12:33:59 he Exp $
-MD5 (patch-aa) = 0baefbb39b16e6176858303acafdde49
+MD5 (patch-aa) = 99a522c61d95ad2345254b5ae3725e9e
MD5 (patch-ab) = 5e9b51c76855f68f6445f04fbe42353f
MD5 (patch-ad) = 7a4b09f538b7f05df5060429a3aef480
MD5 (patch-ae) = 163fce75c5bbcbc1102f1bf6dd40f684
-MD5 (patch-af) = 0267717e8d713ac1aada5594bd291068
-MD5 (patch-ag) = f4565979f3df9c807fc7907dff5de0e2
-MD5 (patch-ah) = 000d76b7376de796fdef3183bbfb1be7
+MD5 (patch-af) = b09c015bf2d260a41fe47eb6af5374ad
+MD5 (patch-ag) = 33046c43588bea565b71c8b7d5436f6e
+MD5 (patch-ah) = 0a01b56db27311160800101ede47038d
MD5 (patch-ai) = 2a78f1f5d0f24cc1fe23a762af55eb9c
+MD5 (patch-aj) = 25e8128e2a7b3305dfdc1fd0e1926c2c
diff --git a/net/scotty/patches/patch-aa b/net/scotty/patches/patch-aa
index 8c8a897241a..c92f76a6a27 100644
--- a/net/scotty/patches/patch-aa
+++ b/net/scotty/patches/patch-aa
@@ -1,29 +1,30 @@
-$NetBSD: patch-aa,v 1.4 1998/09/18 17:45:09 agc Exp $
+$NetBSD: patch-aa,v 1.5 2000/07/05 12:34:00 he Exp $
---- Makefile.in.orig Fri Jan 30 14:46:51 1998
-+++ Makefile.in Fri Sep 18 18:15:41 1998
+--- ../unix/Makefile.in.dist Fri Jan 30 15:46:51 1998
++++ ../unix/Makefile.in Wed Jul 5 14:07:02 2000
@@ -386,22 +386,28 @@
TKI_OBJS = $(TKI_GENERIC_OBJS)
+-all: @TARGET@
+LIBTNM= libtnm${TNM_VERSION}.a
+LIBTKINED= libtkined${TKI_VERSION}.a
+LIBMAP= libmap.a
-+
- all: @TARGET@
-scotty: tnm$(SHLIB_SUFFIX) ntping straps scotty.o
- $(LD) $(LD_FLAGS) $(LD_SEARCH_FLAGS) -o scotty scotty.o $(TCL_LIB_SPEC) $(LIBS) $(DL_LIBS) -lm
-+scotty: ${LIBTNM} ntping straps scotty.o
-+ ${LIBTOOL} --mode=link $(LD) $(LD_FLAGS) $(LD_SEARCH_FLAGS) -o scotty scotty.o ${LIBTNM:.a=.la} $(TCL_LIB_SPEC) $(LIBS) $(DL_LIBS) -lm
++all: @TARGET@ scotty-wrap tkined-wrap
-tnm$(SHLIB_SUFFIX): $(TNM_OBJS)
- $(SHLIB_LD) $(TNM_OBJS) -o tnm$(SHLIB_SUFFIX) $(LIBS) $(OSIMIS_LIBS) $(MSQL_LIBS) $(GDMO_LIBS)
++scotty: ${LIBTNM} ntping straps scotty.o
++ ${LIBTOOL} --mode=link $(LD) $(LD_FLAGS) $(LD_SEARCH_FLAGS) -o scotty scotty.o ${LIBTNM:.a=.la} $(TCL_LIB_SPEC) $(LIBS) $(DL_LIBS) -lm
+
+-tkined: tkined$(SHLIB_SUFFIX) tkined.in
+# $(SHLIB_LD) $(TNM_OBJS) -o tnm$(SHLIB_SUFFIX) $(LIBS) $(OSIMIS_LIBS) $(MSQL_LIBS) $(GDMO_LIBS)
+${LIBTNM}: $(TNM_OBJS)
+ ${LIBTOOL} --mode=link ${CC} -o ${.TARGET:.a=.la} ${TNM_OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:0
-
--tkined: tkined$(SHLIB_SUFFIX) tkined.in
++
+tkined: ${LIBTKINED} tkined.in
@sed -e 's+%WISH%+$(TK_WISH)+' \
-e 's+%TCL_VERSION%+$(TCL_VERSION)+' \
@@ -70,7 +71,7 @@ $NetBSD: patch-aa,v 1.4 1998/09/18 17:45:09 agc Exp $
@for i in $(BIN_INSTALL_DIR) $(LIB_RUNTIME_DIR) $(TKI_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
-@@ -589,10 +594,13 @@
+@@ -589,10 +594,11 @@
fi; \
done;
@echo "Installing tkined$(TNM_VERSION) and tkined$(TNM_VERSION)$(SHLIB_SUFFIX)"
@@ -78,17 +79,15 @@ $NetBSD: patch-aa,v 1.4 1998/09/18 17:45:09 agc Exp $
- @$(INSTALL_DATA) tkined$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
- @chmod 555 $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
- @echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)[info sharedlibextension]"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
-+ @sed s,@PREFIX@,${prefix},g tkined.sh.in >tkined.sh
-+ @$(INSTALL) -m 555 ${UNIX_DIR}/tkined.sh ${BIN_INSTALL_DIR}/tkined
++ @$(INSTALL) -m 555 ${UNIX_DIR}/scotty-wrap ${BIN_INSTALL_DIR}/scotty
++ @$(INSTALL) -m 555 ${UNIX_DIR}/tkined-wrap ${BIN_INSTALL_DIR}/tkined
+ @${LIBTOOL} --mode=install $(INSTALL) -m 555 $(UNIX_DIR)/tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
-+ @sed s,@PREFIX@,${prefix},g scotty.sh.in >scotty.sh
-+ @$(INSTALL) -m 555 ${UNIX_DIR}/scotty.sh ${BIN_INSTALL_DIR}/scotty
+ @${LIBTOOL} --mode=install $(INSTALL_DATA) ${LIBTKINED:.a=.la} $(LIB_RUNTIME_DIR)
+ @echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/libtkined$(TKI_VERSION).so.1.0"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
@$(INSTALL_DATA) $(TKI_DIR)/tkined.defaults $(TKI_INSTALL_DIR)
tki-install-library:
-@@ -731,7 +739,7 @@
+@@ -731,7 +737,7 @@
@rm -f $(TNM_OBJS) $(TKI_OBJS) scotty.o ntping.o straps.o
@rm -f tnmGdmoScan.c tnmGdmoParser.c tnmGdmoParser.h
@rm -f scotty ntping straps tkined
@@ -97,7 +96,7 @@ $NetBSD: patch-aa,v 1.4 1998/09/18 17:45:09 agc Exp $
@rm -f core *_svc.c *~ *.bak so_locations lmake.???
@rm -f map.so tnmMap.o tnmMapUtil.o
@rm -f tnmMapNode.o tnmMapClnt.o tnmMapAppl.o
-@@ -786,8 +794,8 @@
+@@ -786,8 +792,8 @@
$(MAN8_INSTALL_DIR)/straps.8 \
$(BIN_INSTALL_DIR)/ntping \
$(MAN8_INSTALL_DIR)/ntping.8 \
@@ -108,7 +107,7 @@ $NetBSD: patch-aa,v 1.4 1998/09/18 17:45:09 agc Exp $
$(TNM_INSTALL_DIR) $(TKI_INSTALL_DIR)
bintar:
-@@ -802,77 +810,77 @@
+@@ -802,77 +808,83 @@
#----------------------------------------------------------------
ntping.o: $(TNM_NTPING_DIR)/ntping.c
@@ -130,6 +129,12 @@ $NetBSD: patch-aa,v 1.4 1998/09/18 17:45:09 agc Exp $
@rm -f straps.bak || true
- $(LD) $(LD_FLAGS) -o straps straps.o $(LIBS)
+ ${LIBTOOL} --mode=link $(LD) $(LD_FLAGS) -o straps straps.o $(LIBS)
++
++scotty-wrap: scotty-wrap.c
++ ${CC} -o scotty-wrap scotty-wrap.c
++
++tkined-wrap: tkined-wrap.c
++ ${CC} -o tkined-wrap tkined-wrap.c
scotty.o: $(UNIX_DIR)/scotty.c
- $(CC) -c $(TNM_CC_SWITCHES) -I. -I$(TNM_GENERIC_DIR) $(TCL_INCLUDES) $(UNIX_DIR)/scotty.c
@@ -209,7 +214,7 @@ $NetBSD: patch-aa,v 1.4 1998/09/18 17:45:09 agc Exp $
mount.x: $(TNM_GENERIC_DIR)/mount.x
cp $(TNM_GENERIC_DIR)/mount.x .
-@@ -881,10 +889,10 @@
+@@ -881,10 +893,10 @@
$(RPCGEN) mount.x
mount_xdr.o: mount_xdr.c
@@ -222,7 +227,7 @@ $NetBSD: patch-aa,v 1.4 1998/09/18 17:45:09 agc Exp $
ether.x: $(TNM_GENERIC_DIR)/ether.x
cp $(TNM_GENERIC_DIR)/ether.x .
-@@ -893,10 +901,10 @@
+@@ -893,10 +905,10 @@
$(RPCGEN) ether.x
ether_xdr.o: ether_xdr.c
@@ -235,7 +240,7 @@ $NetBSD: patch-aa,v 1.4 1998/09/18 17:45:09 agc Exp $
rstat.x: $(TNM_GENERIC_DIR)/rstat.x
cp $(TNM_GENERIC_DIR)/rstat.x .
-@@ -905,10 +913,10 @@
+@@ -905,10 +917,10 @@
$(RPCGEN) rstat.x
rstat_xdr.o: rstat_xdr.c
@@ -248,7 +253,7 @@ $NetBSD: patch-aa,v 1.4 1998/09/18 17:45:09 agc Exp $
pcnfsd.x: $(TNM_GENERIC_DIR)/pcnfsd.x
cp $(TNM_GENERIC_DIR)/pcnfsd.x .
-@@ -917,61 +925,61 @@
+@@ -917,61 +929,61 @@
$(RPCGEN) pcnfsd.x
pcnfsd_xdr.o: pcnfsd_xdr.c
@@ -329,7 +334,7 @@ $NetBSD: patch-aa,v 1.4 1998/09/18 17:45:09 agc Exp $
tnmGdmoScan.c: $(TNM_GDMO_DIR)/tnmGdmo.h $(TNM_GDMO_DIR)/tnmGdmoScan.l tnmGdmoParser.h
$(LEX) $(TNM_GDMO_DIR)/tnmGdmoScan.l
-@@ -983,78 +991,78 @@
+@@ -983,78 +995,78 @@
mv -f y.tab.h tnmGdmoParser.h
msqltcl.o: $(TNM_MSQL_DIR)/msqltcl.c
@@ -430,7 +435,7 @@ $NetBSD: patch-aa,v 1.4 1998/09/18 17:45:09 agc Exp $
tnmMibScan.c: $(TNM_SNMP_DIR)/tnmMib.h $(NEW_DIR)/tnmMibScan.l tnmMibYacc.h
$(LEX) -PTnmMib $(NEW_DIR)/tnmMibScan.l
-@@ -1066,24 +1074,28 @@
+@@ -1066,24 +1078,28 @@
mv -f y.tab.h tnmMibYacc.h
mib: tnmMibScan.o tnmMibYacc.o
diff --git a/net/scotty/patches/patch-af b/net/scotty/patches/patch-af
index ca079197bc1..f7884f23b98 100644
--- a/net/scotty/patches/patch-af
+++ b/net/scotty/patches/patch-af
@@ -1,8 +1,610 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:10:56 agc Exp $
+$NetBSD: patch-af,v 1.3 2000/07/05 12:34:00 he Exp $
---- configure Tue Jul 22 15:21:27 1997
-+++ configure Sat Aug 23 04:14:43 1997
-@@ -1402,7 +1402,7 @@
+--- ../unix/configure.dist Tue Dec 23 10:08:58 1997
++++ ../unix/configure Wed Jul 5 13:59:07 2000
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+
+ # 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.
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -67,6 +67,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
+
+@@ -350,7 +351,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 ;;
+
+ -with-* | --with-*)
+@@ -520,9 +521,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'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+
++ac_exeext=
++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.
+ if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+@@ -557,15 +560,16 @@
+ # 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:561: checking for $ac_word" >&5
++echo "configure:564: 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
+ 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}:"
+- for ac_dir in $PATH; do
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
++ ac_dummy="$PATH"
++ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_CC="gcc"
+@@ -586,16 +590,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:590: checking for $ac_word" >&5
++echo "configure:594: 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
+ 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}:"
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_prog_rejected=no
+- for ac_dir in $PATH; do
++ ac_dummy="$PATH"
++ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+@@ -630,25 +635,61 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
++ if test -z "$CC"; then
++ case "`uname -s`" in
++ *win32* | *WIN32*)
++ # 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:645: 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
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
++ ac_dummy="$PATH"
++ for ac_dir in $ac_dummy; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ ac_cv_prog_CC="cl"
++ break
++ fi
++ done
++ IFS="$ac_save_ifs"
++fi
++fi
++CC="$ac_cv_prog_CC"
++if test -n "$CC"; then
++ echo "$ac_t""$CC" 1>&6
++else
++ echo "$ac_t""no" 1>&6
++fi
++ ;;
++ esac
++ fi
+ 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:638: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:677: 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'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+
+-cat > conftest.$ac_ext <<EOF
+-#line 648 "configure"
++cat > conftest.$ac_ext << EOF
++
++#line 688 "configure"
+ #include "confdefs.h"
++
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:693: \"$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.
+ if (./conftest; exit) 2>/dev/null; then
+@@ -662,18 +703,24 @@
+ ac_cv_prog_cc_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${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
+
+ 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:672: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:719: 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:677: checking whether we are using GNU C" >&5
++echo "configure:724: 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
+@@ -682,7 +729,7 @@
+ yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:686: \"$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:733: \"$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
+@@ -693,11 +740,15 @@
+
+ if test $ac_cv_prog_gcc = yes; then
+ GCC=yes
+- ac_test_CFLAGS="${CFLAGS+set}"
+- ac_save_CFLAGS="$CFLAGS"
+- CFLAGS=
+- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:701: checking whether ${CC-cc} accepts -g" >&5
++else
++ GCC=
++fi
++
++ac_test_CFLAGS="${CFLAGS+set}"
++ac_save_CFLAGS="$CFLAGS"
++CFLAGS=
++echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
++echo "configure:752: 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
+@@ -712,16 +763,20 @@
+ fi
+
+ echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+- if test "$ac_test_CFLAGS" = set; then
+- CFLAGS="$ac_save_CFLAGS"
+- elif test $ac_cv_prog_cc_g = yes; then
++if test "$ac_test_CFLAGS" = set; then
++ CFLAGS="$ac_save_CFLAGS"
++elif test $ac_cv_prog_cc_g = yes; then
++ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
+ else
+- CFLAGS="-O2"
++ CFLAGS="-g"
+ fi
+ else
+- GCC=
+- test "${CFLAGS+set}" = set || CFLAGS="-g"
++ if test "$GCC" = yes; then
++ CFLAGS="-O2"
++ else
++ CFLAGS=
++ fi
+ fi
+
+ else
+@@ -729,7 +784,7 @@
+ fi
+
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:733: checking how to run the C preprocessor" >&5
++echo "configure:788: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+@@ -744,14 +799,14 @@
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp.
+ cat > conftest.$ac_ext <<EOF
+-#line 748 "configure"
++#line 803 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:809: \"$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
+ :
+ else
+@@ -761,14 +816,31 @@
+ rm -rf conftest*
+ CPP="${CC-cc} -E -traditional-cpp"
+ cat > conftest.$ac_ext <<EOF
+-#line 765 "configure"
++#line 820 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:826: \"$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
++ :
++else
++ echo "$ac_err" >&5
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
++ rm -rf conftest*
++ CPP="${CC-cc} -nologo -E"
++ cat > conftest.$ac_ext <<EOF
++#line 837 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:843: \"$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
+ :
+ else
+@@ -781,6 +853,8 @@
+ rm -f conftest*
+ fi
+ rm -f conftest*
++fi
++rm -f conftest*
+ ac_cv_prog_CPP="$CPP"
+ fi
+ CPP="$ac_cv_prog_CPP"
+@@ -792,15 +866,16 @@
+ # Extract the first word of "flex", so it can be a program name with args.
+ set dummy flex; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:796: checking for $ac_word" >&5
++echo "configure:870: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ if test -n "$LEX"; then
+ ac_cv_prog_LEX="$LEX" # Let the user override the test.
+ else
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+- for ac_dir in $PATH; do
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
++ ac_dummy="$PATH"
++ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_LEX="flex"
+@@ -825,7 +900,7 @@
+ *) ac_lib=l ;;
+ esac
+ echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
+-echo "configure:829: checking for yywrap in -l$ac_lib" >&5
++echo "configure:904: checking for yywrap in -l$ac_lib" >&5
+ ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -833,7 +908,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-l$ac_lib $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 837 "configure"
++#line 912 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -844,7 +919,7 @@
+ yywrap()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:923: \"$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"
+ else
+@@ -871,15 +946,16 @@
+ # 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:875: checking for $ac_word" >&5
++echo "configure:950: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ if test -n "$YACC"; then
+ ac_cv_prog_YACC="$YACC" # Let the user override the test.
+ else
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+- for ac_dir in $PATH; do
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
++ ac_dummy="$PATH"
++ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_YACC="$ac_prog"
+@@ -926,28 +1002,30 @@
+ # SunOS /usr/etc/install
+ # IRIX /sbin/install
+ # AIX /bin/install
++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./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:934: checking for a BSD compatible install" >&5
++echo "configure:1011: 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
+ else
+- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
++ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
+ for ac_dir in $PATH; do
+ # Account for people who put trailing slashes in PATH elements.
+ 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
++ # Don't use installbsd from OSF since it installs stuff as root
++ # by default.
++ for ac_prog in ginstall scoinst install; do
+ if test -f $ac_dir/$ac_prog; then
+ if test $ac_prog = install &&
+ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+- # OSF/1 installbsd also uses dspmsg, but is usable.
+ :
+ else
+ ac_cv_path_install="$ac_dir/$ac_prog -c"
+@@ -977,6 +1055,8 @@
+ # 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'
+
+
+@@ -986,7 +1066,7 @@
+ # Extract the first word of "scotty", so it can be a program name with args.
+ set dummy scotty; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:990: checking for $ac_word" >&5
++echo "configure:1070: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_SCOTTY'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -994,9 +1074,13 @@
+ /*)
+ ac_cv_path_SCOTTY="$SCOTTY" # Let the user override the test with a path.
+ ;;
++ ?:/*)
++ ac_cv_path_SCOTTY="$SCOTTY" # Let the user override the test with a dos path.
++ ;;
+ *)
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+- for ac_dir in $PATH; do
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
++ ac_dummy="$PATH"
++ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_SCOTTY="$ac_dir/$ac_word"
+@@ -1025,7 +1109,7 @@
+ # Extract the first word of "tclsh", so it can be a program name with args.
+ set dummy tclsh; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1029: checking for $ac_word" >&5
++echo "configure:1113: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1033,9 +1117,13 @@
+ /*)
+ ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
+ ;;
++ ?:/*)
++ ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a dos path.
++ ;;
+ *)
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+- for ac_dir in $PATH; do
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
++ ac_dummy="$PATH"
++ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_TCLSH="$ac_dir/$ac_word"
+@@ -1066,7 +1154,7 @@
+ #--------------------------------------------------------------------
+
+ echo $ac_n "checking size of long""... $ac_c" 1>&6
+-echo "configure:1070: checking size of long" >&5
++echo "configure:1158: checking size of long" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1074,7 +1162,7 @@
+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1078 "configure"
++#line 1166 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -1085,7 +1173,7 @@
+ exit(0);
+ }
+ EOF
+-if { (eval echo configure:1089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+ ac_cv_sizeof_long=`cat conftestval`
+ else
+@@ -1105,14 +1193,14 @@
+
+
+ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+-echo "configure:1109: checking whether byte ordering is bigendian" >&5
++echo "configure:1197: 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
+ else
+ ac_cv_c_bigendian=unknown
+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat > conftest.$ac_ext <<EOF
+-#line 1116 "configure"
++#line 1204 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -1123,11 +1211,11 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1215: \"$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 <<EOF
+-#line 1131 "configure"
++#line 1219 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -1138,7 +1226,7 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_c_bigendian=yes
+ else
+@@ -1158,7 +1246,7 @@
+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1162 "configure"
++#line 1250 "configure"
+ #include "confdefs.h"
+ main () {
+ /* Are we little or big endian? From Harbison&Steele. */
+@@ -1171,7 +1259,7 @@
+ exit (u.c[sizeof (long) - 1] == 1);
+ }
+ EOF
+-if { (eval echo configure:1175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1263: \"$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
+ else
+@@ -1203,15 +1291,16 @@
+ # Extract the first word of "rpcgen", so it can be a program name with args.
+ set dummy rpcgen; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1207: checking for $ac_word" >&5
++echo "configure:1295: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RPCGEN'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ if test -n "$RPCGEN"; then
+ ac_cv_prog_RPCGEN="$RPCGEN" # Let the user override the test.
+ else
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+- for ac_dir in $PATH; do
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
++ ac_dummy="$PATH"
++ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_RPCGEN="rpcgen"
+@@ -1333,7 +1422,7 @@
+ # Extract the first word of "tclsh", so it can be a program name with args.
+ set dummy tclsh; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1337: checking for $ac_word" >&5
++echo "configure:1426: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1341,9 +1430,13 @@
+ /*)
+ ac_cv_path_tclsh="$tclsh" # Let the user override the test with a path.
+ ;;
++ ?:/*)
++ ac_cv_path_tclsh="$tclsh" # Let the user override the test with a dos path.
++ ;;
+ *)
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+- for ac_dir in $PATH; do
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
++ ac_dummy="$PATH"
++ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_tclsh="$ac_dir/$ac_word"
+@@ -1378,7 +1471,7 @@
+ found=0
+ for f in $dirs ; do
+ echo $ac_n "checking for tclConfig.sh in $f""... $ac_c" 1>&6
+-echo "configure:1382: checking for tclConfig.sh in $f" >&5
++echo "configure:1475: checking for tclConfig.sh in $f" >&5
+ if test -f "$f/tclConfig.sh" ; then
+ tnm_cv_path_tcl_config=$f
+ found=1
+@@ -1400,14 +1493,14 @@
DL_LIBS=$TCL_DL_LIBS
LD_FLAGS=$TCL_LD_FLAGS
LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS
@@ -11,7 +613,49 @@ $NetBSD: patch-af,v 1.2 1998/08/07 11:10:56 agc Exp $
if test -z "$SHLIB_LD" ; then
{ echo "configure: error: no shared linker definition (TCL_SHLIB_LD) in tclConfig.sh" 1>&2; exit 1; }
-@@ -1486,7 +1486,7 @@
+ fi
+
+ echo $ac_n "checking for tcl version""... $ac_c" 1>&6
+-echo "configure:1411: checking for tcl version" >&5
++echo "configure:1504: checking for tcl version" >&5
+ echo "$ac_t"""$TCL_VERSION"" 1>&6
+ if test 7 -gt $TCL_MAJOR_VERSION; then
+ { echo "configure: error: "tcl 7.5 or later needed"" 1>&2; exit 1; }
+@@ -1423,7 +1516,7 @@
+ # Extract the first word of "wish", so it can be a program name with args.
+ set dummy wish; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1427: checking for $ac_word" >&5
++echo "configure:1520: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1431,9 +1524,13 @@
+ /*)
+ ac_cv_path_wish="$wish" # Let the user override the test with a path.
+ ;;
++ ?:/*)
++ ac_cv_path_wish="$wish" # Let the user override the test with a dos path.
++ ;;
+ *)
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+- for ac_dir in $PATH; do
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
++ ac_dummy="$PATH"
++ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_wish="$ac_dir/$ac_word"
+@@ -1468,7 +1565,7 @@
+ found=0
+ for f in $dirs ; do
+ echo $ac_n "checking for tkConfig.sh in $f""... $ac_c" 1>&6
+-echo "configure:1472: checking for tkConfig.sh in $f" >&5
++echo "configure:1569: checking for tkConfig.sh in $f" >&5
+ if test -f "$f/tkConfig.sh" ; then
+ tnm_cv_path_tk_config=$f
+ found=1
+@@ -1484,13 +1581,13 @@
fi
. $tnm_cv_path_tk_config/tkConfig.sh
@@ -20,3 +664,604 @@ $NetBSD: patch-af,v 1.2 1998/08/07 11:10:56 agc Exp $
if test "$TK_INCLUDES" = "$TCL_INCLUDES" ; then
TK_INCLUDES=""
fi
+
+ echo $ac_n "checking for tk version""... $ac_c" 1>&6
+-echo "configure:1494: checking for tk version" >&5
++echo "configure:1591: checking for tk version" >&5
+ echo "$ac_t"""$TK_VERSION"" 1>&6
+ if test 4 -gt $TK_MAJOR_VERSION ; then
+ { echo "configure: error: "tk 4.1 or later needed"" 1>&2; exit 1; }
+@@ -1520,12 +1617,12 @@
+
+ tk_both=1
+ echo $ac_n "checking for connect""... $ac_c" 1>&6
+-echo "configure:1524: checking for connect" >&5
++echo "configure:1621: 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 <<EOF
+-#line 1529 "configure"
++#line 1626 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char connect(); below. */
+@@ -1548,7 +1645,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_connect=yes"
+ else
+@@ -1568,12 +1665,12 @@
+ fi
+
+ echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+-echo "configure:1572: checking for gethostbyname" >&5
++echo "configure:1669: 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 <<EOF
+-#line 1577 "configure"
++#line 1674 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char gethostbyname(); below. */
+@@ -1596,7 +1693,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_gethostbyname=yes"
+ else
+@@ -1618,7 +1715,7 @@
+ tk_oldLibs=$LIBS
+ LIBS="$LIBS -lsocket"
+ echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
+-echo "configure:1622: checking for main in -lnsl" >&5
++echo "configure:1719: checking for main in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'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
+@@ -1626,14 +1723,14 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lnsl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1630 "configure"
++#line 1727 "configure"
+ #include "confdefs.h"
+
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1734: \"$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"
+ else
+@@ -1667,7 +1764,7 @@
+ LIBS="$LIBS -lsocket -lnsl"
+ else
+ echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+-echo "configure:1671: checking for connect in -lsocket" >&5
++echo "configure:1768: 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
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1675,7 +1772,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lsocket $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1679 "configure"
++#line 1776 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -1686,7 +1783,7 @@
+ connect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1787: \"$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"
+ else
+@@ -1707,7 +1804,7 @@
+ fi
+
+ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:1711: checking for gethostbyname in -lnsl" >&5
++echo "configure:1808: 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
+@@ -1715,7 +1812,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lnsl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1719 "configure"
++#line 1816 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -1726,7 +1823,7 @@
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1827: \"$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"
+ else
+@@ -1749,7 +1846,7 @@
+ fi
+
+ echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
+-echo "configure:1753: checking for main in -lieee" >&5
++echo "configure:1850: checking for main in -lieee" >&5
+ ac_lib_var=`echo ieee'_'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
+@@ -1757,14 +1854,14 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lieee $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1761 "configure"
++#line 1858 "configure"
+ #include "confdefs.h"
+
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1865: \"$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"
+ else
+@@ -1785,7 +1882,7 @@
+ fi
+
+ echo $ac_n "checking for main in -lrpc""... $ac_c" 1>&6
+-echo "configure:1789: checking for main in -lrpc" >&5
++echo "configure:1886: checking for main in -lrpc" >&5
+ ac_lib_var=`echo rpc'_'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
+@@ -1793,14 +1890,14 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lrpc $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1797 "configure"
++#line 1894 "configure"
+ #include "confdefs.h"
+
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1901: \"$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"
+ else
+@@ -1821,7 +1918,7 @@
+ fi
+
+ echo $ac_n "checking for main in -lrpcsvc""... $ac_c" 1>&6
+-echo "configure:1825: checking for main in -lrpcsvc" >&5
++echo "configure:1922: checking for main in -lrpcsvc" >&5
+ ac_lib_var=`echo rpcsvc'_'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
+@@ -1829,14 +1926,14 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lrpcsvc $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1833 "configure"
++#line 1930 "configure"
+ #include "confdefs.h"
+
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1937: \"$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"
+ else
+@@ -1857,12 +1954,12 @@
+ fi
+
+ echo $ac_n "checking for res_mkquery""... $ac_c" 1>&6
+-echo "configure:1861: checking for res_mkquery" >&5
++echo "configure:1958: checking for res_mkquery" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_res_mkquery'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1866 "configure"
++#line 1963 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char res_mkquery(); below. */
+@@ -1885,7 +1982,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_res_mkquery=yes"
+ else
+@@ -1903,7 +2000,7 @@
+ else
+ echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for res_mkquery in -lresolv""... $ac_c" 1>&6
+-echo "configure:1907: checking for res_mkquery in -lresolv" >&5
++echo "configure:2004: checking for res_mkquery in -lresolv" >&5
+ ac_lib_var=`echo resolv'_'res_mkquery | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1911,7 +2008,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lresolv $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1915 "configure"
++#line 2012 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -1922,7 +2019,7 @@
+ res_mkquery()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2023: \"$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"
+ else
+@@ -1953,18 +2050,18 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1957: checking for $ac_hdr" >&5
++echo "configure:2054: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1962 "configure"
++#line 2059 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:2064: \"$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*
+ eval "ac_cv_header_$ac_safe=yes"
+@@ -1995,12 +2092,12 @@
+ #----------------------------------------------------------------------------
+
+ echo $ac_n "checking for gethostent""... $ac_c" 1>&6
+-echo "configure:1999: checking for gethostent" >&5
++echo "configure:2096: checking for gethostent" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gethostent'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2004 "configure"
++#line 2101 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char gethostent(); below. */
+@@ -2023,7 +2120,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_gethostent=yes"
+ else
+@@ -2046,12 +2143,12 @@
+ fi
+
+ echo $ac_n "checking for getnetent""... $ac_c" 1>&6
+-echo "configure:2050: checking for getnetent" >&5
++echo "configure:2147: checking for getnetent" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_getnetent'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2055 "configure"
++#line 2152 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char getnetent(); below. */
+@@ -2074,7 +2171,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_getnetent=yes"
+ else
+@@ -2097,12 +2194,12 @@
+ fi
+
+ echo $ac_n "checking for getprotoent""... $ac_c" 1>&6
+-echo "configure:2101: checking for getprotoent" >&5
++echo "configure:2198: checking for getprotoent" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_getprotoent'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2106 "configure"
++#line 2203 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char getprotoent(); below. */
+@@ -2125,7 +2222,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_getprotoent=yes"
+ else
+@@ -2148,12 +2245,12 @@
+ fi
+
+ echo $ac_n "checking for getservent""... $ac_c" 1>&6
+-echo "configure:2152: checking for getservent" >&5
++echo "configure:2249: checking for getservent" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_getservent'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2157 "configure"
++#line 2254 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char getservent(); below. */
+@@ -2176,7 +2273,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_getservent=yes"
+ else
+@@ -2199,12 +2296,12 @@
+ fi
+
+ echo $ac_n "checking for getrpcent""... $ac_c" 1>&6
+-echo "configure:2203: checking for getrpcent" >&5
++echo "configure:2300: checking for getrpcent" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_getrpcent'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2208 "configure"
++#line 2305 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char getrpcent(); below. */
+@@ -2227,7 +2324,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_getrpcent=yes"
+ else
+@@ -2255,9 +2352,9 @@
+ #----------------------------------------------------------------------------
+
+ echo $ac_n "checking for struct rpcent""... $ac_c" 1>&6
+-echo "configure:2259: checking for struct rpcent" >&5
++echo "configure:2356: checking for struct rpcent" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 2261 "configure"
++#line 2358 "configure"
+ #include "confdefs.h"
+
+ #include <netdb.h>
+@@ -2292,9 +2389,9 @@
+
+ if test "$mcast_ok" != "no"; then
+ echo $ac_n "checking for multicast support""... $ac_c" 1>&6
+-echo "configure:2296: checking for multicast support" >&5
++echo "configure:2393: checking for multicast support" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 2298 "configure"
++#line 2395 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <netinet/in.h>
+@@ -2303,7 +2400,7 @@
+ int i=IP_MULTICAST_TTL, j=IP_ADD_MEMBERSHIP;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
+ #define HAVE_MULTICAST 1
+@@ -2324,7 +2421,7 @@
+
+ # getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX, -lgen on Unixware.
+ echo $ac_n "checking for getmntent in -lsun""... $ac_c" 1>&6
+-echo "configure:2328: checking for getmntent in -lsun" >&5
++echo "configure:2425: checking for getmntent in -lsun" >&5
+ ac_lib_var=`echo sun'_'getmntent | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2332,7 +2429,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lsun $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2336 "configure"
++#line 2433 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2343,7 +2440,7 @@
+ getmntent()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2444: \"$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"
+ else
+@@ -2362,7 +2459,7 @@
+ else
+ echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for getmntent in -lseq""... $ac_c" 1>&6
+-echo "configure:2366: checking for getmntent in -lseq" >&5
++echo "configure:2463: checking for getmntent in -lseq" >&5
+ ac_lib_var=`echo seq'_'getmntent | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2370,7 +2467,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lseq $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2374 "configure"
++#line 2471 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2381,7 +2478,7 @@
+ getmntent()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2482: \"$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"
+ else
+@@ -2400,7 +2497,7 @@
+ else
+ echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for getmntent in -lgen""... $ac_c" 1>&6
+-echo "configure:2404: checking for getmntent in -lgen" >&5
++echo "configure:2501: checking for getmntent in -lgen" >&5
+ ac_lib_var=`echo gen'_'getmntent | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2408,7 +2505,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lgen $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2412 "configure"
++#line 2509 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2419,7 +2516,7 @@
+ getmntent()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2520: \"$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"
+ else
+@@ -2444,12 +2541,12 @@
+ fi
+
+ echo $ac_n "checking for getmntent""... $ac_c" 1>&6
+-echo "configure:2448: checking for getmntent" >&5
++echo "configure:2545: checking for getmntent" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_getmntent'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2453 "configure"
++#line 2550 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char getmntent(); below. */
+@@ -2472,7 +2569,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_getmntent=yes"
+ else
+@@ -2547,7 +2644,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
+ # turns \\\\ into \\, and sed turns \\ into \).
+@@ -2614,7 +2711,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)
+ echo "\$ac_cs_usage"; exit 0 ;;
+@@ -2625,7 +2722,7 @@
+ ac_given_srcdir=$srcdir
+ ac_given_INSTALL="$INSTALL"
+
+-trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
++trap 'rm -fr `echo "Makefile scotty-wrap.c tkined-wrap.c config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+ EOF
+ cat >> $CONFIG_STATUS <<EOF
+
+@@ -2634,9 +2731,11 @@
+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+ $ac_vpsub
+ $extrasub
++s%@SHELL@%$SHELL%g
+ s%@CFLAGS@%$CFLAGS%g
+ s%@CPPFLAGS@%$CPPFLAGS%g
+ s%@CXXFLAGS@%$CXXFLAGS%g
++s%@FFLAGS@%$FFLAGS%g
+ s%@DEFS@%$DEFS%g
+ s%@LDFLAGS@%$LDFLAGS%g
+ s%@LIBS@%$LIBS%g
+@@ -2661,6 +2760,7 @@
+ s%@LEXLIB@%$LEXLIB%g
+ s%@YACC@%$YACC%g
+ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
++s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+ s%@INSTALL_DATA@%$INSTALL_DATA%g
+ s%@SCOTTY@%$SCOTTY%g
+ s%@TCLSH@%$TCLSH%g
+@@ -2737,7 +2837,7 @@
+
+ cat >> $CONFIG_STATUS <<EOF
+
+-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
++CONFIG_FILES=\${CONFIG_FILES-"Makefile scotty-wrap.c tkined-wrap.c"}
+ EOF
+ cat >> $CONFIG_STATUS <<\EOF
+ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/net/scotty/patches/patch-ag b/net/scotty/patches/patch-ag
index 5715c58a489..275875d247e 100644
--- a/net/scotty/patches/patch-ag
+++ b/net/scotty/patches/patch-ag
@@ -1,8 +1,17 @@
-$NetBSD: patch-ag,v 1.1 1998/09/18 17:45:09 agc Exp $
+$NetBSD: patch-ag,v 1.2 2000/07/05 12:34:00 he Exp $
---- scotty.sh.in.orig Fri Sep 13 09:30:41 1996
-+++ scotty.sh.in Fri Sep 13 09:26:21 1996
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+export TCLLIBPATH="@PREFIX@/lib/tnm2.1.8"
-+exec @PREFIX@/bin/scotty2.1.8
+--- ../unix/scotty-wrap.c.in.orig Wed Jul 5 13:15:39 2000
++++ ../unix/scotty-wrap.c.in Wed Jul 5 13:04:09 2000
+@@ -0,0 +1,12 @@
++#include <unistd.h>
++#include <stdlib.h>
++
++int
++main(argc, argv)
++ int argc;
++ char **argv;
++{
++ setenv("TCLLIBPATH", "@prefix@/lib/tnm@TNM_VERSION@", 1);
++ execv("@prefix@/bin/scotty@TNM_VERSION@", argv);
++ exit(1);
++}
diff --git a/net/scotty/patches/patch-ah b/net/scotty/patches/patch-ah
index 9042ffd9ed9..0d6067bac03 100644
--- a/net/scotty/patches/patch-ah
+++ b/net/scotty/patches/patch-ah
@@ -1,8 +1,17 @@
-$NetBSD: patch-ah,v 1.1 1998/09/18 17:45:09 agc Exp $
+$NetBSD: patch-ah,v 1.2 2000/07/05 12:34:00 he Exp $
---- tkined.sh.in.orig Fri Sep 13 09:30:41 1996
-+++ tkined.sh.in Fri Sep 13 09:26:21 1996
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+export TCLLIBPATH="@PREFIX@/lib/tkined1.4.8 @PREFIX@/lib/tnm2.1.8"
-+exec @PREFIX@/bin/tkined1.4.8 $*
+--- ../unix/tkined-wrap.c.in.dist Wed Jul 5 13:23:37 2000
++++ ../unix/tkined-wrap.c.in Wed Jul 5 13:18:29 2000
+@@ -0,0 +1,12 @@
++#include <unistd.h>
++#include <stdlib.h>
++
++int
++main(argc, argv)
++ int argc;
++ char **argv;
++{
++ setenv("TCLLIBPATH", "@prefix@/lib/tkined@TKI_VERSION@ @prefix@/lib/tnm@TNM_VERSION@", 1);
++ execv("@prefix@/bin/tkined@TKI_VERSION@", argv);
++ exit(1);
++}
diff --git a/net/scotty/patches/patch-aj b/net/scotty/patches/patch-aj
new file mode 100644
index 00000000000..25b5e57b787
--- /dev/null
+++ b/net/scotty/patches/patch-aj
@@ -0,0 +1,28 @@
+$NetBSD: patch-aj,v 1.1 2000/07/05 12:34:00 he Exp $
+
+--- ../unix/configure.in.dist Tue Dec 23 10:08:39 1997
++++ ../unix/configure.in Wed Jul 5 13:59:04 2000
+@@ -151,7 +151,7 @@
+ DL_LIBS=$TCL_DL_LIBS
+ LD_FLAGS=$TCL_LD_FLAGS
+ LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS
+-TCL_INCLUDES=-I$TCL_PREFIX/include
++TCL_INCLUDES=-I$TCL_PREFIX/include/tcl$TCL_VERSION
+
+ if test -z "$SHLIB_LD" ; then
+ AC_MSG_ERROR([no shared linker definition (TCL_SHLIB_LD) in tclConfig.sh])
+@@ -200,7 +200,7 @@
+ fi
+
+ . $tnm_cv_path_tk_config/tkConfig.sh
+-TK_INCLUDES=-I$TK_PREFIX/include
++TK_INCLUDES=-I$TK_PREFIX/include/tk$TK_VERSION
+ if test "$TK_INCLUDES" = "$TCL_INCLUDES" ; then
+ TK_INCLUDES=""
+ fi
+@@ -330,4 +330,4 @@
+ AC_SUBST(TK_XINCLUDES)
+ AC_SUBST(TK_XLIBSW)
+
+-AC_OUTPUT(Makefile)
++AC_OUTPUT(Makefile scotty-wrap.c tkined-wrap.c)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 05:37:40 +0000