Index: harvest/ChangeLog
diff -c harvest/ChangeLog:2.21 harvest/ChangeLog:2.28
*** harvest/ChangeLog:2.21	Thu Jul 10 14:49:27 1997
--- harvest/ChangeLog	Mon Sep 22 12:05:05 1997
***************
*** 1,4 ****
--- 1,35 ----
  Changes in current version
+ 	- Added noregex option to nph-search and to the broker Glimpse
+ 	  interface to allow the disabling of regular expressions in 
+ 	  search patterns (Simon Wilkinson)
+ 	- All Harvest binaries should now honour setting of prefix as being
+ 	  the install location, *when run normally*. Many still rely upon
+ 	  HARVEST_HOME to point them to the correct location, but this is
+ 	  provided by the support scripts which run them (Simon Wilkinson)
+ 	- Added support for setting defaults in the query configuration file,
+ 	  so defaults values can be given for all parameters that are usually
+ 	  passed into the CGI from the Web search form (Simon Wilkinson)
+ 	- Added support for sorting query results by rank to nph-search
+ 	  (Wesley Alan Wright)
+  	- Rewrote most of the Makefiles and altered the configure scripts so
+ 	  that the build process is more rational, and so that the targets
+ 	  are now "standardised". In addition a number of problems with the
+ 	  makefiles have been fixed, and all of the configure routines use
+ 	  one central cache file - speeding up the build process 
+ 	  (Simon Wilkinson)
+ 	- Corrected order of adding files to PATH so that Harvest binaries are
+ 	  now always used in preference to system ones (Vincent Winczewski)
+ 	- Replaced BrokerAdmin.cgi with a perl script which accepts POST
+ 	  requests. This fixes the potential problem of passwords being sent
+ 	  in GET requests which were visibile in servers log files 
+ 	  (Simon Wilkinson)
+ 	- Fixed bug in robots.txt code which caused segmentation faults when
+ 	  reading incorrect files with empty User-Agent lines (Simon Wilkinson)
+ 	- Updated nph-search so that it only sends nph- headers if invoked as
+ 	  an nph script, and so that it will automatically decode HTML
+ 	  entities. Removed BrokerQuery.pl (now symlink to nph-search)
+ 	  (Craig Counterman)
+ 	- Added a new perl HTML summariser (Andy Powell)
          - Replaced all of the HSR tools with new, fixed versions supplied by
  	  Mic Bowman
  	- Added changes to SGML.sum to make it compatible with nsgmls, part
Index: harvest/Makefile
diff -c harvest/Makefile:2.4 harvest/Makefile:2.7
*** harvest/Makefile:2.4	Sun Mar 23 17:21:23 1997
--- harvest/Makefile	Mon Sep 22 08:47:23 1997
***************
*** 1,29 ****
  #
  #  Top-level Makefile for the Harvest distribution.
  #
! #  Makefile,v 2.4 1997/03/23 22:21:23 sxw Exp
  #
  #  Valid targets: 	
  #	make all		Builds the Harvest distribution.
  #  	make install		Installs the Harvest distribution.
  #  	make clean 		Cleans up the distribution.
! #  	make realclean		Completely cleans up the distribution.
  #  	make reconfigure 	Forces a complete reconfiguration.
- #  ----------------------------------------------------------------------
- #  You can change the default installation by changing the prefix line.
- #  By default, the software will install into /usr/local/harvest/.  For 
- #  example, to install Harvest into a home directory, change prefix to:
  #
! #	prefix = /home/joe/harvest
! #  
! prefix = /usr/local/harvest
  
  SUBDIRS	= src components
  
! all install clean realclean reconfigure:
! 	@for dir in $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) prefix="$(prefix)" $@); \
  	done
- 	@echo Done $@ing the Harvest system
   
--- 1,67 ----
  #
  #  Top-level Makefile for the Harvest distribution.
  #
! #  Makefile,v 2.7 1997/09/22 12:47:23 sxw Exp
  #
  #  Valid targets: 	
  #	make all		Builds the Harvest distribution.
  #  	make install		Installs the Harvest distribution.
  #  	make clean 		Cleans up the distribution.
! #  	make distclean		Completely cleans up the distribution.
  #  	make reconfigure 	Forces a complete reconfiguration.
  #
! # -------------------------------------------------------------------------
! #
! # make reconfigure has been removed - to duplicate its functionality use
! # make distclean && ./configure
! #
! # To stop Harvest from installing in /usr/local/harvest use the --prefix
! # option to configure ie
! # ./configure --prefix=/home/joe/harvest
! #
  
  SUBDIRS	= src components
  
! # These are the available targets (based on the recommended targets for
! # GNU packages)
! 
! # These are the most commonly used targets
! all: this-all do-all 
! clean: do-clean
! distclean: do-distclean this-distclean
! install: do-install
! 
! # Backwards compatibility stuff - these commands were used in the old (pre 1.5)
! # Harvest Makefiles - now depreciated in favour of the GNU compatible ones.
! 
! reconfigure: 
! 	@echo "make reconfigure is not longer supported"
! 	@echo "Use make distclean followed by ./configure instead"
! 	@exit 1;
! realclean: distclean
! 
! # Local targets
! 
! this-distclean:
! 	rm -f config.status config.cache config.log
! 
! # make all will also configure the package if it hasn't been done already
! 
! this-all: config.status
! 
! config.status: configure
! 	@echo Configuration information is not up to date, running configure
! 	./configure
! 
! # The magical recursive rule ...
! 
! DO_X = do-clean do-distclean do-all do-install
! 
! $(DO_X):
! 	@target=`echo $@ | sed -e 's/^do-//'`; \
! 	for dir in $(SUBDIRS); do \
! 		echo Making $$target in $$dir; \
! 		if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
! 		then true; else exit 1; fi; \
  	done
   
Index: harvest/README
diff -c harvest/README:2.1 harvest/README:2.2
*** harvest/README:2.1	Thu Apr 17 13:29:15 1997
--- harvest/README	Thu Sep 18 14:30:14 1997
***************
*** 24,35 ****
  COPYRIGHT
  ---------
  
! This code is based on code developed by the Harvest Project, as such it is
! covered by the copyright restrictions detailed in the file COPYRIGHT in this
! directory and by the copyright notices in each file in the distribution.
  
- However, this is an unofficial distribution, it has no official connection 
- with either the original Harvest project, or funding sources.
  
  
  
--- 24,36 ----
  COPYRIGHT
  ---------
  
! This code is based on code developed by the Harvest Project, and is 
! distributed under the GPL. Programs in the components/ section of the
! tree are seperate packages, and may be under their own copyrights.
! 
! In particular glimpse is distributed under a license prohibiting commercial
! redistribution.
  
  
  
  
Index: harvest/components/Makefile
diff -c harvest/components/Makefile:2.0 harvest/components/Makefile:2.1
*** harvest/components/Makefile:2.0	Sun Mar 16 16:55:57 1997
--- harvest/components/Makefile	Thu Sep 11 12:14:02 1997
***************
*** 1,17 ****
  #
  #  Makefile for the top-level Harvest components directory
  #
! #  Makefile,v 1.6 1995/08/31 20:49:02 duane Exp
! #
! prefix = /usr/local/harvest
  
! all install clean realclean:
! 	@for dir in broker gatherer cache replicator admin; do \
! 		if test -d "$$dir"; then \
! 			echo Making $@ for components in $$dir; \
! 			(cd $$dir;  \
! 				$(MAKE) $(MFLAGS) prefix="$(prefix)" $@; \
! 			); \
! 		fi; \
  	done
- 	@echo "Finished building Harvest components."
--- 1,24 ----
  #
  #  Makefile for the top-level Harvest components directory
  #
! # Makefile,v 2.1 1997/09/11 16:14:02 sxw Exp
  
! SUBDIRS=broker gatherer admin
! 
! all: do-all
! install: do-install
! clean: do-clean
! distclean: do-distclean this-distclean
! 
! this-distclean:
! 	-rm -f config.log config.status config.cache
! 
! DO_X = do-clean do-distclean do-all do-install
!  
! $(DO_X):
! 	@target=`echo $@ | sed -e 's/^do-//'`; \
! 	for dir in $(SUBDIRS); do \
! 	echo Making $$target in $$dir; \
! 	if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
! 	then true; else exit 1; fi; \
  	done
Index: harvest/components/admin/Makefile
diff -c harvest/components/admin/Makefile:2.1 harvest/components/admin/Makefile:2.2
*** harvest/components/admin/Makefile:2.1	Fri Mar 21 12:18:35 1997
--- harvest/components/admin/Makefile	Thu Sep 11 12:14:05 1997
***************
*** 1,34 ****
  #
  #  Makefile for the Admin components
  #
! #  Makefile,v 2.1 1997/03/21 17:18:35 sxw Exp
  #
  #
- prefix = /usr/local/harvest
  
! all install:
! 	@for dir in `/bin/cat BUILD`; do \
! 		if test -d "$$dir"; then \
! 			echo Making $@ in $$dir; \
! 			(cd $$dir;  \
! 				if test -x "./configure"; then \
! 					if test ! -x "./config.status"; then \
! 						echo "Configuring $$dir..."; \
! 						./configure --prefix="$(prefix)" --srcdir="`pwd`"; \
! 					fi; \
! 					echo "$$dir is configured."; \
! 				fi; \
! 				$(MAKE) $(MFLAGS) prefix="$(prefix)" $@; \
! 			); \
! 		fi; \
! 	done
  
! clean realclean:
! 	@for dir in `/bin/cat BUILD`; do \
! 		if test -d "$$dir"; then \
! 			echo Making $@ in $$dir; \
! 			(cd $$dir;  \
! 				$(MAKE) $(MFLAGS) prefix="$(prefix)" $@; \
! 			); \
! 		fi; \
  	done
--- 1,26 ----
  #
  #  Makefile for the Admin components
  #
! #  Makefile,v 2.2 1997/09/11 16:14:05 sxw Exp
  #
  #
  
! SUBDIRS="`cat BUILD`"
  
! all: do-all
! install: do-install
! clean: do-clean
! distclean: do-distclean this-distclean
! 
! this-distclean:
! 	-rm -f config.status config.cache config.log
! 
! DO_X = do-clean do-distclean do-all do-install
!  
! $(DO_X):
! 	@target=`echo $@ | sed -e 's/^do-//'`; \
! 	for dir in $(SUBDIRS); do \
! 	echo Making $$target in $$dir; \
! 	if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
! 	then true; else exit 1; fi; \
  	done
Index: harvest/components/admin/standard/Makefile
diff -c harvest/components/admin/standard/Makefile:2.1 harvest/components/admin/standard/Makefile:2.2
*** harvest/components/admin/standard/Makefile:2.1	Fri Mar 21 12:18:49 1997
--- harvest/components/admin/standard/Makefile	Thu Sep 11 12:14:07 1997
***************
*** 1,22 ****
! # Makefile,v 2.1 1997/03/21 17:18:49 sxw Exp
  
! all install clean:
! 	@for dir in simple-scripts; do \
! 		if test -d "$$dir"; then \
! 			echo Making $@ in $$dir; \
! 			(cd $$dir;  \
! 				$(MAKE) $(MFLAGS) prefix="$(prefix)" $@; \
! 			); \
! 		fi; \
! 	done
  
! realclean:
! 	-rm -f config.status config.cache
! 	@for dir in simple-scripts; do \
! 		if test -d "$$dir"; then \
! 			echo Making $@ in $$dir; \
! 			(cd $$dir;  \
! 				$(MAKE) $(MFLAGS) prefix="$(prefix)" $@; \
! 			); \
! 		fi; \
  	done
--- 1,21 ----
! # Makefile,v 2.2 1997/09/11 16:14:07 sxw Exp
  
! SUBDIRS=simple-scripts
  
! all: do-all
! install: do-install
! clean: do-clean
! distclean: do-distclean this-distclean
!  
! this-distclean:
! 	-rm -f config.status config.cache config.log
!  
! DO_X = do-clean do-distclean do-all do-install
!  
! $(DO_X):
! 	@target=`echo $@ | sed -e 's/^do-//'`; \
! 	for dir in $(SUBDIRS); do \
! 	echo Making $$target in $$dir; \
! 	if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
! 	then true; else exit 1; fi; \
  	done
Index: harvest/components/admin/standard/simple-scripts/Makefile.in
diff -c harvest/components/admin/standard/simple-scripts/Makefile.in:2.1 harvest/components/admin/standard/simple-scripts/Makefile.in:2.3
*** harvest/components/admin/standard/simple-scripts/Makefile.in:2.1	Fri Mar 21 12:18:52 1997
--- harvest/components/admin/standard/simple-scripts/Makefile.in	Tue Sep 16 13:58:27 1997
***************
*** 1,4 ****
! # Makefile.in,v 2.1 1997/03/21 17:18:52 sxw Exp
  #
  
  prefix = @prefix@
--- 1,4 ----
! # Makefile.in,v 2.3 1997/09/16 17:58:27 sxw Exp
  #
  
  prefix = @prefix@
***************
*** 14,29 ****
  RANLIB		= @RANLIB@
  XTRA_LIBS	= @XTRA_LIBS@
  
! SCRIPTS		= harvest-check.pl RunBrokers.sh RunGatherers.sh
  
  all:
  
  clean:
  
! realclean:	clean
  	-rm -f Makefile
  
  install:	all
  	$(INSTALL_BIN) harvest-check.pl $(INSTALL_LIBDIR)
- 	$(INSTALL_BIN) RunBrokers.sh $(INSTALL_LIBDIR)/broker
- 	$(INSTALL_BIN) RunGatherers.sh $(INSTALL_LIBDIR)/gatherer
--- 14,27 ----
  RANLIB		= @RANLIB@
  XTRA_LIBS	= @XTRA_LIBS@
  
! SCRIPTS		= harvest-check.pl 
  
  all:
  
  clean:
  
! distclean:	clean
  	-rm -f Makefile
  
  install:	all
  	$(INSTALL_BIN) harvest-check.pl $(INSTALL_LIBDIR)
Index: harvest/components/broker/Makefile
diff -c harvest/components/broker/Makefile:2.1 harvest/components/broker/Makefile:2.2
*** harvest/components/broker/Makefile:2.1	Fri Mar 21 12:19:00 1997
--- harvest/components/broker/Makefile	Thu Sep 11 12:14:10 1997
***************
*** 1,34 ****
  #
  #  Makefile for the Broker components
  #
! #  Makefile,v 2.1 1997/03/21 17:19:00 sxw Exp
  #
  #
- prefix = /usr/local/harvest
  
! all install:
! 	@for dir in `/bin/cat BUILD`; do \
! 		if test -d "$$dir"; then \
! 			echo Making $@ in $$dir; \
! 			(cd $$dir;  \
! 				if test -x "./configure"; then \
! 					if test ! -x "./config.status"; then \
! 						echo "Configuring $$dir..."; \
! 						./configure --prefix="$(prefix)" --srcdir="`pwd`"; \
! 					fi; \
! 					echo "$$dir is configured."; \
! 				fi; \
! 				$(MAKE) $(MFLAGS) HARVEST_HOME="$(prefix)" $@; \
! 			); \
! 		fi; \
! 	done
  
! clean realclean:
! 	@for dir in `/bin/cat BUILD`; do \
! 		if test -d "$$dir"; then \
! 			echo Making $@ in $$dir; \
! 			(cd $$dir;  \
! 				$(MAKE) $(MFLAGS) HARVEST_HOME="$(prefix)" $@; \
! 			); \
! 		fi; \
  	done
--- 1,26 ----
  #
  #  Makefile for the Broker components
  #
! #  Makefile,v 2.2 1997/09/11 16:14:10 sxw Exp
  #
  #
  
! SUBDIRS="`cat BUILD`"
  
! all: do-all
! install: do-install
! clean: do-clean
! distclean: do-distclean this-distclean
! 
! this-distclean:
! 	-rm -f config.status config.cache config.log
! 
! DO_X = do-clean do-distclean do-all do-install
!  
! $(DO_X):
! 	@target=`echo $@ | sed -e 's/^do-//'`; \
! 	for dir in $(SUBDIRS); do \
! 	echo Making $$target in $$dir; \
! 	if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
! 	then true; else exit 1; fi; \
  	done
Index: harvest/components/broker/standard/Makefile
diff -c harvest/components/broker/standard/Makefile:2.1 harvest/components/broker/standard/Makefile:2.2
*** harvest/components/broker/standard/Makefile:2.1	Fri Mar 21 12:19:01 1997
--- harvest/components/broker/standard/Makefile	Thu Sep 11 12:14:13 1997
***************
*** 1,22 ****
! # Makefile,v 2.1 1997/03/21 17:19:01 sxw Exp
! #
! all install clean:
! 	@for dir in WWW glimpse; do \
! 		if test -d "$$dir"; then \
! 			echo Making $@ in $$dir; \
! 			(cd $$dir;  \
! 				$(MAKE) $(MFLAGS) prefix="$(prefix)" $@; \
! 			); \
! 		fi; \
! 	done
  
! realclean:
! 	-rm -f config.status config.cache
! 	@for dir in WWW glimpse; do \
! 		if test -d "$$dir"; then \
! 			echo Making $@ in $$dir; \
! 			(cd $$dir;  \
! 				$(MAKE) $(MFLAGS) prefix="$(prefix)" $@; \
! 			); \
! 		fi; \
  	done
--- 1,21 ----
! # Makefile,v 2.2 1997/09/11 16:14:13 sxw Exp
  
! SUBDIRS=WWW glimpse
! 
! all: do-all
! install: do-install
! clean: do-clean
! distclean: do-distclean this-distclean
!  
! this-distclean:
! 	-rm -f config.status config.cache config.log
!  
! DO_X = do-clean do-distclean do-all do-install
!  
! $(DO_X):
! 	@target=`echo $@ | sed -e 's/^do-//'`; \
! 	for dir in $(SUBDIRS); do \
! 	echo Making $$target in $$dir; \
! 	if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
! 	then true; else exit 1; fi; \
  	done
Index: harvest/components/broker/standard/configure
diff -c harvest/components/broker/standard/configure:2.3 harvest/components/broker/standard/configure:2.6
*** harvest/components/broker/standard/configure:2.3	Fri May 30 13:48:45 1997
--- harvest/components/broker/standard/configure	Thu Sep 18 14:01:13 1997
***************
*** 1049,1054 ****
--- 1049,1076 ----
  PERL="$CMD_PERL"
  
  
+ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+ echo "configure:1054: checking whether ln -s works" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   rm -f conftestdata
+ if ln -s X conftestdata 2>/dev/null
+ then
+   rm -f conftestdata
+   ac_cv_prog_LN_S="ln -s"
+ else
+   ac_cv_prog_LN_S=ln
+ fi
+ fi
+ LN_S="$ac_cv_prog_LN_S"
+ if test "$ac_cv_prog_LN_S" = "ln -s"; then
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 
  if test -x "/bin/uname"; then
          if /bin/uname -sr | grep 'SunOS 5.[0-4]' >/dev/null 2>&1; then
                  NO_LIBMALLOC=x
***************
*** 1058,1064 ****
  
  if test x$NO_LIBMALLOC = x ; then
  	echo $ac_n "checking for main in -lmalloc""... $ac_c" 1>&6
! echo "configure:1062: checking for main in -lmalloc" >&5
  ac_lib_var=`echo malloc'_'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
--- 1080,1086 ----
  
  if test x$NO_LIBMALLOC = x ; then
  	echo $ac_n "checking for main in -lmalloc""... $ac_c" 1>&6
! echo "configure:1084: checking for main in -lmalloc" >&5
  ac_lib_var=`echo malloc'_'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
***************
*** 1066,1079 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lmalloc  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1070 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:1077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1088,1101 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lmalloc  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1092 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:1099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1097,1103 ****
  
  
  echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6
! echo "configure:1101: checking for main in -lresolv" >&5
  ac_lib_var=`echo resolv'_'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
--- 1119,1125 ----
  
  
  echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6
! echo "configure:1123: checking for main in -lresolv" >&5
  ac_lib_var=`echo resolv'_'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
***************
*** 1105,1118 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1109 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:1116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1127,1140 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1131 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:1138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1133,1139 ****
  fi
  
  echo $ac_n "checking for setsockopt in -lsocket""... $ac_c" 1>&6
! echo "configure:1137: checking for setsockopt in -lsocket" >&5
  ac_lib_var=`echo socket'_'setsockopt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1155,1161 ----
  fi
  
  echo $ac_n "checking for setsockopt in -lsocket""... $ac_c" 1>&6
! echo "configure:1159: checking for setsockopt in -lsocket" >&5
  ac_lib_var=`echo socket'_'setsockopt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1141,1147 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1145 "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
--- 1163,1169 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1167 "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
***************
*** 1152,1158 ****
  setsockopt()
  ; return 0; }
  EOF
! if { (eval echo configure:1156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1174,1180 ----
  setsockopt()
  ; return 0; }
  EOF
! if { (eval echo configure:1178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1173,1179 ****
  fi
  
  echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
! echo "configure:1177: checking for gethostname in -lnsl" >&5
  ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1195,1201 ----
  fi
  
  echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
! echo "configure:1199: checking for gethostname in -lnsl" >&5
  ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1181,1187 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1185 "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
--- 1203,1209 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1207 "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
***************
*** 1192,1198 ****
  gethostname()
  ; return 0; }
  EOF
! if { (eval echo configure:1196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1214,1220 ----
  gethostname()
  ; return 0; }
  EOF
! if { (eval echo configure:1218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1214,1220 ****
  
  
  echo $ac_n "checking for inet_aton in -l44bsd""... $ac_c" 1>&6
! echo "configure:1218: checking for inet_aton in -l44bsd" >&5
  ac_lib_var=`echo 44bsd'_'inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1236,1242 ----
  
  
  echo $ac_n "checking for inet_aton in -l44bsd""... $ac_c" 1>&6
! echo "configure:1240: checking for inet_aton in -l44bsd" >&5
  ac_lib_var=`echo 44bsd'_'inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1222,1228 ****
    ac_save_LIBS="$LIBS"
  LIBS="-l44bsd  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1226 "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
--- 1244,1250 ----
    ac_save_LIBS="$LIBS"
  LIBS="-l44bsd  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1248 "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
***************
*** 1233,1239 ****
  inet_aton()
  ; return 0; }
  EOF
! if { (eval echo configure:1237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1255,1261 ----
  inet_aton()
  ; return 0; }
  EOF
! if { (eval echo configure:1259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1254,1260 ****
  fi
  
  echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
! echo "configure:1258: checking for inet_aton in -lresolv" >&5
  ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1276,1282 ----
  fi
  
  echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
! echo "configure:1280: checking for inet_aton in -lresolv" >&5
  ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1262,1268 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1266 "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
--- 1284,1290 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1288 "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
***************
*** 1273,1279 ****
  inet_aton()
  ; return 0; }
  EOF
! if { (eval echo configure:1277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1295,1301 ----
  inet_aton()
  ; return 0; }
  EOF
! if { (eval echo configure:1299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1423,1428 ****
--- 1445,1454 ----
  
  trap 'rm -fr `echo "\
  	WWW/Makefile \
+         WWW/BrokerAdmin.pl \
+ 	WWW/nph-search \
+ 	WWW/HarvestGather \
+ 	WWW/cgiparse.pl \
  	glimpse/Makefile \
  	glimpse/agrep/Makefile \
  	glimpse/index/Makefile \
***************
*** 1473,1478 ****
--- 1499,1505 ----
  s%@CMD_GUNZIP@%$CMD_GUNZIP%g
  s%@CMD_PERL@%$CMD_PERL%g
  s%@PERL@%$PERL%g
+ s%@LN_S@%$LN_S%g
  s%@XTRA_LIBS@%$XTRA_LIBS%g
  
  CEOF
***************
*** 1517,1522 ****
--- 1544,1553 ----
  
  CONFIG_FILES=\${CONFIG_FILES-"\
  	WWW/Makefile \
+         WWW/BrokerAdmin.pl \
+ 	WWW/nph-search \
+ 	WWW/HarvestGather \
+ 	WWW/cgiparse.pl \
  	glimpse/Makefile \
  	glimpse/agrep/Makefile \
  	glimpse/index/Makefile \
Index: harvest/components/broker/standard/configure.in
diff -c harvest/components/broker/standard/configure.in:2.4 harvest/components/broker/standard/configure.in:2.7
*** harvest/components/broker/standard/configure.in:2.4	Fri May 30 13:48:46 1997
--- harvest/components/broker/standard/configure.in	Thu Sep 18 14:01:14 1997
***************
*** 1,7 ****
  dnl
  dnl  Configuration input file for standard Harvest broker components
  dnl
! dnl  configure.in,v 2.4 1997/05/30 17:48:46 sxw Exp
  dnl
  
  AC_PREREQ(2.12)
--- 1,7 ----
  dnl
  dnl  Configuration input file for standard Harvest broker components
  dnl
! dnl  configure.in,v 2.7 1997/09/18 18:01:14 sxw Exp
  dnl
  
  AC_PREREQ(2.12)
***************
*** 58,63 ****
--- 58,66 ----
  PERL="$CMD_PERL"
  AC_SUBST(PERL)
  
+ dnl find ln -s
+ AC_PROG_LN_S
+ 
  dnl Decide if we should really use -lmalloc.  It is known to have
  dnl problems on SunOS 5.4 at least.
  dnl
***************
*** 103,108 ****
--- 106,115 ----
  
  AC_OUTPUT(\
  	WWW/Makefile \
+         WWW/BrokerAdmin.pl \
+ 	WWW/nph-search \
+ 	WWW/HarvestGather \
+ 	WWW/cgiparse.pl \
  	glimpse/Makefile \
  	glimpse/agrep/Makefile \
  	glimpse/index/Makefile \
Index: harvest/components/broker/standard/WWW/BrokerQuery.cf
diff -c harvest/components/broker/standard/WWW/BrokerQuery.cf:2.1 harvest/components/broker/standard/WWW/BrokerQuery.cf:2.2
*** harvest/components/broker/standard/WWW/BrokerQuery.cf:2.1	Fri Mar 21 12:19:07 1997
--- harvest/components/broker/standard/WWW/BrokerQuery.cf	Fri Sep 19 11:19:47 1997
***************
*** 1,5 ****
  #
! # Definitions for 'BrokerQuery.pl' output.  
  #
  # A hash (#) in the first column denotes a comment and is not processed
  # even inside a definition.  Hashes not in the first column are left as-is.
--- 1,6 ----
+ # BrokerQuery.cf,v 2.2 1997/09/19 15:19:47 sxw Exp
  #
! # Definitions for 'BrokerQuery.pl' configuration.  
  #
  # A hash (#) in the first column denotes a comment and is not processed
  # even inside a definition.  Hashes not in the first column are left as-is.
***************
*** 18,25 ****
  # becomes "abcxyz".  You may have blank lines in between the beginning 
  # and ending tags, or use the newline character \n.
  #
! # BrokerQuery.cf,v 2.1 1997/03/21 17:19:07 sxw Exp
  #
  
  # 'GLOBAL' VARIABLES: are defined globally within the BrokerQuery.pl program,
  #                     but not necessarily set at all times.
--- 19,59 ----
  # becomes "abcxyz".  You may have blank lines in between the beginning 
  # and ending tags, or use the newline character \n.
  #
! 
  #
+ # CGI defaults. 
+ #
+ # In this section you can give default values for any attribute that would
+ # normally be passed in from the CGI query form. The following attributes
+ # are currently available :
+ #
+ # brokerqueryconfig : Name of a broker specific configuration file
+ # lifetime          : Maximum lifetime of a query (see also <Lifetime> section)
+ # caseflag	    : Whether the query is casesensitive ["on" or "off"]
+ # wordflag	    : Match on word boundaries ["on" or "off"]
+ # opaqflag	    : Show matched lines ["on" or "off"]
+ # descflag	    : Return object description ["on" or "off"]
+ # noregexflag	    : Don't do regular expressions ["on" or "off"]
+ # maxresultflag	    : Maximum number of results to return
+ # maxobjflag	    : Maximum number of objects to return
+ # maxlineflag       : Maximum number of matched lines
+ # errors	    : Number of spelling errors
+ # broker	    : Name of broker
+ # host		    : Name of broker host
+ # attributes	    : Space sperated list of attributes to return
+ # sort		    : Sort options ["by-NML" or "by-rank"]
+ 
+ # These defaults mimic the values on the provided query.html form
+ <Default>
+ caseflag : on
+ wordflag : on
+ errorflag : 0
+ opaqueflag : on
+ descflag : on
+ maxobjflag : 50
+ maxlineflag : 10
+ maxresultflag : 100
+ </Default>
  
  # 'GLOBAL' VARIABLES: are defined globally within the BrokerQuery.pl program,
  #                     but not necessarily set at all times.
Index: harvest/components/broker/standard/WWW/DisplayObject.c
diff -c harvest/components/broker/standard/WWW/DisplayObject.c:2.2 harvest/components/broker/standard/WWW/DisplayObject.c:2.3
*** harvest/components/broker/standard/WWW/DisplayObject.c:2.2	Tue Jun 10 15:37:22 1997
--- harvest/components/broker/standard/WWW/DisplayObject.c	Tue Aug 26 11:04:47 1997
***************
*** 1,4 ****
! static char rcsid[] = "DisplayObject.c,v 2.2 1997/06/10 19:37:22 sxw Exp";
  /*
   *  DisplayObject.c - httpd-based CGI program that HTML-ifies a
   *  SOIF Object for clients.
--- 1,4 ----
! static char rcsid[] = "DisplayObject.c,v 2.3 1997/08/26 15:04:47 sxw Exp";
  /*
   *  DisplayObject.c - httpd-based CGI program that HTML-ifies a
   *  SOIF Object for clients.
***************
*** 369,375 ****
  		fprintf(ofp, "}\n");
  		fprintf(ofp, "</PRE>\n");
  		fprintf(ofp, "<HR>\n");
! 		fprintf(ofp, "<ADDRESS>This content summary was generated by the <a href=\"http://harvest.cs.colorado.edu/\">Harvest</a> system.</ADDRESS>\n");
  		fprintf(ofp, "</BODY>\n");
  		fprintf(ofp, "</HTML>\n");
  	}
--- 369,375 ----
  		fprintf(ofp, "}\n");
  		fprintf(ofp, "</PRE>\n");
  		fprintf(ofp, "<HR>\n");
! 		fprintf(ofp, "<ADDRESS>This content summary was generated by the <a href=\"http://www.tardis.ed.ac.uk/harvest/\">Harvest</a> system.</ADDRESS>\n");
  		fprintf(ofp, "</BODY>\n");
  		fprintf(ofp, "</HTML>\n");
  	}
Index: harvest/components/broker/standard/WWW/Makefile.in
diff -c harvest/components/broker/standard/WWW/Makefile.in:2.3 harvest/components/broker/standard/WWW/Makefile.in:2.11
*** harvest/components/broker/standard/WWW/Makefile.in:2.3	Wed Apr 23 14:28:39 1997
--- harvest/components/broker/standard/WWW/Makefile.in	Thu Sep 18 14:03:44 1997
***************
*** 1,9 ****
  #
! #  Makefile for the Harvest Broker support software
  #
! #  William G. Camargo & Darren Hardy, July 1994
! #
! #  Makefile.in,v 1.30 1995/11/17 01:06:24 duane Exp
  #
  
  prefix = @prefix@
--- 1,7 ----
  #
! # Broker CGIs
  #
! # Makefile.in,v 2.11 1997/09/18 18:03:44 sxw Exp
  #
  
  prefix = @prefix@
***************
*** 13,18 ****
--- 11,17 ----
  INSTALL_MANDIR 	= $(prefix)/man
  INSTALL_CGI	= $(prefix)/cgi-bin
  
+ LN_S		= @LN_S@
  CC		= @CC@
  INSTALL		= @INSTALL@
  INSTALL_BIN 	= @INSTALL_PROGRAM@
***************
*** 29,35 ****
  LIBS		= $(XTRA_LIBS)
  UTIL		= util.o
  
! CGI_PROGS	= BrokerAdmin BrokerQuery.pl DisplayObject HarvestGather nph-search
  PROGS		= $(CGI_PROGS)
  
  all:	util.o $(PROGS) BrokerRestart
--- 28,34 ----
  LIBS		= $(XTRA_LIBS)
  UTIL		= util.o
  
! CGI_PROGS	= BrokerAdmin.pl DisplayObject HarvestGather nph-search
  PROGS		= $(CGI_PROGS)
  
  all:	util.o $(PROGS) BrokerRestart
***************
*** 40,63 ****
  DisplayObject.o:	DisplayObject.c
  	$(CC) $(CFLAGS) $(DISPLAY_FLAGS) -c DisplayObject.c
  
- BrokerAdmin:	BrokerAdmin.o $(UTIL)
- 	$(CC) -o $@ $@.o $(UTIL) $(LDFLAGS) $(LIBS) -lutil
- 
  BrokerRestart:	BrokerRestart.o
  	$(CC) -o $@ $@.o $(LDFLAGS) $(LIBS)
  
- RegisterHSR:	RegisterHSR.o $(UTIL)
- 	$(CC) -o $@ $@.o $(UTIL) $(LDFLAGS) $(LIBS) -ltemplate -lutil
- 
- RegisterURL:	RegisterURL.o $(UTIL)
- 	$(CC) -o $@ $@.o $(UTIL) $(LDFLAGS) $(LIBS)
  
  clean:	
! 	-rm -f core *.o BrokerAdmin DisplayObject BrokerRestart RegisterHSR \
! 	                RegisterURL
  
! realclean:	clean
! 	-rm -f Makefile
  
  install:	all
  	@for f in BrokerRestart ; do \
--- 39,53 ----
  DisplayObject.o:	DisplayObject.c
  	$(CC) $(CFLAGS) $(DISPLAY_FLAGS) -c DisplayObject.c
  
  BrokerRestart:	BrokerRestart.o
  	$(CC) -o $@ $@.o $(LDFLAGS) $(LIBS)
  
  
  clean:	
! 	-rm -f core *.o DisplayObject BrokerRestart
  
! distclean:	clean
! 	-rm -f Makefile BrokerAdmin.pl HarvestGather nph-search cgiparse.pl
  
  install:	all
  	@for f in BrokerRestart ; do \
***************
*** 68,73 ****
--- 58,65 ----
  		echo $(INSTALL_BIN) $$f $(INSTALL_CGI)/$$f.cgi; \
  		$(INSTALL_BIN) $$f $(INSTALL_CGI)/$$f.cgi; \
  	done
+ 	rm -f $(INSTALL_CGI)/BrokerQuery.pl.cgi;
+ 	(cd $(INSTALL_CGI) && $(LN_S) nph-search.cgi BrokerQuery.pl.cgi);
  	$(INSTALL_BIN) HarvestGather $(INSTALL_CGI)/nph-HarvestGather.cgi;
  	@for f in cgiparse.pl; do \
  		echo $(INSTALL_BIN) $$f $(INSTALL_CGI)/$$f; \
Index: harvest/components/broker/standard/glimpse/Makefile.in
diff -c harvest/components/broker/standard/glimpse/Makefile.in:2.3 harvest/components/broker/standard/glimpse/Makefile.in:2.5
*** harvest/components/broker/standard/glimpse/Makefile.in:2.3	Mon Jun 30 15:09:39 1997
--- harvest/components/broker/standard/glimpse/Makefile.in	Thu Sep 11 12:14:15 1997
***************
*** 76,90 ****
  
  all:		$(PROGINDEX) $(PROG) $(PROGAGREP) $(PROGSERVER)
  
! install:	all
  		$(INSTALL_PROGRAM) $(PROGINDEX) $(bindir)/$(binprefix)glimpseindex
  		$(INSTALL_PROGRAM) $(PROGAGREP) $(bindir)/$(binprefix)agrep
  		$(INSTALL_PROGRAM) $(PROGSERVER) $(bindir)/$(binprefix)glimpseserver
  		$(INSTALL_PROGRAM) $(PROG) $(bindir)/$(binprefix)glimpse
- # 		$(INSTALL_DATA) $(srcdir)/glimpse.1 $(mandir)/$(manprefix)glimpse.$(manext)
- # 		$(INSTALL_DATA) $(srcdir)/glimpseindex.1 $(mandir)/$(manprefix)glimpseindex.$(manext)
- # 		$(INSTALL_DATA) $(srcdir)/glimpseserver.1 $(mandir)/$(manprefix)glimpseserver.$(manext)
- # 		$(INSTALL_DATA) $(srcdir)/agrep/agrep.1 $(mandir)/$(manprefix)agrep.$(manext)
  
  installdirs:	mkinstalldirs
  		$(srcdir)/mkinstalldirs $(bindir) $(mandir)
--- 76,86 ----
  
  all:		$(PROGINDEX) $(PROG) $(PROGAGREP) $(PROGSERVER)
  
! install:	all 
  		$(INSTALL_PROGRAM) $(PROGINDEX) $(bindir)/$(binprefix)glimpseindex
  		$(INSTALL_PROGRAM) $(PROGAGREP) $(bindir)/$(binprefix)agrep
  		$(INSTALL_PROGRAM) $(PROGSERVER) $(bindir)/$(binprefix)glimpseserver
  		$(INSTALL_PROGRAM) $(PROG) $(bindir)/$(binprefix)glimpse
  
  installdirs:	mkinstalldirs
  		$(srcdir)/mkinstalldirs $(bindir) $(mandir)
***************
*** 121,128 ****
  
  distclean: clean
  	-rm -f Makefile config.cache config.status
  
- realclean: distclean
  main_server.o: $(srcdir)/main.c $(srcdir)/defs.h $(AGREPSRC)/agrep.h $(AGREPSRC)/checkfile.h $(INDEXSRC)/glimpse.h
  	cp $(srcdir)/main.c main_server.c
  	$(CC) -c $(ALL_CFLAGS) -DISSERVER=1 -o $@ main_server.c
--- 117,126 ----
  
  distclean: clean
  	-rm -f Makefile config.cache config.status
+ 	cd $(AGREPDIR); $(MAKE) distclean
+ 	cd $(INDEXDIR); $(MAKE) distclean
+ 	cd $(COMPRESSDIR); $(MAKE) distclean
  
  main_server.o: $(srcdir)/main.c $(srcdir)/defs.h $(AGREPSRC)/agrep.h $(AGREPSRC)/checkfile.h $(INDEXSRC)/glimpse.h
  	cp $(srcdir)/main.c main_server.c
  	$(CC) -c $(ALL_CFLAGS) -DISSERVER=1 -o $@ main_server.c
Index: harvest/components/gatherer/Makefile
diff -c harvest/components/gatherer/Makefile:2.0 harvest/components/gatherer/Makefile:2.1
*** harvest/components/gatherer/Makefile:2.0	Sun Mar 16 16:59:59 1997
--- harvest/components/gatherer/Makefile	Thu Sep 11 12:14:16 1997
***************
*** 1,34 ****
  #
  #  Makefile for the Gatherer components
  #
! #  Makefile,v 1.7 1995/11/28 20:57:16 duane Exp
  #
  #
- prefix = /usr/local/harvest
  
! all install:
! 	@for dir in `/bin/cat BUILD`; do \
! 		if test -d "$$dir"; then \
! 			echo Making $@ in $$dir; \
! 			(cd $$dir;  \
! 				if test -x "./configure"; then \
! 					if test ! -x "./config.status"; then \
! 						echo "Configuring $$dir..."; \
! 						./configure --prefix="$(prefix)" --srcdir="`pwd`"; \
! 					fi; \
! 					echo "$$dir is configured."; \
! 				fi; \
! 				$(MAKE) $(MFLAGS) prefix="$(prefix)" $@; \
! 			); \
! 		fi; \
! 	done
  
! clean realclean:
! 	@for dir in `/bin/cat BUILD`; do \
! 		if test -d "$$dir"; then \
! 			echo Making $@ in $$dir; \
! 			(cd $$dir;  \
! 				$(MAKE) $(MFLAGS) prefix="$(prefix)" $@; \
! 			); \
! 		fi; \
  	done
--- 1,26 ----
  #
  #  Makefile for the Gatherer components
  #
! #  Makefile,v 2.1 1997/09/11 16:14:16 sxw Exp
  #
  #
  
! SUBDIRS="`cat BUILD`"
  
! all: do-all
! install: do-install
! clean: do-clean
! distclean: do-distclean this-distclean
! 
! this-distclean:
! 	-rm -f config.status config.cache config.log
! 
! DO_X = do-clean do-distclean do-all do-install
!  
! $(DO_X):
! 	@target=`echo $@ | sed -e 's/^do-//'`; \
! 	for dir in $(SUBDIRS); do \
! 	echo Making $@ in $$dir; \
! 	if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
! 	then true; else exit 1; fi; \
  	done
Index: harvest/components/gatherer/Rainbow/Makefile.in
diff -c harvest/components/gatherer/Rainbow/Makefile.in:2.0 harvest/components/gatherer/Rainbow/Makefile.in:2.1
*** harvest/components/gatherer/Rainbow/Makefile.in:2.0	Sun Mar 16 17:00:04 1997
--- harvest/components/gatherer/Rainbow/Makefile.in	Thu Sep 11 12:14:19 1997
***************
*** 1,4 ****
! # Makefile.in,v 1.11 1995/11/16 19:26:17 duane Exp
  #
  #  Makefile for the SGML summarizers for the Essence system.
  #
--- 1,4 ----
! # Makefile.in,v 2.1 1997/09/11 16:14:19 sxw Exp
  #
  #  Makefile for the SGML summarizers for the Essence system.
  #
***************
*** 17,23 ****
  SGMLS_LIB_FILES	= Rainbow.decl Rainbow.dtd Rainbow.sum.tbl rbwents.sgml
  SGMLS_LIBDIR	= $(INSTALL_UTILDIR)/sgmls-lib/Rainbow
  
! all clean:
  
  install:	all
  	if test ! -d $(SGMLS_LIBDIR); then \
--- 17,23 ----
  SGMLS_LIB_FILES	= Rainbow.decl Rainbow.dtd Rainbow.sum.tbl rbwents.sgml
  SGMLS_LIBDIR	= $(INSTALL_UTILDIR)/sgmls-lib/Rainbow
  
! all clean distclean:
  
  install:	all
  	if test ! -d $(SGMLS_LIBDIR); then \
Index: harvest/components/gatherer/WordPerfect/Makefile
diff -c harvest/components/gatherer/WordPerfect/Makefile:2.0 harvest/components/gatherer/WordPerfect/Makefile:2.1
*** harvest/components/gatherer/WordPerfect/Makefile:2.0	Sun Mar 16 17:01:01 1997
--- harvest/components/gatherer/WordPerfect/Makefile	Thu Sep 11 12:14:21 1997
***************
*** 1,19 ****
  #
  #  Makefile for the WordPerfect summarizer component
  #
! #  Makefile,v 1.5 1995/03/20 19:49:55 hardy Exp
  #
  SUBDIRS		= wp2x-2.3
  
- all install clean:	
- 	@for dir in $(SUBDIRS); do \
- 		echo Making $@ in $$dir; \
- 		(cd $$dir; $(MAKE) $(MFLAGS) $@); \
- 	done
  
! realclean:	
! 	-rm -f config.status
! 	-@for dir in $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) $@); \
! 	done
--- 1,26 ----
  #
  #  Makefile for the WordPerfect summarizer component
  #
! #  Makefile,v 2.1 1997/09/11 16:14:21 sxw Exp
  #
  SUBDIRS		= wp2x-2.3
  
  
! all: do-all
! clean: do-clean
! distclean: do-distclean this-distclean 
! install: do-install 
! 
! this-distclean:
! 	rm -f config.status config.log
! 
! DO_X = do-clean do-distclean do-all do-install
!  
! $(DO_X):
!         @target=`echo $@ | sed -e 's/^do-//'`; \
!         for dir in $(SUBDIRS); do \
!         echo Making $$target in $$dir; \
!         if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
!         then true; else exit 1; fi; \
!         done
! 
Index: harvest/components/gatherer/WordPerfect/wp2x-2.3/Makefile.in
diff -c harvest/components/gatherer/WordPerfect/wp2x-2.3/Makefile.in:2.0 harvest/components/gatherer/WordPerfect/wp2x-2.3/Makefile.in:2.1
*** harvest/components/gatherer/WordPerfect/wp2x-2.3/Makefile.in:2.0	Sun Mar 16 17:01:08 1997
--- harvest/components/gatherer/WordPerfect/wp2x-2.3/Makefile.in	Thu Sep 11 12:14:22 1997
***************
*** 1,7 ****
  #
  #  Makefile for wp2x as a component to the Harvest Gatherer
  #
! #  Makefile.in,v 1.11 1995/11/16 19:26:18 duane Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR  = $(prefix)/bin
--- 1,7 ----
  #
  #  Makefile for wp2x as a component to the Harvest Gatherer
  #
! #  Makefile.in,v 2.1 1997/09/11 16:14:22 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR  = $(prefix)/bin
***************
*** 45,49 ****
  clean:
  	-rm -f a.out core $(OBJS) wp2x
  
! realclean:	clean
  	-rm -f Makefile
--- 45,49 ----
  clean:
  	-rm -f a.out core $(OBJS) wp2x
  
! distclean:	clean
  	-rm -f Makefile
Index: harvest/components/gatherer/standard/Makefile.in
diff -c harvest/components/gatherer/standard/Makefile.in:2.0 harvest/components/gatherer/standard/Makefile.in:2.1
*** harvest/components/gatherer/standard/Makefile.in:2.0	Sun Mar 16 17:02:34 1997
--- harvest/components/gatherer/standard/Makefile.in	Thu Sep 11 12:14:25 1997
***************
*** 1,103 ****
  #
  #  Makefile for the standard Harvest Gatherer summarizers
  #
! #  Makefile.in,v 1.19 1995/11/17 01:09:37 duane Exp
! ######################################################################
! #  Copyright (c) 1994, 1995.  All rights reserved.
! #  
! #    The Harvest software was developed by the Internet Research Task
! #    Force Research Group on Resource Discovery (IRTF-RD):
! #  
! #          Mic Bowman of Transarc Corporation.
! #          Peter Danzig of the University of Southern California.
! #          Darren R. Hardy of the University of Colorado at Boulder.
! #          Udi Manber of the University of Arizona.
! #          Michael F. Schwartz of the University of Colorado at Boulder.
! #          Duane Wessels of the University of Colorado at Boulder.
! #  
! #    This copyright notice applies to software in the Harvest
! #    ``src/'' directory only.  Users should consult the individual
! #    copyright notices in the ``components/'' subdirectories for
! #    copyright information about other software bundled with the
! #    Harvest source code distribution.
! #  
! #  TERMS OF USE
! #    
! #    The Harvest software may be used and re-distributed without
! #    charge, provided that the software origin and research team are
! #    cited in any use of the system.  Most commonly this is
! #    accomplished by including a link to the Harvest Home Page
! #    (http://harvest.cs.colorado.edu/) from the query page of any
! #    Broker you deploy, as well as in the query result pages.  These
! #    links are generated automatically by the standard Broker
! #    software distribution.
! #    
! #    The Harvest software is provided ``as is'', without express or
! #    implied warranty, and with no support nor obligation to assist
! #    in its use, correction, modification or enhancement.  We assume
! #    no liability with respect to the infringement of copyrights,
! #    trade secrets, or any patents, and are not responsible for
! #    consequential damages.  Proper use of the Harvest software is
! #    entirely the responsibility of the user.
! #  
! #  DERIVATIVE WORKS
! #  
! #    Users may make derivative works from the Harvest software, subject 
! #    to the following constraints:
! #  
! #      - You must include the above copyright notice and these 
! #        accompanying paragraphs in all forms of derivative works, 
! #        and any documentation and other materials related to such 
! #        distribution and use acknowledge that the software was 
! #        developed at the above institutions.
! #  
! #      - You must notify IRTF-RD regarding your distribution of 
! #        the derivative work.
! #  
! #      - You must clearly notify users that your are distributing 
! #        a modified version and not the original Harvest software.
! #  
! #      - Any derivative product is also subject to these copyright 
! #        and use restrictions.
! #  
! #    Note that the Harvest software is NOT in the public domain.  We
! #    retain copyright, as specified above.
! #  
! #  HISTORY OF FREE SOFTWARE STATUS
! #  
! #    Originally we required sites to license the software in cases
! #    where they were going to build commercial products/services
! #    around Harvest.  In June 1995 we changed this policy.  We now
! #    allow people to use the core Harvest software (the code found in
! #    the Harvest ``src/'' directory) for free.  We made this change
! #    in the interest of encouraging the widest possible deployment of
! #    the technology.  The Harvest software is really a reference
! #    implementation of a set of protocols and formats, some of which
! #    we intend to standardize.  We encourage commercial
! #    re-implementations of code complying to this set of standards.  
! #  
! 
! prefix = @prefix@
! INSTALL_BINDIR	= $(prefix)/bin
! INSTALL_LIBDIR	= $(prefix)/lib
! INSTALL_UTILDIR	= $(INSTALL_LIBDIR)/gatherer
! INSTALL_MANDIR 	= $(prefix)/man
! 
! INSTALL		= @INSTALL@
! INSTALL_BIN 	= @INSTALL_PROGRAM@
! INSTALL_FILE 	= @INSTALL_DATA@
  
  SUBDIRS		= dvi2tty ps2txt pstext skim summarizers support SGML unbinhex
  
! all install clean:	
! 	@for dir in $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) prefix="$(prefix)" $@); \
! 	done
  
! realclean:	clean
! 	-rm -f Makefile config.status config.cache
! 	-@for dir in $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) prefix="$(prefix)" $@); \
  	done
--- 1,25 ----
  #
  #  Makefile for the standard Harvest Gatherer summarizers
  #
! #  Makefile.in,v 2.1 1997/09/11 16:14:25 sxw Exp
  
  SUBDIRS		= dvi2tty ps2txt pstext skim summarizers support SGML unbinhex
  
! all: do-all
! install: do-install
! clean: do-clean
! distclean: do-distclean this-distclean
! 
! this-distclean:
! 	-rm -f Makefile config.status config.cache config.log
  
! DO_X = do-clean do-distclean do-all do-install
! 
! $(DO_X):
! 	@target=`echo $@ | sed -e 's/^do-//'`; \
! 	for dir in $(SUBDIRS); do \
! 	echo Making $$target in $$dir; \
! 	if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
! 	then true; else exit 1; fi; \
  	done
+ 
Index: harvest/components/gatherer/standard/SGML/Makefile.in
diff -c harvest/components/gatherer/standard/SGML/Makefile.in:2.1 harvest/components/gatherer/standard/SGML/Makefile.in:2.2
*** harvest/components/gatherer/standard/SGML/Makefile.in:2.1	Fri Mar 21 12:19:24 1997
--- harvest/components/gatherer/standard/SGML/Makefile.in	Thu Sep 11 12:14:26 1997
***************
*** 1,7 ****
  #
  #  Makefile for the SGML summarizers for the Harvest Indexer
  #
! # Makefile.in,v 2.1 1997/03/21 17:19:24 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,7 ----
  #
  #  Makefile for the SGML summarizers for the Harvest Indexer
  #
! # Makefile.in,v 2.2 1997/09/11 16:14:26 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 21,43 ****
  
  SCRIPTS		= SGML.sum IMS-DOCUMENT.sum
  
! all clean:
! 	@for dir in $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			CC="$(CC)" \
! 			INSTALL="$(INSTALL)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			RANLIB="$(RANLIB)" \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_UTILDIR="$(INSTALL_UTILDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 		$@); \
! 	done
  
! install:	all
  	@for f in $(SCRIPTS); do \
  		if [ -f $$f ]; then \
  			echo $(INSTALL_BIN) $$f $(INSTALL_UTILDIR); \
--- 21,32 ----
  
  SCRIPTS		= SGML.sum IMS-DOCUMENT.sum
  
! all: do-all
! clean: do-clean
! distclean: do-distclean this-distclean
! install: do-install this-install
  
! this-install:
  	@for f in $(SCRIPTS); do \
  		if [ -f $$f ]; then \
  			echo $(INSTALL_BIN) $$f $(INSTALL_UTILDIR); \
***************
*** 45,69 ****
  		fi; \
  	done
  	cp -rp sgmls-lib $(INSTALL_UTILDIR)
- 	@for dir in $(SUBDIRS); do \
- 		echo Making $@ in $$dir; \
- 		(cd $$dir; $(MAKE) $(MFLAGS) \
- 			CC="$(CC)" \
- 			INSTALL="$(INSTALL)" \
- 			INSTALL_BIN="$(INSTALL_BIN)" \
- 			INSTALL_FILE="$(INSTALL_FILE)" \
- 			RANLIB="$(RANLIB)" \
- 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
- 			INSTALL_UTILDIR="$(INSTALL_UTILDIR)" \
- 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
- 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
- 		$@); \
- 	done
- 	@if [ -d rbmaker ]; then \
- 		echo $(INSTALL_BIN) rbmaker/rbmaker.`uname -sr | sed -e 's/ /_/g'` $(INSTALL_UTILDIR)/rbmaker; \
- 		$(INSTALL_BIN) rbmaker/rbmaker.`uname -sr | sed -e 's/ /_/g'` $(INSTALL_UTILDIR)/rbmaker; \
- 		echo cp -rp rbmaker.dat $(INSTALL_UTILDIR); \
- 		cp -rp rbmaker.dat $(INSTALL_UTILDIR); \
- 	fi
  
  
--- 34,49 ----
  		fi; \
  	done
  	cp -rp sgmls-lib $(INSTALL_UTILDIR)
  
+ this-distclean:
+ 	-rm -f Makefile
  
+ DO_X = do-clean do-distclean do-all do-install
+ 
+ $(DO_X):
+ 	@target=`echo $@ | sed -e 's/^do-//'`; \
+ 	for dir in $(SUBDIRS); do \
+ 	echo Making $$target in $$dir; \
+ 	if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
+ 	then true; else exit 1; fi; \
+ 	done
Index: harvest/components/gatherer/standard/SGML/SGML.sum
diff -c harvest/components/gatherer/standard/SGML/SGML.sum:2.3 harvest/components/gatherer/standard/SGML/SGML.sum:2.6
*** harvest/components/gatherer/standard/SGML/SGML.sum:2.3	Thu Jul 10 13:48:26 1997
--- harvest/components/gatherer/standard/SGML/SGML.sum	Tue Sep 16 14:17:04 1997
***************
*** 6,12 ****
  #
  #  Usage: SGML.sum [-d file.decl] [-t file.tbl] DOCTYPE [file]
  #
! #  SGML.sum,v 1.22 1995/11/16 20:41:34 duane Exp
  ######################################################################
  #  Copyright (c) 1994, 1995.  All rights reserved.
  #  
--- 6,41 ----
  #
  #  Usage: SGML.sum [-d file.decl] [-t file.tbl] DOCTYPE [file]
  #
! #  SGML.sum,v 2.6 1997/09/16 18:17:04 sxw Exp
! #
! #############################################################################
! #
! #  Harvest Indexer http://www.tardis.ed.ac.uk/harvest/
! #  ---------------------------------------------------
! #
! #  The Harvest Indexer is a continued development of code developed by
! #  the Harvest Project. Development is carried out by numerous individuals
! #  in the Internet community, and is not officially connected with the
! #  original Harvest Project or its funding sources.
! # 
! #  Please mail harvest@tardis.ed.ac.uk if you are interested in participating
! #  in the development effort.
! #
! #  This program is free software; you can redistribute it and/or modify
! #  it under the terms of the GNU General Public License as published by
! #  the Free Software Foundation; either version 2 of the License, or
! #  (at your option) any later version.
! #  
! #  This program is distributed in the hope that it will be useful,
! #  but WITHOUT ANY WARRANTY; without even the implied warranty of
! #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #  GNU General Public License for more details.
! #  
! #  You should have received a copy of the GNU General Public License
! #  along with this program; if not, write to the Free Software
! #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
! # 
! 
  ######################################################################
  #  Copyright (c) 1994, 1995.  All rights reserved.
  #  
***************
*** 83,94 ****
  #  
  #  
  
- $ENV{'HARVEST_HOME'} = "/usr/local/harvest" if (!defined($ENV{'HARVEST_HOME'}));
- unshift(@INC, "$ENV{'HARVEST_HOME'}/lib");      # use local files
- 
  $start_t	= time;
  
! $syntax_check	= 1;	# set to 1 if you want sgmls to print error messages
  $debug		= 0;
  $print_times    = 0;	# set to 1 if you want SGML.sum to print time info
  $print_times    = 1 if ($debug);
--- 112,120 ----
  #  
  #  
  
  $start_t	= time;
  
! $syntax_check	= 0;	# set to 1 if you want sgmls to print error messages
  $debug		= 0;
  $print_times    = 0;	# set to 1 if you want SGML.sum to print time info
  $print_times    = 1 if ($debug);
Index: harvest/components/gatherer/standard/SGML/sgmls/Makefile.in
diff -c harvest/components/gatherer/standard/SGML/sgmls/Makefile.in:2.1 harvest/components/gatherer/standard/SGML/sgmls/Makefile.in:2.2
*** harvest/components/gatherer/standard/SGML/sgmls/Makefile.in:2.1	Tue Mar 25 19:22:01 1997
--- harvest/components/gatherer/standard/SGML/sgmls/Makefile.in	Thu Sep 11 12:14:28 1997
***************
*** 128,135 ****
  clean:
  	-rm -f *.o $(PROGS) core a.out
  
! realclean: clean
! 	-rm -f $(FMANPAGES) config.h
  
  depend: $(SRCS)
  
--- 128,135 ----
  clean:
  	-rm -f *.o $(PROGS) core a.out
  
! distclean: clean
! 	-rm -f $(FMANPAGES) config.h Makefile
  
  depend: $(SRCS)
  
Index: harvest/components/gatherer/standard/SGML/sgmls-lib/HTML/HTML.sum.tbl
diff -c harvest/components/gatherer/standard/SGML/sgmls-lib/HTML/HTML.sum.tbl:2.0 harvest/components/gatherer/standard/SGML/sgmls-lib/HTML/HTML.sum.tbl:2.1
*** harvest/components/gatherer/standard/SGML/sgmls-lib/HTML/HTML.sum.tbl:2.0	Sun Mar 16 17:05:21 1997
--- harvest/components/gatherer/standard/SGML/sgmls-lib/HTML/HTML.sum.tbl	Fri Sep  5 10:03:49 1997
***************
*** 1,3 ****
--- 1,5 ----
+ # HTML.sum.tbl,v 2.1 1997/09/05 14:03:49 sxw Exp
+ # 
  # This assoc array maps HTML elements to SOIF attrs.
  #
  # To capture variables inside elements, use ELEMENT:VARIALBE
***************
*** 33,38 ****
--- 35,41 ----
  <HEAD>          head
  <I>             keywords,parent
  <IMG:SRC>       images
+ <IMG:ALT>	parent
  <META:CONTENT>  $NAME
  <STRONG>        keywords,parent
  <TITLE>         title
Index: harvest/components/gatherer/standard/dvi2tty/Makefile.in
diff -c harvest/components/gatherer/standard/dvi2tty/Makefile.in:2.0 harvest/components/gatherer/standard/dvi2tty/Makefile.in:2.1
*** harvest/components/gatherer/standard/dvi2tty/Makefile.in:2.0	Sun Mar 16 17:05:56 1997
--- harvest/components/gatherer/standard/dvi2tty/Makefile.in	Thu Sep 11 12:14:29 1997
***************
*** 36,42 ****
  clean:
  	-rm *.o disdvi dvi2tty core
  
! realclean:	clean
  	-rm -f Makefile
  
  install:	all
--- 36,42 ----
  clean:
  	-rm *.o disdvi dvi2tty core
  
! distclean:	clean
  	-rm -f Makefile
  
  install:	all
Index: harvest/components/gatherer/standard/ps2txt/Makefile.in
diff -c harvest/components/gatherer/standard/ps2txt/Makefile.in:2.1 harvest/components/gatherer/standard/ps2txt/Makefile.in:2.2
*** harvest/components/gatherer/standard/ps2txt/Makefile.in:2.1	Fri Mar 21 12:19:25 1997
--- harvest/components/gatherer/standard/ps2txt/Makefile.in	Thu Sep 11 12:14:30 1997
***************
*** 1,6 ****
  # Makefile for ps2txt
  #
! # Makefile.in,v 2.1 1997/03/21 17:19:25 sxw Exp
  
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,6 ----
  # Makefile for ps2txt
  #
! # Makefile.in,v 2.2 1997/09/11 16:14:30 sxw Exp
  
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 25,31 ****
  clean:
  	-rm core *.o $(PROGS)
  
! realclean:	clean
  	-rm -f Makefile
  
  install: all
--- 25,31 ----
  clean:
  	-rm core *.o $(PROGS)
  
! distclean:	clean
  	-rm -f Makefile
  
  install: all
Index: harvest/components/gatherer/standard/pstext/Makefile.in
diff -c harvest/components/gatherer/standard/pstext/Makefile.in:2.1 harvest/components/gatherer/standard/pstext/Makefile.in:2.2
*** harvest/components/gatherer/standard/pstext/Makefile.in:2.1	Fri Mar 21 12:19:29 1997
--- harvest/components/gatherer/standard/pstext/Makefile.in	Thu Sep 11 12:14:31 1997
***************
*** 1,6 ****
  # Makefile for building pstext as part of the Harvest Indexer distribution
  #
! # Makefile.in,v 2.1 1997/03/21 17:19:29 sxw Exp
  
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,6 ----
  # Makefile for building pstext as part of the Harvest Indexer distribution
  #
! # Makefile.in,v 2.2 1997/09/11 16:14:31 sxw Exp
  
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 13,60 ****
  INSTALL_FILE 	= @INSTALL_DATA@
  RANLIB		= @RANLIB@
  
! all clean:
! 	@for dir in libs pstext; do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			CC="$(CC)" \
! 			INSTALL="$(INSTALL)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			RANLIB="$(RANLIB)" \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 		$@); \
! 	done
! 
! install:	all
! 	@for dir in pstext; do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			CC="$(CC)" \
! 			INSTALL="$(INSTALL)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			RANLIB="$(RANLIB)" \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 		$@); \
! 	done
  
! realclean:	clean
  	-rm -f Makefile
! 	@for dir in libs pstext; do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			CC="$(CC)" \
! 			INSTALL="$(INSTALL)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			RANLIB="$(RANLIB)" \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 		$@); \
! 	done
--- 13,34 ----
  INSTALL_FILE 	= @INSTALL_DATA@
  RANLIB		= @RANLIB@
  
! SUBDIRS          = libs pstext
  
! all: do-all
! clean: do-clean
! distclean: do-distclean this-distclean
! install: do-install
! 
! this-distclean:	
  	-rm -f Makefile
! 
! DO_X = do-clean do-distclean do-all do-install
! 
! $(DO_X):
! 	@target=`echo $@ | sed -e 's/^do-//'`; \
! 	for dir in $(SUBDIRS); do \
! 	echo Making $$target in $$dir; \
! 	if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
! 	then true; else exit 1; fi; \
! 	done 
Index: harvest/components/gatherer/standard/pstext/libs/Makefile.in
diff -c harvest/components/gatherer/standard/pstext/libs/Makefile.in:2.1 harvest/components/gatherer/standard/pstext/libs/Makefile.in:2.2
*** harvest/components/gatherer/standard/pstext/libs/Makefile.in:2.1	Fri Mar 21 12:19:31 1997
--- harvest/components/gatherer/standard/pstext/libs/Makefile.in	Thu Sep 11 12:14:32 1997
***************
*** 1,4 ****
! # Makefile.in,v 2.1 1997/03/21 17:19:31 sxw Exp
  
  SUBDIRS	= src
  
--- 1,4 ----
! # Makefile.in,v 2.2 1997/09/11 16:14:32 sxw Exp
  
  SUBDIRS	= src
  
***************
*** 13,34 ****
  INSTALL_FILE 	= @INSTALL_DATA@
  RANLIB		= @RANLIB@
  
! all clean install:
  	@if [ ! -d ./lib ]; then \
  		mkdir ./lib; \
  	else \
  		echo "lib directory already made."; \
  	fi;
! 	@for dir in $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			CC="$(CC)" \
! 			INSTALL="$(INSTALL)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			RANLIB="$(RANLIB)" \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 		$@); \
! 	done
--- 13,42 ----
  INSTALL_FILE 	= @INSTALL_DATA@
  RANLIB		= @RANLIB@
  
! all: do-all this-all
! clean: do-clean this-clean
! distclean: do-distclean this-distclean
! install: do-install 
! 
! this-all:
  	@if [ ! -d ./lib ]; then \
  		mkdir ./lib; \
  	else \
  		echo "lib directory already made."; \
  	fi;
! 
! this-clean:
! 	-rm -f lib/*.a lib/core
! 
! this-distclean: this-clean
! 	-rm -f Makefile
! 
! DO_X = do-clean do-distclean do-all do-install
! 
! $(DO_X):
! 	@target=`echo $@ | sed -e 's/^do-//'`; \
! 	for dir in $(SUBDIRS); do \
! 	echo Making $$target in $$dir; \
! 	if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
! 	then true; else exit 1; fi; \
! 	done  
Index: harvest/components/gatherer/standard/pstext/libs/src/Makefile.in
diff -c harvest/components/gatherer/standard/pstext/libs/src/Makefile.in:2.1 harvest/components/gatherer/standard/pstext/libs/src/Makefile.in:2.2
*** harvest/components/gatherer/standard/pstext/libs/src/Makefile.in:2.1	Fri Mar 21 12:19:34 1997
--- harvest/components/gatherer/standard/pstext/libs/src/Makefile.in	Thu Sep 11 12:14:35 1997
***************
*** 1,4 ****
! # Makefile.in,v 2.1 1997/03/21 17:19:34 sxw Exp
  #
  
  SUBDIRS	= sio str
--- 1,4 ----
! # Makefile.in,v 2.2 1997/09/11 16:14:35 sxw Exp
  #
  
  SUBDIRS	= sio str
***************
*** 14,30 ****
  INSTALL_FILE 	= @INSTALL_DATA@
  RANLIB		= @RANLIB@
  
! all clean install:
! 	@for dir in $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			CC="$(CC)" \
! 			INSTALL="$(INSTALL)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			RANLIB="$(RANLIB)" \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 		$@); \
! 	done
--- 14,33 ----
  INSTALL_FILE 	= @INSTALL_DATA@
  RANLIB		= @RANLIB@
  
! all: do-all
! clean: do-clean
! distclean: do-distclean this-distclean
! install: do-install 
! 
! this-distclean:
! 	-rm -f Makefile
! 
! DO_X = do-clean do-distclean do-all do-install
! 
! $(DO_X):
! 	@target=`echo $@ | sed -e 's/^do-//'`; \
! 	for dir in $(SUBDIRS); do \
! 		echo Making $$target in $$dir; \
! 		if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
! 		then true; else exit 1; fi; \
! 	done   
Index: harvest/components/gatherer/standard/pstext/libs/src/sio/Makefile.in
diff -c harvest/components/gatherer/standard/pstext/libs/src/sio/Makefile.in:2.1 harvest/components/gatherer/standard/pstext/libs/src/sio/Makefile.in:2.2
*** harvest/components/gatherer/standard/pstext/libs/src/sio/Makefile.in:2.1	Fri Mar 21 12:19:36 1997
--- harvest/components/gatherer/standard/pstext/libs/src/sio/Makefile.in	Thu Sep 11 12:14:36 1997
***************
*** 3,9 ****
  # and conditions for redistribution.
  
  #
! # Makefile.in,v 2.1 1997/03/21 17:19:36 sxw Exp
  #
  
  # 
--- 3,9 ----
  # and conditions for redistribution.
  
  #
! # Makefile.in,v 2.2 1997/09/11 16:14:36 sxw Exp
  #
  
  # 
***************
*** 72,77 ****
--- 72,78 ----
  LIBNAME        = $(LIBDIR)/lib$(NAME).a
  
  all:	$(LIBNAME)
+ install:
  
  $(LIBNAME): $(OBJECTS)
  	ar r $@ $?
***************
*** 79,81 ****
--- 80,85 ----
  
  clean:
  	-rm -f $(OBJECTS) $(LIBNAME) core
+ 
+ distclean: clean
+ 	-rm -f Makefile
Index: harvest/components/gatherer/standard/pstext/libs/src/sio/sioconf.h
diff -c harvest/components/gatherer/standard/pstext/libs/src/sio/sioconf.h:2.0 harvest/components/gatherer/standard/pstext/libs/src/sio/sioconf.h:2.1
*** harvest/components/gatherer/standard/pstext/libs/src/sio/sioconf.h:2.0	Sun Mar 16 17:07:06 1997
--- harvest/components/gatherer/standard/pstext/libs/src/sio/sioconf.h	Mon Jul 21 11:07:27 1997
***************
*** 83,89 ****
--- 83,95 ----
   */
  #ifndef N_SIO_DESCRIPTORS
  #include <sys/param.h>
+ #ifdef NOFILE
  #define N_SIO_DESCRIPTORS		NOFILE
+ #else
+ #ifdef NOFILES_MIN
+ #define N_SIO_DESCRIPTORS               NOFILES_MIN
+ #endif
+ #endif
  #endif
  
  
Index: harvest/components/gatherer/standard/pstext/libs/src/str/Makefile.in
diff -c harvest/components/gatherer/standard/pstext/libs/src/str/Makefile.in:2.1 harvest/components/gatherer/standard/pstext/libs/src/str/Makefile.in:2.2
*** harvest/components/gatherer/standard/pstext/libs/src/str/Makefile.in:2.1	Fri Mar 21 12:19:38 1997
--- harvest/components/gatherer/standard/pstext/libs/src/str/Makefile.in	Thu Sep 11 12:14:37 1997
***************
*** 3,9 ****
  # and conditions for redistribution.
  
  #
! # Makefile.in,v 2.1 1997/03/21 17:19:38 sxw Exp
  #
  
  # 
--- 3,9 ----
  # and conditions for redistribution.
  
  #
! # Makefile.in,v 2.2 1997/09/11 16:14:37 sxw Exp
  #
  
  # 
***************
*** 86,91 ****
--- 86,93 ----
  
  all:	lib
  
+ install:
+ 
  lib: $(LIBNAME)
  
  $(LIBNAME): $(OBJECTS)
***************
*** 94,96 ****
--- 96,102 ----
  
  clean:
  	-rm -f $(OBJECTS) $(LIBNAME) core
+ 
+ distclean: clean
+ 	-rm -f Makefile
+ 
Index: harvest/components/gatherer/standard/pstext/pstext/Makefile.in
diff -c harvest/components/gatherer/standard/pstext/pstext/Makefile.in:2.1 harvest/components/gatherer/standard/pstext/pstext/Makefile.in:2.2
*** harvest/components/gatherer/standard/pstext/pstext/Makefile.in:2.1	Fri Mar 21 12:19:41 1997
--- harvest/components/gatherer/standard/pstext/pstext/Makefile.in	Thu Sep 11 12:14:38 1997
***************
*** 3,9 ****
  # and conditions for redistribution.
  
  #
! # Makefile.in,v 2.1 1997/03/21 17:19:41 sxw Exp
  #
  
  #
--- 3,9 ----
  # and conditions for redistribution.
  
  #
! # Makefile.in,v 2.2 1997/09/11 16:14:38 sxw Exp
  #
  
  #
***************
*** 89,91 ****
--- 89,94 ----
  
  clean:   
  	-rm -f $(OBJECTS) $(PROGRAM) core
+ 
+ distclean: clean
+ 	-rm -f Makefile
Index: harvest/components/gatherer/standard/skim/Makefile.in
diff -c harvest/components/gatherer/standard/skim/Makefile.in:2.0 harvest/components/gatherer/standard/skim/Makefile.in:2.1
*** harvest/components/gatherer/standard/skim/Makefile.in:2.0	Sun Mar 16 17:08:01 1997
--- harvest/components/gatherer/standard/skim/Makefile.in	Thu Sep 11 12:14:39 1997
***************
*** 1,3 ****
--- 1,4 ----
+ # Makefile.in,v 2.1 1997/09/11 16:14:39 sxw Exp
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
  INSTALL_LIBDIR	= $(prefix)/lib
***************
*** 20,26 ****
  clean:
  	-rm core *.o $(PROGS)
  
! realclean:	clean
  	-rm -f Makefile
  
  install: all
--- 21,27 ----
  clean:
  	-rm core *.o $(PROGS)
  
! distclean:	clean
  	-rm -f Makefile
  
  install: all
Index: harvest/components/gatherer/standard/summarizers/C.sum
diff -c harvest/components/gatherer/standard/summarizers/C.sum:2.0 harvest/components/gatherer/standard/summarizers/C.sum:2.1
*** harvest/components/gatherer/standard/summarizers/C.sum:2.0	Sun Mar 16 17:08:11 1997
--- harvest/components/gatherer/standard/summarizers/C.sum	Thu Sep 11 13:56:33 1997
***************
*** 1,83 ****
  #!/bin/sh
  #
! #  C.sum - Summarizes a C source file
  #
! #  C.sum,v 1.2 1995/09/05 20:17:17 hardy Exp
  #
! ######################################################################
! #  Copyright (c) 1994, 1995.  All rights reserved.
! #  
! #    The Harvest software was developed by the Internet Research Task
! #    Force Research Group on Resource Discovery (IRTF-RD):
! #  
! #          Mic Bowman of Transarc Corporation.
! #          Peter Danzig of the University of Southern California.
! #          Darren R. Hardy of the University of Colorado at Boulder.
! #          Udi Manber of the University of Arizona.
! #          Michael F. Schwartz of the University of Colorado at Boulder.
! #          Duane Wessels of the University of Colorado at Boulder.
! #  
! #    This copyright notice applies to software in the Harvest
! #    ``src/'' directory only.  Users should consult the individual
! #    copyright notices in the ``components/'' subdirectories for
! #    copyright information about other software bundled with the
! #    Harvest source code distribution.
! #  
! #  TERMS OF USE
! #    
! #    The Harvest software may be used and re-distributed without
! #    charge, provided that the software origin and research team are
! #    cited in any use of the system.  Most commonly this is
! #    accomplished by including a link to the Harvest Home Page
! #    (http://harvest.cs.colorado.edu/) from the query page of any
! #    Broker you deploy, as well as in the query result pages.  These
! #    links are generated automatically by the standard Broker
! #    software distribution.
! #    
! #    The Harvest software is provided ``as is'', without express or
! #    implied warranty, and with no support nor obligation to assist
! #    in its use, correction, modification or enhancement.  We assume
! #    no liability with respect to the infringement of copyrights,
! #    trade secrets, or any patents, and are not responsible for
! #    consequential damages.  Proper use of the Harvest software is
! #    entirely the responsibility of the user.
! #  
! #  DERIVATIVE WORKS
! #  
! #    Users may make derivative works from the Harvest software, subject 
! #    to the following constraints:
! #  
! #      - You must include the above copyright notice and these 
! #        accompanying paragraphs in all forms of derivative works, 
! #        and any documentation and other materials related to such 
! #        distribution and use acknowledge that the software was 
! #        developed at the above institutions.
! #  
! #      - You must notify IRTF-RD regarding your distribution of 
! #        the derivative work.
! #  
! #      - You must clearly notify users that your are distributing 
! #        a modified version and not the original Harvest software.
! #  
! #      - Any derivative product is also subject to these copyright 
! #        and use restrictions.
! #  
! #    Note that the Harvest software is NOT in the public domain.  We
! #    retain copyright, as specified above.
! #  
! #  HISTORY OF FREE SOFTWARE STATUS
! #  
! #    Originally we required sites to license the software in cases
! #    where they were going to build commercial products/services
! #    around Harvest.  In June 1995 we changed this policy.  We now
! #    allow people to use the core Harvest software (the code found in
! #    the Harvest ``src/'' directory) for free.  We made this change
! #    in the interest of encouraging the widest possible deployment of
! #    the technology.  The Harvest software is really a reference
! #    implementation of a set of protocols and formats, some of which
! #    we intend to standardize.  We encourage commercial
! #    re-implementations of code complying to this set of standards.  
! #  
! #  
! C-raw.sum $1 | wrapit "Partial-Text"
  exit 0
--- 1,42 ----
  #!/bin/sh
  #
! #  C.sum - extracts procedure names, #include'd filenames, and comments, then
! #        - wraps the lot as being "Partial-Text"
  #
! #  C.sum,v 2.1 1997/09/11 17:56:33 sxw Exp
  #
! #############################################################################
! #
! #  Harvest Indexer http://www.tardis.ed.ac.uk/harvest/
! #  ---------------------------------------------------
! #
! #  The Harvest Indexer is a continued development of code developed by
! #  the Harvest Project. Development is carried out by numerous individuals
! #  in the Internet community, and is not officially connected with the
! #  original Harvest Project or its funding sources.
! # 
! #  Please mail harvest@tardis.ed.ac.uk if you are interested in participating
! #  in the development effort.
! #
! #  This program is free software; you can redistribute it and/or modify
! #  it under the terms of the GNU General Public License as published by
! #  the Free Software Foundation; either version 2 of the License, or
! #  (at your option) any later version.
! #  
! #  This program is distributed in the hope that it will be useful,
! #  but WITHOUT ANY WARRANTY; without even the implied warranty of
! #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #  GNU General Public License for more details.
! #  
! #  You should have received a copy of the GNU General Public License
! #  along with this program; if not, write to the Free Software
! #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
! # 
! ############################################################################
! 
! (
! ( ctags -t -x -w $1 | awk '{print $1}' );
! ( cat $1 | perl -ne 'print "$1\n" if (/^#\s*include\s*["<](.*)[">].*$/o);');
! ( print-c-comments $1 | head -100 );
! ) | wrapit "Partial-Text"
  exit 0
Index: harvest/components/gatherer/standard/summarizers/Makefile.in
diff -c harvest/components/gatherer/standard/summarizers/Makefile.in:2.1 harvest/components/gatherer/standard/summarizers/Makefile.in:2.3
*** harvest/components/gatherer/standard/summarizers/Makefile.in:2.1	Tue Jul  1 15:20:38 1997
--- harvest/components/gatherer/standard/summarizers/Makefile.in	Thu Sep 11 13:56:33 1997
***************
*** 1,81 ****
  #
  #  Makefile for the standard Harvest Gatherer summarizers
  #
! #  Makefile.in,v 1.35 1996/01/08 19:20:10 duane Exp
! #######################################################################
! #  Copyright (c) 1994, 1995.  All rights reserved.
! #  
! #    The Harvest software was developed by the Internet Research Task
! #    Force Research Group on Resource Discovery (IRTF-RD):
! #  
! #          Mic Bowman of Transarc Corporation.
! #          Peter Danzig of the University of Southern California.
! #          Darren R. Hardy of the University of Colorado at Boulder.
! #          Udi Manber of the University of Arizona.
! #          Michael F. Schwartz of the University of Colorado at Boulder.
! #          Duane Wessels of the University of Colorado at Boulder.
! #  
! #    This copyright notice applies to software in the Harvest
! #    ``src/'' directory only.  Users should consult the individual
! #    copyright notices in the ``components/'' subdirectories for
! #    copyright information about other software bundled with the
! #    Harvest source code distribution.
! #  
! #  TERMS OF USE
! #    
! #    The Harvest software may be used and re-distributed without
! #    charge, provided that the software origin and research team are
! #    cited in any use of the system.  Most commonly this is
! #    accomplished by including a link to the Harvest Home Page
! #    (http://harvest.cs.colorado.edu/) from the query page of any
! #    Broker you deploy, as well as in the query result pages.  These
! #    links are generated automatically by the standard Broker
! #    software distribution.
! #    
! #    The Harvest software is provided ``as is'', without express or
! #    implied warranty, and with no support nor obligation to assist
! #    in its use, correction, modification or enhancement.  We assume
! #    no liability with respect to the infringement of copyrights,
! #    trade secrets, or any patents, and are not responsible for
! #    consequential damages.  Proper use of the Harvest software is
! #    entirely the responsibility of the user.
! #  
! #  DERIVATIVE WORKS
! #  
! #    Users may make derivative works from the Harvest software, subject 
! #    to the following constraints:
! #  
! #      - You must include the above copyright notice and these 
! #        accompanying paragraphs in all forms of derivative works, 
! #        and any documentation and other materials related to such 
! #        distribution and use acknowledge that the software was 
! #        developed at the above institutions.
! #  
! #      - You must notify IRTF-RD regarding your distribution of 
! #        the derivative work.
! #  
! #      - You must clearly notify users that your are distributing 
! #        a modified version and not the original Harvest software.
! #  
! #      - Any derivative product is also subject to these copyright 
! #        and use restrictions.
! #  
! #    Note that the Harvest software is NOT in the public domain.  We
! #    retain copyright, as specified above.
! #  
! #  HISTORY OF FREE SOFTWARE STATUS
! #  
! #    Originally we required sites to license the software in cases
! #    where they were going to build commercial products/services
! #    around Harvest.  In June 1995 we changed this policy.  We now
! #    allow people to use the core Harvest software (the code found in
! #    the Harvest ``src/'' directory) for free.  We made this change
! #    in the interest of encouraging the widest possible deployment of
! #    the technology.  The Harvest software is really a reference
! #    implementation of a set of protocols and formats, some of which
! #    we intend to standardize.  We encourage commercial
! #    re-implementations of code complying to this set of standards.  
! #  
  
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,7 ----
  #
  #  Makefile for the standard Harvest Gatherer summarizers
  #
! # Makefile.in,v 2.3 1997/09/11 17:56:33 sxw Exp
  
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 90,96 ****
  LN_S		= @LN_S@
  XTRA_LIBS	= @XTRA_LIBS@
  
! DEBUG           = $(DEBUG_TOP) #-O #-g #-DDEBUG
  DEBUG_LDFLAGS   =
  DEBUG_LIBS      =
  INCLUDE         = -I../../../../src/common/include \
--- 16,22 ----
  LN_S		= @LN_S@
  XTRA_LIBS	= @XTRA_LIBS@
  
! DEBUG           = $(DEBUG_TOP) 
  DEBUG_LDFLAGS   =
  DEBUG_LIBS      =
  INCLUDE         = -I../../../../src/common/include \
***************
*** 106,112 ****
  SCRIPTS		= Archive.sum \
  		  Binary-raw.sum \
  		  Binary.sum \
- 		  C-raw.sum \
  		  C.sum \
  		  Dvi.sum \
  		  FullText.sum \
--- 32,37 ----
***************
*** 153,168 ****
  		$(INSTALL_BIN) $$f $(INSTALL_UTILDIR)/$$f; \
  	done
  	-rm -f $(INSTALL_UTILDIR)/FAQ.sum
! 	(cd $(INSTALL_UTILDIR); $(LN_S) Text.sum FAQ.sum)
  	-rm -f $(INSTALL_UTILDIR)/HomeHTML.sum
! 	(cd $(INSTALL_UTILDIR); $(LN_S) HTML.sum HomeHTML.sum)
  	-rm -f $(INSTALL_UTILDIR)/Configuration.sum
! 	(cd $(INSTALL_UTILDIR); $(LN_S) Text.sum Configuration.sum)
  	-rm -f $(INSTALL_UTILDIR)/CHeader.sum
! 	(cd $(INSTALL_UTILDIR); $(LN_S) C.sum CHeader.sum)
  
  clean:
  	-rm -f $(PROGS) *.o a.out core
  
! realclean:	clean
  	-rm -f Makefile
--- 78,93 ----
  		$(INSTALL_BIN) $$f $(INSTALL_UTILDIR)/$$f; \
  	done
  	-rm -f $(INSTALL_UTILDIR)/FAQ.sum
! 	(cd $(INSTALL_UTILDIR) && $(LN_S) Text.sum FAQ.sum)
  	-rm -f $(INSTALL_UTILDIR)/HomeHTML.sum
! 	(cd $(INSTALL_UTILDIR) && $(LN_S) HTML.sum HomeHTML.sum)
  	-rm -f $(INSTALL_UTILDIR)/Configuration.sum
! 	(cd $(INSTALL_UTILDIR) && $(LN_S) Text.sum Configuration.sum)
  	-rm -f $(INSTALL_UTILDIR)/CHeader.sum
! 	(cd $(INSTALL_UTILDIR) && $(LN_S) C.sum CHeader.sum)
  
  clean:
  	-rm -f $(PROGS) *.o a.out core
  
! distclean:	clean
  	-rm -f Makefile
Index: harvest/components/gatherer/standard/support/Makefile.in
diff -c harvest/components/gatherer/standard/support/Makefile.in:2.0 harvest/components/gatherer/standard/support/Makefile.in:2.2
*** harvest/components/gatherer/standard/support/Makefile.in:2.0	Sun Mar 16 17:08:54 1997
--- harvest/components/gatherer/standard/support/Makefile.in	Thu Sep 11 14:06:04 1997
***************
*** 1,84 ****
  #
  #  Makefile for Essence support programs
  #
! #  Makefile.in,v 1.14 1995/11/16 19:26:24 duane Exp
  #
  ######################################################################
! #  Copyright (c) 1994, 1995.  All rights reserved.
! #  
! #    The Harvest software was developed by the Internet Research Task
! #    Force Research Group on Resource Discovery (IRTF-RD):
! #  
! #          Mic Bowman of Transarc Corporation.
! #          Peter Danzig of the University of Southern California.
! #          Darren R. Hardy of the University of Colorado at Boulder.
! #          Udi Manber of the University of Arizona.
! #          Michael F. Schwartz of the University of Colorado at Boulder.
! #          Duane Wessels of the University of Colorado at Boulder.
! #  
! #    This copyright notice applies to software in the Harvest
! #    ``src/'' directory only.  Users should consult the individual
! #    copyright notices in the ``components/'' subdirectories for
! #    copyright information about other software bundled with the
! #    Harvest source code distribution.
! #  
! #  TERMS OF USE
! #    
! #    The Harvest software may be used and re-distributed without
! #    charge, provided that the software origin and research team are
! #    cited in any use of the system.  Most commonly this is
! #    accomplished by including a link to the Harvest Home Page
! #    (http://harvest.cs.colorado.edu/) from the query page of any
! #    Broker you deploy, as well as in the query result pages.  These
! #    links are generated automatically by the standard Broker
! #    software distribution.
! #    
! #    The Harvest software is provided ``as is'', without express or
! #    implied warranty, and with no support nor obligation to assist
! #    in its use, correction, modification or enhancement.  We assume
! #    no liability with respect to the infringement of copyrights,
! #    trade secrets, or any patents, and are not responsible for
! #    consequential damages.  Proper use of the Harvest software is
! #    entirely the responsibility of the user.
! #  
! #  DERIVATIVE WORKS
! #  
! #    Users may make derivative works from the Harvest software, subject 
! #    to the following constraints:
! #  
! #      - You must include the above copyright notice and these 
! #        accompanying paragraphs in all forms of derivative works, 
! #        and any documentation and other materials related to such 
! #        distribution and use acknowledge that the software was 
! #        developed at the above institutions.
! #  
! #      - You must notify IRTF-RD regarding your distribution of 
! #        the derivative work.
! #  
! #      - You must clearly notify users that your are distributing 
! #        a modified version and not the original Harvest software.
! #  
! #      - Any derivative product is also subject to these copyright 
! #        and use restrictions.
! #  
! #    Note that the Harvest software is NOT in the public domain.  We
! #    retain copyright, as specified above.
! #  
! #  HISTORY OF FREE SOFTWARE STATUS
! #  
! #    Originally we required sites to license the software in cases
! #    where they were going to build commercial products/services
! #    around Harvest.  In June 1995 we changed this policy.  We now
! #    allow people to use the core Harvest software (the code found in
! #    the Harvest ``src/'' directory) for free.  We made this change
! #    in the interest of encouraging the widest possible deployment of
! #    the technology.  The Harvest software is really a reference
! #    implementation of a set of protocols and formats, some of which
! #    we intend to standardize.  We encourage commercial
! #    re-implementations of code complying to this set of standards.  
! #  
! #  
! prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
  INSTALL_UTILDIR	= $(INSTALL_LIBDIR)/gatherer
  INSTALL_LIBDIR	= $(prefix)/lib
--- 1,11 ----
  #
  #  Makefile for Essence support programs
  #
! #  Makefile.in,v 2.2 1997/09/11 18:06:04 sxw Exp
  #
  ######################################################################
! 
! prefix=@prefix@
  INSTALL_BINDIR	= $(prefix)/bin
  INSTALL_UTILDIR	= $(INSTALL_LIBDIR)/gatherer
  INSTALL_LIBDIR	= $(prefix)/lib
***************
*** 90,105 ****
  INSTALL_FILE 	= @INSTALL_DATA@
  RANLIB		= @RANLIB@
  
! #
! #  If your system doesn't have deroff, then use can use our deroff clone
! #
! DEROFF		= deroff
! 
! DEBUG		= $(DEBUG_TOP) #-O #-g #-DDEBUG
  CFLAGS 		= $(DEBUG)
  
! SCRIPTS		= extract-perl-procs get-include-files l2h.pl ps2txt \
! 		  unshar wrapit $(DEROFF)
  BINS		= print-c-comments
  
  all:		$(SCRIPTS) $(BINS)
--- 17,27 ----
  INSTALL_FILE 	= @INSTALL_DATA@
  RANLIB		= @RANLIB@
  
! DEBUG		= $(DEBUG_TOP) 
  CFLAGS 		= $(DEBUG)
  
! # FIXME: Should check for "unshar" in configure script too
! SCRIPTS		= l2h.pl ps2txt unshar wrapit 
  BINS		= print-c-comments
  
  all:		$(SCRIPTS) $(BINS)
***************
*** 113,119 ****
  clean:
  	-rm -f core *.o print-c-comments
  
! realclean:	clean
  	-rm -f Makefile
  
  print-c-comments: print-c-comments.o
--- 35,41 ----
  clean:
  	-rm -f core *.o print-c-comments
  
! distclean:	clean
  	-rm -f Makefile
  
  print-c-comments: print-c-comments.o
Index: harvest/components/gatherer/standard/support/wrapit
diff -c harvest/components/gatherer/standard/support/wrapit:2.0 harvest/components/gatherer/standard/support/wrapit:2.1
*** harvest/components/gatherer/standard/support/wrapit:2.0	Sun Mar 16 17:09:08 1997
--- harvest/components/gatherer/standard/support/wrapit	Thu Sep 11 14:05:05 1997
***************
*** 6,98 ****
  #
  #  Usage: wrapit [Attribute]
  #
! #  Darren Hardy, hardy@cs.colorado.edu, July 1994
  #
! #  wrapit,v 1.5 1995/09/05 20:17:55 hardy Exp
  #
! #######################################################################
  #
! #  Copyright (c) 1994, 1995.  All rights reserved.
! #  
! #    The Harvest software was developed by the Internet Research Task
! #    Force Research Group on Resource Discovery (IRTF-RD):
! #  
! #          Mic Bowman of Transarc Corporation.
! #          Peter Danzig of the University of Southern California.
! #          Darren R. Hardy of the University of Colorado at Boulder.
! #          Udi Manber of the University of Arizona.
! #          Michael F. Schwartz of the University of Colorado at Boulder.
! #          Duane Wessels of the University of Colorado at Boulder.
! #  
! #    This copyright notice applies to software in the Harvest
! #    ``src/'' directory only.  Users should consult the individual
! #    copyright notices in the ``components/'' subdirectories for
! #    copyright information about other software bundled with the
! #    Harvest source code distribution.
! #  
! #  TERMS OF USE
! #    
! #    The Harvest software may be used and re-distributed without
! #    charge, provided that the software origin and research team are
! #    cited in any use of the system.  Most commonly this is
! #    accomplished by including a link to the Harvest Home Page
! #    (http://harvest.cs.colorado.edu/) from the query page of any
! #    Broker you deploy, as well as in the query result pages.  These
! #    links are generated automatically by the standard Broker
! #    software distribution.
! #    
! #    The Harvest software is provided ``as is'', without express or
! #    implied warranty, and with no support nor obligation to assist
! #    in its use, correction, modification or enhancement.  We assume
! #    no liability with respect to the infringement of copyrights,
! #    trade secrets, or any patents, and are not responsible for
! #    consequential damages.  Proper use of the Harvest software is
! #    entirely the responsibility of the user.
! #  
! #  DERIVATIVE WORKS
! #  
! #    Users may make derivative works from the Harvest software, subject 
! #    to the following constraints:
! #  
! #      - You must include the above copyright notice and these 
! #        accompanying paragraphs in all forms of derivative works, 
! #        and any documentation and other materials related to such 
! #        distribution and use acknowledge that the software was 
! #        developed at the above institutions.
! #  
! #      - You must notify IRTF-RD regarding your distribution of 
! #        the derivative work.
! #  
! #      - You must clearly notify users that your are distributing 
! #        a modified version and not the original Harvest software.
! #  
! #      - Any derivative product is also subject to these copyright 
! #        and use restrictions.
! #  
! #    Note that the Harvest software is NOT in the public domain.  We
! #    retain copyright, as specified above.
! #  
! #  HISTORY OF FREE SOFTWARE STATUS
! #  
! #    Originally we required sites to license the software in cases
! #    where they were going to build commercial products/services
! #    around Harvest.  In June 1995 we changed this policy.  We now
! #    allow people to use the core Harvest software (the code found in
! #    the Harvest ``src/'' directory) for free.  We made this change
! #    in the interest of encouraging the widest possible deployment of
! #    the technology.  The Harvest software is really a reference
! #    implementation of a set of protocols and formats, some of which
! #    we intend to standardize.  We encourage commercial
! #    re-implementations of code complying to this set of standards.  
! #  
  #
  $attribute = "Keywords";
  $attribute = shift(@ARGV) if ($#ARGV > -1);
! while (<>) {
! 	$data .= $_;
  }
- exit 0 if (length($data) == 0);
- print $attribute . "{" . length($data) . "}:\t";
- print $data;
- print "\n";
- exit 0;
--- 6,48 ----
  #
  #  Usage: wrapit [Attribute]
  #
! #  wrapit,v 2.1 1997/09/11 18:05:05 sxw Exp
  #
! #############################################################################
  #
! #  Harvest Indexer http://www.tardis.ed.ac.uk/harvest/
! #  ---------------------------------------------------
  #
! #  The Harvest Indexer is a continued development of code developed by
! #  the Harvest Project. Development is carried out by numerous individuals
! #  in the Internet community, and is not officially connected with the
! #  original Harvest Project or its funding sources.
! # 
! #  Please mail harvest@tardis.ed.ac.uk if you are interested in participating
! #  in the development effort.
  #
+ #  This program is free software; you can redistribute it and/or modify
+ #  it under the terms of the GNU General Public License as published by
+ #  the Free Software Foundation; either version 2 of the License, or
+ #  (at your option) any later version.
+ #  
+ #  This program is distributed in the hope that it will be useful,
+ #  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ #  GNU General Public License for more details.
+ #  
+ #  You should have received a copy of the GNU General Public License
+ #  along with this program; if not, write to the Free Software
+ #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ # 
+ 
  $attribute = "Keywords";
  $attribute = shift(@ARGV) if ($#ARGV > -1);
! 
! undef $/; $data=<>;
! 
! if (length($data) > 0) {
!     print $attribute . "{" . length($data) . "}:\t";
!     print $data;
!     print "\n";
  }
Index: harvest/components/gatherer/standard/unbinhex/Makefile.in
diff -c harvest/components/gatherer/standard/unbinhex/Makefile.in:2.0 harvest/components/gatherer/standard/unbinhex/Makefile.in:2.1
*** harvest/components/gatherer/standard/unbinhex/Makefile.in:2.0	Sun Mar 16 17:09:10 1997
--- harvest/components/gatherer/standard/unbinhex/Makefile.in	Thu Sep 11 12:14:43 1997
***************
*** 1,4 ****
! # Makefile.in,v 1.2 1995/11/16 19:26:24 duane Exp
  
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,4 ----
! # Makefile.in,v 2.1 1997/09/11 16:14:43 sxw Exp
  
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 12,46 ****
  INSTALL_FILE 	= @INSTALL_DATA@
  RANLIB		= @RANLIB@
  
! all clean install:
! 	@for dir in crc fileio util hexbin; do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			CC="$(CC)" \
! 			INSTALL="$(INSTALL)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			RANLIB="$(RANLIB)" \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 			INSTALL_UTILDIR="$(INSTALL_UTILDIR)" \
! 		$@); \
! 	done
  
! realclean:	clean
  	-rm -f Makefile
! 	@for dir in crc fileio util hexbin; do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			CC="$(CC)" \
! 			INSTALL="$(INSTALL)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			RANLIB="$(RANLIB)" \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 			INSTALL_UTILDIR="$(INSTALL_UTILDIR)" \
! 		$@); \
! 	done
--- 12,35 ----
  INSTALL_FILE 	= @INSTALL_DATA@
  RANLIB		= @RANLIB@
  
! SUBDIRS=crc fileio util hexbin 
  
! all: do-all
! clean: do-clean
! distclean: do-distclean this-distclean
! install: do-install
! 
! this-distclean:	
  	-rm -f Makefile
! 
! DO_X = do-clean do-distclean do-all do-install
! 
! $(DO_X):
! 	@target=`echo $@ | sed -e 's/^do-//'`; \
! 	for dir in $(SUBDIRS); do \
! 	echo Making $$target in $$dir; \
! 	if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
! 	then true; else exit 1; fi; \
! 	done    
! 
! 
Index: harvest/components/gatherer/standard/unbinhex/crc/Makefile.in
diff -c harvest/components/gatherer/standard/unbinhex/crc/Makefile.in:2.0 harvest/components/gatherer/standard/unbinhex/crc/Makefile.in:2.1
*** harvest/components/gatherer/standard/unbinhex/crc/Makefile.in:2.0	Sun Mar 16 17:09:15 1997
--- harvest/components/gatherer/standard/unbinhex/crc/Makefile.in	Thu Sep 11 12:14:44 1997
***************
*** 1,4 ****
! # Makefile.in,v 1.1 1995/08/15 19:46:35 duane Exp
  
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,4 ----
! # Makefile.in,v 2.1 1997/09/11 16:14:44 sxw Exp
  
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 26,32 ****
  clean:
  	-rm -f $(CRCC) $(CRCO) $(LIB) makecrc makecrc.o
  
! realclean: clean
  	-rm -f Makefile
  
  $(CRCC):	makecrc
--- 26,32 ----
  clean:
  	-rm -f $(CRCC) $(CRCO) $(LIB) makecrc makecrc.o
  
! distclean: clean
  	-rm -f Makefile
  
  $(CRCC):	makecrc
Index: harvest/components/gatherer/standard/unbinhex/fileio/Makefile.in
diff -c harvest/components/gatherer/standard/unbinhex/fileio/Makefile.in:2.0 harvest/components/gatherer/standard/unbinhex/fileio/Makefile.in:2.1
*** harvest/components/gatherer/standard/unbinhex/fileio/Makefile.in:2.0	Sun Mar 16 17:09:18 1997
--- harvest/components/gatherer/standard/unbinhex/fileio/Makefile.in	Thu Sep 11 12:14:46 1997
***************
*** 1,4 ****
! # Makefile.in,v 1.1 1995/08/15 19:46:48 duane Exp
  
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,4 ----
! # Makefile.in,v 2.1 1997/09/11 16:14:46 sxw Exp
  
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 20,26 ****
  clean:
  	-rm -f $(OBJS) all
  
! realclean: clean
  	-rm -f Makefile
  
  install: all
--- 20,26 ----
  clean:
  	-rm -f $(OBJS) all
  
! distclean: clean
  	-rm -f Makefile
  
  install: all
Index: harvest/components/gatherer/standard/unbinhex/hexbin/Makefile.in
diff -c harvest/components/gatherer/standard/unbinhex/hexbin/Makefile.in:2.0 harvest/components/gatherer/standard/unbinhex/hexbin/Makefile.in:2.1
*** harvest/components/gatherer/standard/unbinhex/hexbin/Makefile.in:2.0	Sun Mar 16 17:09:39 1997
--- harvest/components/gatherer/standard/unbinhex/hexbin/Makefile.in	Thu Sep 11 12:14:47 1997
***************
*** 1,4 ****
! # Makefile.in,v 1.4 1995/11/16 19:26:25 duane Exp
  
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,4 ----
! # Makefile.in,v 2.1 1997/09/11 16:14:47 sxw Exp
  
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 31,37 ****
  clean:
  	-rm -f $(OBJS) $(PROG)
  
! realclean: clean
  	-rm -f Makefile
  
  install:	all
--- 31,37 ----
  clean:
  	-rm -f $(OBJS) $(PROG)
  
! distclean: clean
  	-rm -f Makefile
  
  install:	all
Index: harvest/components/gatherer/standard/unbinhex/util/Makefile.in
diff -c harvest/components/gatherer/standard/unbinhex/util/Makefile.in:2.0 harvest/components/gatherer/standard/unbinhex/util/Makefile.in:2.1
*** harvest/components/gatherer/standard/unbinhex/util/Makefile.in:2.0	Sun Mar 16 17:10:05 1997
--- harvest/components/gatherer/standard/unbinhex/util/Makefile.in	Thu Sep 11 12:14:50 1997
***************
*** 1,4 ****
! # Makefile.in,v 1.1 1995/08/15 19:47:33 duane Exp
  
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,4 ----
! # Makefile.in,v 2.1 1997/09/11 16:14:50 sxw Exp
  
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 20,26 ****
  clean:
  	-rm -f $(OBJS) all
  
! realclean: clean
  	-rm -f Makefile
  
  install: all
--- 20,26 ----
  clean:
  	-rm -f $(OBJS) all
  
! distclean: clean
  	-rm -f Makefile
  
  install: all
Index: harvest/src/Harvest
diff -c harvest/src/Harvest:2.5 harvest/src/Harvest:2.7
*** harvest/src/Harvest:2.5	Tue Apr 22 14:38:14 1997
--- harvest/src/Harvest	Fri Sep  5 10:47:49 1997
***************
*** 17,23 ****
  #	-fake		Doesn't build the Harvest servers.
  #	-protect	Don't change the umask.
  #
! #  Harvest,v 2.5 1997/04/22 18:38:14 sxw Exp
  
  #############################################################################
  #
--- 17,23 ----
  #	-fake		Doesn't build the Harvest servers.
  #	-protect	Don't change the umask.
  #
! #  Harvest,v 2.7 1997/09/05 14:47:49 sxw Exp
  
  #############################################################################
  #
***************
*** 139,148 ****
  }
  $ENV{'EDITOR'} = "vi" if (!defined($ENV{'EDITOR'}));
  $ENV{'TMPDIR'} = "/tmp" if (!defined($ENV{'TMPDIR'}));
! $ENV{'PATH'} = $ENV{'PATH'} . ":" . "$ENV{'HARVEST_HOME'}/bin" .
! 			      ":" . "$ENV{'HARVEST_HOME'}/lib/gatherer". 
! 			      ":" . "$ENV{'HARVEST_HOME'}/lib/broker". 
! 			      ":" . "$ENV{'HARVEST_HOME'}/lib";
  
  print "PATH=$ENV{'PATH'}\n" if ($debug);
  
--- 139,149 ----
  }
  $ENV{'EDITOR'} = "vi" if (!defined($ENV{'EDITOR'}));
  $ENV{'TMPDIR'} = "/tmp" if (!defined($ENV{'TMPDIR'}));
! $ENV{'PATH'} =  "$ENV{'HARVEST_HOME'}/bin" . ":" . 
!                 "$ENV{'HARVEST_HOME'}/lib/gatherer". ":" . 
!                 "$ENV{'HARVEST_HOME'}/lib/broker". ":" . 
!                 "$ENV{'HARVEST_HOME'}/lib" . ":" .
!                 "$ENV{'PATH'}";
  
  print "PATH=$ENV{'PATH'}\n" if ($debug);
  
***************
*** 400,406 ****
   		$vals{'Gatherer-URLs'} = "http://" .  $vals{'Local-WWW-Host'};
   		$vals{'Gatherer-URLs'} .= ":" . $vals{'Local-WWW-Port'}
  			if ($vals{'Local-WWW-Port'} ne "80");
! 		$vals{'Gatherer-URLs'} .= "/\n";
  			
  	} elsif ($vals{'Standard-Configuration'} eq "2") {
  		print <<EOM;
--- 401,407 ----
   		$vals{'Gatherer-URLs'} = "http://" .  $vals{'Local-WWW-Host'};
   		$vals{'Gatherer-URLs'} .= ":" . $vals{'Local-WWW-Port'}
  			if ($vals{'Local-WWW-Port'} ne "80");
! 		$vals{'Gatherer-URLs'} .= "/\tSearch=Depth\n";
  			
  	} elsif ($vals{'Standard-Configuration'} eq "2") {
  		print <<EOM;
***************
*** 415,421 ****
  		while (<STDIN>) {
  			chop;
  			last if (/^\./o);
! 			$vals{'Gatherer-URLs'} .= "http://$_/\n" if (/\S+/o);
  			print "Enter hostname: ";
  		}
  	} elsif ($vals{'Standard-Configuration'} eq "3") {
--- 416,422 ----
  		while (<STDIN>) {
  			chop;
  			last if (/^\./o);
! 			$vals{'Gatherer-URLs'} .= "http://$_/\tSearch=Depth\n" if (/\S+/o);
  			print "Enter hostname: ";
  		}
  	} elsif ($vals{'Standard-Configuration'} eq "3") {
***************
*** 431,437 ****
  		while (<STDIN>) {
  			chop;
  			last if (/^\./o);
! 			$vals{'Gatherer-URLs'} .= "$_\n" if (/\S+/o);
  			print "Enter URL: ";
  		}
  	}
--- 432,438 ----
  		while (<STDIN>) {
  			chop;
  			last if (/^\./o);
! 			$vals{'Gatherer-URLs'} .= "$_\tSearch=Depth\n" if (/\S+/o);
  			print "Enter URL: ";
  		}
  	}
Index: harvest/src/README.debug
diff -c harvest/src/README.debug:2.0 harvest/src/README.debug:2.1
*** harvest/src/README.debug:2.0	Sun Mar 16 17:10:23 1997
--- harvest/src/README.debug	Tue Aug 26 11:23:56 1997
***************
*** 2,8 ****
  To enable debugging use the -D option on the command line, or set the
  environment variable HARVEST_DEBUG.  Examples
  
! 	httpenum -D20,1 -D21,1 -D42,1 http://harvest.cs.colorado.edu
  
  	setenv HARVEST_DEBUG '-D20,1 -D23,1 -D63,1'
  	essence ftp://gatekeeper.dec.com/ls-lR.Z
--- 2,8 ----
  To enable debugging use the -D option on the command line, or set the
  environment variable HARVEST_DEBUG.  Examples
  
! 	httpenum -D20,1 -D21,1 -D42,1 http://tardis.ed.ac.uk/harvest
  
  	setenv HARVEST_DEBUG '-D20,1 -D23,1 -D63,1'
  	essence ftp://gatekeeper.dec.com/ls-lR.Z
Index: harvest/src/configure
diff -c harvest/src/configure:2.1 harvest/src/configure:2.3
*** harvest/src/configure:2.1	Fri May 30 13:49:14 1997
--- harvest/src/configure	Mon Sep 22 12:05:06 1997
***************
*** 523,550 ****
  
  
  
! 
! 
! if test "X$prefix" != "XNONE"; then
!   myprefix="$prefix";
! else
!   myprefix='/usr/local/harvest';
! fi
! 
! INSTALL_TOPDIR="$myprefix";
! INSTALL_LIBDIR="$myprefix/lib";
! INSTALL_BINDIR="$myprefix/bin";
! INSTALL_MANDIR="$myprefix/man";
  
  THIS_HOST="`hostname`"
  XTRA_CFLAGS=''
  XTRA_LIBS=''
  CRYPT_LIB=''
  
- SOCKET_PH_TYPE='default'
- 
  echo '-----------------------'
! echo "Installing Harvest in $myprefix"
  echo '-----------------------'
  
  
--- 523,540 ----
  
  
  
! INSTALL_TOPDIR="$prefix";
! INSTALL_LIBDIR="$prefix/lib";
! INSTALL_BINDIR="$prefix/bin";
! INSTALL_MANDIR="$prefix/man";
  
  THIS_HOST="`hostname`"
  XTRA_CFLAGS=''
  XTRA_LIBS=''
  CRYPT_LIB=''
  
  echo '-----------------------'
! echo "Installing Harvest in $prefix"
  echo '-----------------------'
  
  
***************
*** 555,565 ****
  
  
  
- 
  # 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:563: 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
--- 545,554 ----
  
  
  
  # 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:552: 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
***************
*** 588,594 ****
    # 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:592: 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
--- 577,583 ----
    # 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:581: 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
***************
*** 636,642 ****
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:640: 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.
--- 625,631 ----
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:629: 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.
***************
*** 646,656 ****
  cross_compiling=$ac_cv_prog_cc_cross
  
  cat > conftest.$ac_ext <<EOF
! #line 650 "configure"
  #include "confdefs.h"
  main(){return(0);}
  EOF
! if { (eval echo configure:654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
--- 635,645 ----
  cross_compiling=$ac_cv_prog_cc_cross
  
  cat > conftest.$ac_ext <<EOF
! #line 639 "configure"
  #include "confdefs.h"
  main(){return(0);}
  EOF
! if { (eval echo configure:643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
***************
*** 670,681 ****
    { 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:674: 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:679: 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
--- 659,670 ----
    { 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:663: 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:668: 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
***************
*** 684,690 ****
    yes;
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:688: \"$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
--- 673,679 ----
    yes;
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:677: \"$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
***************
*** 699,705 ****
    ac_save_CFLAGS="$CFLAGS"
    CFLAGS=
    echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:703: 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
--- 688,694 ----
    ac_save_CFLAGS="$CFLAGS"
    CFLAGS=
    echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:692: 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
***************
*** 750,756 ****
  fi
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:754: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
--- 739,745 ----
  fi
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:743: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
***************
*** 765,777 ****
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 769 "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:775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
--- 754,766 ----
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 758 "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:764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
***************
*** 782,794 ****
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 786 "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:792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
--- 771,783 ----
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 775 "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:781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
***************
*** 840,846 ****
  # 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:844: 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
--- 829,835 ----
  # 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:833: 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
***************
*** 892,898 ****
  # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:896: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 881,887 ----
  # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:885: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 923,929 ****
  # 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:927: 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
--- 912,918 ----
  # 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:916: 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
***************
*** 955,961 ****
  # 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:959: 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
--- 944,950 ----
  # 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:948: 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
***************
*** 988,994 ****
    *) ac_lib=l ;;
    esac
    echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
! echo "configure:992: 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
--- 977,983 ----
    *) ac_lib=l ;;
    esac
    echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
! echo "configure:981: 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
***************
*** 996,1002 ****
    ac_save_LIBS="$LIBS"
  LIBS="-l$ac_lib  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1000 "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
--- 985,991 ----
    ac_save_LIBS="$LIBS"
  LIBS="-l$ac_lib  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 989 "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
***************
*** 1007,1013 ****
  yywrap()
  ; return 0; }
  EOF
! if { (eval echo configure:1011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 996,1002 ----
  yywrap()
  ; return 0; }
  EOF
! if { (eval echo configure:1000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1030,1036 ****
  fi
  
  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
! echo "configure:1034: checking whether ln -s works" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1019,1025 ----
  fi
  
  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
! echo "configure:1023: checking whether ln -s works" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1054,1060 ****
  # Extract the first word of "true", so it can be a program name with args.
  set dummy true; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1058: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_CMD_TRUE'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1043,1049 ----
  # Extract the first word of "true", so it can be a program name with args.
  set dummy true; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1047: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_CMD_TRUE'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1085,1091 ****
  # Extract the first word of "false", so it can be a program name with args.
  set dummy false; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1089: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_CMD_FALSE'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1074,1080 ----
  # Extract the first word of "false", so it can be a program name with args.
  set dummy false; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1078: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_CMD_FALSE'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1116,1122 ****
  # Extract the first word of "rm", so it can be a program name with args.
  set dummy rm; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1120: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1105,1111 ----
  # Extract the first word of "rm", so it can be a program name with args.
  set dummy rm; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1109: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1148,1154 ****
  # Extract the first word of "mv", so it can be a program name with args.
  set dummy mv; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1152: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1137,1143 ----
  # Extract the first word of "mv", so it can be a program name with args.
  set dummy mv; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1141: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1180,1186 ****
  # Extract the first word of "mkdir", so it can be a program name with args.
  set dummy mkdir; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1184: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_MKDIR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1169,1175 ----
  # Extract the first word of "mkdir", so it can be a program name with args.
  set dummy mkdir; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1173: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_MKDIR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1212,1218 ****
  # Extract the first word of "ln", so it can be a program name with args.
  set dummy ln; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1216: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_LN'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1201,1207 ----
  # Extract the first word of "ln", so it can be a program name with args.
  set dummy ln; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1205: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_LN'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1244,1250 ****
  # 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:1248: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_CMD_PERL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1233,1239 ----
  # 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:1237: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_CMD_PERL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1276,1282 ****
  # Extract the first word of "gzip", so it can be a program name with args.
  set dummy gzip; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1280: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_CMD_GZIP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1265,1271 ----
  # Extract the first word of "gzip", so it can be a program name with args.
  set dummy gzip; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1269: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_CMD_GZIP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1308,1314 ****
  # Extract the first word of "gunzip", so it can be a program name with args.
  set dummy gunzip; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1312: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_CMD_GUNZIP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1297,1303 ----
  # Extract the first word of "gunzip", so it can be a program name with args.
  set dummy gunzip; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1301: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_CMD_GUNZIP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1340,1346 ****
  # Extract the first word of "uncompress", so it can be a program name with args.
  set dummy uncompress; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1344: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_CMD_UNCOMPRESS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1329,1335 ----
  # Extract the first word of "uncompress", so it can be a program name with args.
  set dummy uncompress; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1333: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_CMD_UNCOMPRESS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1372,1378 ****
  # Extract the first word of "unzip", so it can be a program name with args.
  set dummy unzip; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1376: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_CMD_UNZIP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1361,1367 ----
  # Extract the first word of "unzip", so it can be a program name with args.
  set dummy unzip; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1365: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_CMD_UNZIP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1422,1433 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
! echo "configure:1426: checking for $ac_hdr that defines DIR" >&5
  if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1431 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_hdr>
--- 1411,1422 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
! echo "configure:1415: checking for $ac_hdr that defines DIR" >&5
  if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1420 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_hdr>
***************
*** 1435,1441 ****
  DIR *dirp = 0;
  ; return 0; }
  EOF
! if { (eval echo configure:1439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_header_dirent_$ac_safe=yes"
  else
--- 1424,1430 ----
  DIR *dirp = 0;
  ; return 0; }
  EOF
! if { (eval echo configure:1428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_header_dirent_$ac_safe=yes"
  else
***************
*** 1460,1466 ****
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
  echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
! echo "configure:1464: checking for opendir in -ldir" >&5
  ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1449,1455 ----
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
  echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
! echo "configure:1453: checking for opendir in -ldir" >&5
  ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1468,1474 ****
    ac_save_LIBS="$LIBS"
  LIBS="-ldir  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1472 "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
--- 1457,1463 ----
    ac_save_LIBS="$LIBS"
  LIBS="-ldir  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1461 "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
***************
*** 1479,1485 ****
  opendir()
  ; return 0; }
  EOF
! if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1468,1474 ----
  opendir()
  ; return 0; }
  EOF
! if { (eval echo configure:1472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1501,1507 ****
  
  else
  echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
! echo "configure:1505: checking for opendir in -lx" >&5
  ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1490,1496 ----
  
  else
  echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
! echo "configure:1494: checking for opendir in -lx" >&5
  ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1509,1515 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lx  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1513 "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
--- 1498,1504 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lx  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1502 "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
***************
*** 1520,1526 ****
  opendir()
  ; return 0; }
  EOF
! if { (eval echo configure:1524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1509,1515 ----
  opendir()
  ; return 0; }
  EOF
! if { (eval echo configure:1513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1543,1554 ****
  fi
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:1547: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1552 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
--- 1532,1543 ----
  fi
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:1536: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1541 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
***************
*** 1556,1562 ****
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 1545,1551 ----
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
***************
*** 1573,1579 ****
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 1577 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
--- 1562,1568 ----
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 1566 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
***************
*** 1591,1597 ****
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 1595 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
--- 1580,1586 ----
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 1584 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
***************
*** 1612,1618 ****
    :
  else
    cat > conftest.$ac_ext <<EOF
! #line 1616 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--- 1601,1607 ----
    :
  else
    cat > conftest.$ac_ext <<EOF
! #line 1605 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
***************
*** 1623,1629 ****
  exit (0); }
  
  EOF
! if { (eval echo configure:1627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    :
  else
--- 1612,1618 ----
  exit (0); }
  
  EOF
! if { (eval echo configure:1616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    :
  else
***************
*** 1653,1669 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:1657: 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 1662 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 1642,1658 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:1646: 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 1651 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
***************
*** 1690,1696 ****
  done
  
  cat > conftest.$ac_ext <<EOF
! #line 1694 "configure"
  #include "confdefs.h"
  #include <malloc.h>
  EOF
--- 1679,1685 ----
  done
  
  cat > conftest.$ac_ext <<EOF
! #line 1683 "configure"
  #include "confdefs.h"
  #include <malloc.h>
  EOF
***************
*** 1706,1712 ****
  
  
  echo $ac_n "checking size of int""... $ac_c" 1>&6
! echo "configure:1710: checking size of int" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1695,1701 ----
  
  
  echo $ac_n "checking size of int""... $ac_c" 1>&6
! echo "configure:1699: checking size of int" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1714,1720 ****
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
! #line 1718 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
--- 1703,1709 ----
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
! #line 1707 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
***************
*** 1725,1731 ****
    exit(0);
  }
  EOF
! if { (eval echo configure:1729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_int=`cat conftestval`
  else
--- 1714,1720 ----
    exit(0);
  }
  EOF
! if { (eval echo configure:1718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_int=`cat conftestval`
  else
***************
*** 1745,1751 ****
  
  
  echo $ac_n "checking size of long""... $ac_c" 1>&6
! echo "configure:1749: 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
--- 1734,1740 ----
  
  
  echo $ac_n "checking size of long""... $ac_c" 1>&6
! echo "configure:1738: 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
***************
*** 1753,1759 ****
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
! #line 1757 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
--- 1742,1748 ----
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
! #line 1746 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
***************
*** 1764,1770 ****
    exit(0);
  }
  EOF
! if { (eval echo configure:1768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long=`cat conftestval`
  else
--- 1753,1759 ----
    exit(0);
  }
  EOF
! if { (eval echo configure:1757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long=`cat conftestval`
  else
***************
*** 1784,1795 ****
  
  
  echo $ac_n "checking for working const""... $ac_c" 1>&6
! echo "configure:1788: checking for working const" >&5
  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1793 "configure"
  #include "confdefs.h"
  
  int main() {
--- 1773,1784 ----
  
  
  echo $ac_n "checking for working const""... $ac_c" 1>&6
! echo "configure:1777: checking for working const" >&5
  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1782 "configure"
  #include "confdefs.h"
  
  int main() {
***************
*** 1838,1844 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:1842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
  else
--- 1827,1833 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:1831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
  else
***************
*** 1866,1877 ****
  	      strftime sysconf timegm usleep vfork
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:1870: 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 <<EOF
! #line 1875 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 1855,1866 ----
  	      strftime sysconf timegm usleep vfork
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:1859: 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 <<EOF
! #line 1864 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 1894,1900 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:1898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 1883,1889 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:1887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 1921,1927 ****
  
  
  echo $ac_n "checking for main in -lmalloc""... $ac_c" 1>&6
! echo "configure:1925: checking for main in -lmalloc" >&5
  ac_lib_var=`echo malloc'_'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
--- 1910,1916 ----
  
  
  echo $ac_n "checking for main in -lmalloc""... $ac_c" 1>&6
! echo "configure:1914: checking for main in -lmalloc" >&5
  ac_lib_var=`echo malloc'_'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
***************
*** 1929,1942 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lmalloc  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1933 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:1940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1918,1931 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lmalloc  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1922 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:1929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1958,1964 ****
  
  
  echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6
! echo "configure:1962: checking for main in -lresolv" >&5
  ac_lib_var=`echo resolv'_'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
--- 1947,1953 ----
  
  
  echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6
! echo "configure:1951: checking for main in -lresolv" >&5
  ac_lib_var=`echo resolv'_'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
***************
*** 1966,1979 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1970 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:1977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1955,1968 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1959 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:1966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1994,2000 ****
  fi
  
  echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
! echo "configure:1998: checking for main in -lsocket" >&5
  ac_lib_var=`echo socket'_'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
--- 1983,1989 ----
  fi
  
  echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
! echo "configure:1987: checking for main in -lsocket" >&5
  ac_lib_var=`echo socket'_'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
***************
*** 2002,2015 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2006 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:2013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1991,2004 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1995 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:2002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2030,2036 ****
  fi
  
  echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
! echo "configure:2034: 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
--- 2019,2025 ----
  fi
  
  echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
! echo "configure:2023: 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
***************
*** 2038,2051 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2042 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:2049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 2027,2040 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2031 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:2038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2067,2073 ****
  
  
  echo $ac_n "checking for inet_aton in -l44bsd""... $ac_c" 1>&6
! echo "configure:2071: checking for inet_aton in -l44bsd" >&5
  ac_lib_var=`echo 44bsd'_'inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2056,2062 ----
  
  
  echo $ac_n "checking for inet_aton in -l44bsd""... $ac_c" 1>&6
! echo "configure:2060: checking for inet_aton in -l44bsd" >&5
  ac_lib_var=`echo 44bsd'_'inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2075,2081 ****
    ac_save_LIBS="$LIBS"
  LIBS="-l44bsd  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2079 "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
--- 2064,2070 ----
    ac_save_LIBS="$LIBS"
  LIBS="-l44bsd  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2068 "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
***************
*** 2086,2092 ****
  inet_aton()
  ; return 0; }
  EOF
! if { (eval echo configure:2090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 2075,2081 ----
  inet_aton()
  ; return 0; }
  EOF
! if { (eval echo configure:2079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2107,2113 ****
  fi
  
  echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
! echo "configure:2111: checking for inet_aton in -lresolv" >&5
  ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2096,2102 ----
  fi
  
  echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
! echo "configure:2100: checking for inet_aton in -lresolv" >&5
  ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2115,2121 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2119 "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
--- 2104,2110 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2108 "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
***************
*** 2126,2132 ****
  inet_aton()
  ; return 0; }
  EOF
! if { (eval echo configure:2130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 2115,2121 ----
  inet_aton()
  ; return 0; }
  EOF
! if { (eval echo configure:2119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2148,2154 ****
  
  
  echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
! echo "configure:2152: checking for crypt in -lcrypt" >&5
  ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2137,2143 ----
  
  
  echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
! echo "configure:2141: checking for crypt in -lcrypt" >&5
  ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2156,2162 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lcrypt  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2160 "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
--- 2145,2151 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lcrypt  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2149 "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
***************
*** 2167,2173 ****
  crypt()
  ; return 0; }
  EOF
! if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 2156,2162 ----
  crypt()
  ; return 0; }
  EOF
! if { (eval echo configure:2160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2189,2195 ****
  
  
  echo $ac_n "checking for main in -ldbm""... $ac_c" 1>&6
! echo "configure:2193: checking for main in -ldbm" >&5
  ac_lib_var=`echo dbm'_'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
--- 2178,2184 ----
  
  
  echo $ac_n "checking for main in -ldbm""... $ac_c" 1>&6
! echo "configure:2182: checking for main in -ldbm" >&5
  ac_lib_var=`echo dbm'_'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
***************
*** 2197,2210 ****
    ac_save_LIBS="$LIBS"
  LIBS="-ldbm  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2201 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:2208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 2186,2199 ----
    ac_save_LIBS="$LIBS"
  LIBS="-ldbm  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2190 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:2197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2232,2238 ****
  fi
  
  echo $ac_n "checking for main in -lndbm""... $ac_c" 1>&6
! echo "configure:2236: checking for main in -lndbm" >&5
  ac_lib_var=`echo ndbm'_'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
--- 2221,2227 ----
  fi
  
  echo $ac_n "checking for main in -lndbm""... $ac_c" 1>&6
! echo "configure:2225: checking for main in -lndbm" >&5
  ac_lib_var=`echo ndbm'_'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
***************
*** 2240,2253 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lndbm  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2244 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:2251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 2229,2242 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lndbm  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2233 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:2240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2290,2301 ****
  fi
  
  echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
! echo "configure:2294: checking for st_blksize in struct stat" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2299 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/stat.h>
--- 2279,2290 ----
  fi
  
  echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
! echo "configure:2283: checking for st_blksize in struct stat" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2288 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/stat.h>
***************
*** 2303,2309 ****
  struct stat s; s.st_blksize;
  ; return 0; }
  EOF
! if { (eval echo configure:2307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_st_blksize=yes
  else
--- 2292,2298 ----
  struct stat s; s.st_blksize;
  ; return 0; }
  EOF
! if { (eval echo configure:2296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_st_blksize=yes
  else
***************
*** 2326,2344 ****
  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
! echo "configure:2330: checking for working alloca.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2335 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
  char *p = alloca(2 * sizeof(int));
  ; return 0; }
  EOF
! if { (eval echo configure:2342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
  else
--- 2315,2333 ----
  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
! echo "configure:2319: checking for working alloca.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2324 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
  char *p = alloca(2 * sizeof(int));
  ; return 0; }
  EOF
! if { (eval echo configure:2331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
  else
***************
*** 2359,2370 ****
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
! echo "configure:2363: checking for alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2368 "configure"
  #include "confdefs.h"
  
  #ifdef __GNUC__
--- 2348,2359 ----
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
! echo "configure:2352: checking for alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2357 "configure"
  #include "confdefs.h"
  
  #ifdef __GNUC__
***************
*** 2387,2393 ****
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
! if { (eval echo configure:2391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
  else
--- 2376,2382 ----
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
! if { (eval echo configure:2380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
  else
***************
*** 2419,2430 ****
  
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
! echo "configure:2423: checking whether alloca needs Cray hooks" >&5
  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2428 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
--- 2408,2419 ----
  
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
! echo "configure:2412: checking whether alloca needs Cray hooks" >&5
  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2417 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
***************
*** 2449,2460 ****
  if test $ac_cv_os_cray = yes; then
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2453: 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 <<EOF
! #line 2458 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2438,2449 ----
  if test $ac_cv_os_cray = yes; then
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2442: 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 <<EOF
! #line 2447 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 2477,2483 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 2466,2472 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 2504,2510 ****
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
! echo "configure:2508: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2493,2499 ----
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
! echo "configure:2497: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 2512,2518 ****
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
! #line 2516 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
--- 2501,2507 ----
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
! #line 2505 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
***************
*** 2531,2537 ****
    exit (find_stack_direction() < 0);
  }
  EOF
! if { (eval echo configure:2535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
--- 2520,2526 ----
    exit (find_stack_direction() < 0);
  }
  EOF
! if { (eval echo configure:2524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
***************
*** 2553,2564 ****
  fi
  
  echo $ac_n "checking for off_t""... $ac_c" 1>&6
! echo "configure:2557: checking for off_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2562 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
--- 2542,2553 ----
  fi
  
  echo $ac_n "checking for off_t""... $ac_c" 1>&6
! echo "configure:2546: checking for off_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2551 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
***************
*** 2586,2597 ****
  fi
  
  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
! echo "configure:2590: checking for uid_t in sys/types.h" >&5
  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2595 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  EOF
--- 2575,2586 ----
  fi
  
  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
! echo "configure:2579: checking for uid_t in sys/types.h" >&5
  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2584 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  EOF
***************
*** 2643,2654 ****
  fi
  
  
- if test -x "/bin/uname"; then
- 	if /bin/uname -sr | grep 'SunOS 5.0-9' >/dev/null 2>&1; then
- 		SOCKET_PH_TYPE="Solaris";
- 	fi
- fi
- 
  if test "HP-UX" = "$XXMyOs"; then
  	RANLIB=":";
  fi
--- 2632,2637 ----
***************
*** 2757,2762 ****
--- 2740,2746 ----
  ac_given_INSTALL="$INSTALL"
  
  trap 'rm -fr `echo "\
+ 	Makefile \
  	broker/Makefile \
  	common/Makefile \
  	common/gdbm/Makefile \
***************
*** 2812,2818 ****
  s%@INSTALL_MANDIR@%$INSTALL_MANDIR%g
  s%@XTRA_CFLAGS@%$XTRA_CFLAGS%g
  s%@THIS_HOST@%$THIS_HOST%g
- s%@SOCKET_PH_TYPE@%$SOCKET_PH_TYPE%g
  s%@CC@%$CC%g
  s%@CPP@%$CPP%g
  s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
--- 2796,2801 ----
***************
*** 2881,2886 ****
--- 2864,2870 ----
  cat >> $CONFIG_STATUS <<EOF
  
  CONFIG_FILES=\${CONFIG_FILES-"\
+ 	Makefile \
  	broker/Makefile \
  	common/Makefile \
  	common/gdbm/Makefile \
Index: harvest/src/configure.in
diff -c harvest/src/configure.in:2.2 harvest/src/configure.in:2.4
*** harvest/src/configure.in:2.2	Fri May 30 13:49:16 1997
--- harvest/src/configure.in	Mon Sep 22 12:05:08 1997
***************
*** 1,7 ****
  dnl
  dnl  Configuration input file for Harvest
  dnl
! dnl  configure.in,v 2.2 1997/05/30 17:49:16 sxw Exp
  dnl
  
  AC_PREREQ(2.12)
--- 1,7 ----
  dnl
  dnl  Configuration input file for Harvest
  dnl
! dnl  configure.in,v 2.4 1997/09/22 16:05:08 sxw Exp
  dnl
  
  AC_PREREQ(2.12)
***************
*** 12,40 ****
  AC_CONFIG_HEADER(common/include/autoconf.h)
  AC_PREFIX_DEFAULT(/usr/local/harvest)
  
! 
! dnl Build a copy of prefix
! 
! if test "X$prefix" != "XNONE"; then
!   myprefix="$prefix";
! else
!   myprefix='/usr/local/harvest';
! fi
! 
! INSTALL_TOPDIR="$myprefix";
! INSTALL_LIBDIR="$myprefix/lib";
! INSTALL_BINDIR="$myprefix/bin";
! INSTALL_MANDIR="$myprefix/man";
  
  THIS_HOST="`hostname`"
  XTRA_CFLAGS=''
  XTRA_LIBS=''
  CRYPT_LIB=''
  
- SOCKET_PH_TYPE='default'
- 
  echo '-----------------------'
! echo "Installing Harvest in $myprefix"
  echo '-----------------------'
  
  dnl Subsitutions
--- 12,29 ----
  AC_CONFIG_HEADER(common/include/autoconf.h)
  AC_PREFIX_DEFAULT(/usr/local/harvest)
  
! INSTALL_TOPDIR="$prefix";
! INSTALL_LIBDIR="$prefix/lib";
! INSTALL_BINDIR="$prefix/bin";
! INSTALL_MANDIR="$prefix/man";
  
  THIS_HOST="`hostname`"
  XTRA_CFLAGS=''
  XTRA_LIBS=''
  CRYPT_LIB=''
  
  echo '-----------------------'
! echo "Installing Harvest in $prefix"
  echo '-----------------------'
  
  dnl Subsitutions
***************
*** 45,51 ****
  AC_SUBST(DEFS)
  AC_SUBST(XTRA_CFLAGS)
  AC_SUBST(THIS_HOST)
- AC_SUBST(SOCKET_PH_TYPE)
  
  dnl Check for GNU cc
  AC_PROG_CC
--- 34,39 ----
***************
*** 210,222 ****
  fi
  AC_SUBST(DEBUG_TOP)
  
- dnl Try to see if we're on Solaris or not
- if test -x "/bin/uname"; then
- 	if /bin/uname -sr | grep 'SunOS 5.[0-9]' >/dev/null 2>&1; then
- 		SOCKET_PH_TYPE="Solaris";
- 	fi
- fi
- 
  dnl Try to see if we're on HP-UX or not
  if test "HP-UX" = "$XXMyOs"; then
  	RANLIB=":";
--- 198,203 ----
***************
*** 226,231 ****
--- 207,213 ----
  rm -f core 
  
  AC_OUTPUT(\
+ 	Makefile \
  	broker/Makefile \
  	common/Makefile \
  	common/gdbm/Makefile \
Index: harvest/src/broker/CreateBroker
diff -c harvest/src/broker/CreateBroker:2.1 harvest/src/broker/CreateBroker:2.2
*** harvest/src/broker/CreateBroker:2.1	Wed Mar 19 18:03:49 1997
--- harvest/src/broker/CreateBroker	Wed Sep  3 07:52:41 1997
***************
*** 8,14 ****
  #
  #  	For example, CreateBroker /usr/local/harvest/brokers/skeleton
  #
! #  CreateBroker,v 2.1 1997/03/19 23:03:49 sxw Exp
  #
  #############################################################################
  #
--- 8,14 ----
  #
  #  	For example, CreateBroker /usr/local/harvest/brokers/skeleton
  #
! #  CreateBroker,v 2.2 1997/09/03 11:52:41 sxw Exp
  #
  #############################################################################
  #
***************
*** 115,123 ****
  #  
  #
  $ENV{'HARVEST_HOME'} = "/usr/local/harvest" if (!defined($ENV{'HARVEST_HOME'}));
! $ENV{'PATH'} = $ENV{'PATH'} . ":" . "$ENV{'HARVEST_HOME'}/bin" .
! 			      ":" . "$ENV{'HARVEST_HOME'}/lib/broker". 
! 			      ":" . "$ENV{'HARVEST_HOME'}/lib";
  $whoami_cmd = "whoami";
  $whoami_cmd = "/bin/whoami" if (-x "/bin/whoami");
  $whoami_cmd = "/usr/bin/whoami" if (-x "/usr/bin/whoami");
--- 115,125 ----
  #  
  #
  $ENV{'HARVEST_HOME'} = "/usr/local/harvest" if (!defined($ENV{'HARVEST_HOME'}));
! $ENV{'PATH'} = "$ENV{'HARVEST_HOME'}/bin" . ":" . 
!                "$ENV{'HARVEST_HOME'}/lib/broker". ":" . 
!                "$ENV{'HARVEST_HOME'}/lib" . ":" .
!                "$ENV{'PATH'}";
! 
  $whoami_cmd = "whoami";
  $whoami_cmd = "/bin/whoami" if (-x "/bin/whoami");
  $whoami_cmd = "/usr/bin/whoami" if (-x "/usr/bin/whoami");
Index: harvest/src/broker/Makefile.in
diff -c harvest/src/broker/Makefile.in:2.2 harvest/src/broker/Makefile.in:2.3
*** harvest/src/broker/Makefile.in:2.2	Tue Mar 25 16:35:19 1997
--- harvest/src/broker/Makefile.in	Thu Sep 11 12:14:57 1997
***************
*** 1,9 ****
  #
  #  Makefile for the Harvest Broker
  #
! #  William G. Camargo & Darren Hardy, July 1994
! #
! #  Makefile.in,v 2.2 1997/03/25 21:35:19 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,7 ----
  #
  #  Makefile for the Harvest Broker
  #
! #  Makefile.in,v 2.3 1997/09/11 16:14:57 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 97,103 ****
  clean:
  	-rm -f core *.o broker gather dumpregistry brkclient y.tab.c y.tab.h lex.yy.c tags $(INDEX_OBJS)
  
! realclean:	clean
  	-rm -f Makefile
  
  install: all
--- 95,101 ----
  clean:
  	-rm -f core *.o broker gather dumpregistry brkclient y.tab.c y.tab.h lex.yy.c tags $(INDEX_OBJS)
  
! distclean:	clean
  	-rm -f Makefile
  
  install: all
***************
*** 119,121 ****
--- 117,120 ----
  
  brkclient:	brkclient.o
  	$(CC) -o $@ $@.o $(LDFLAGS) $(XTRA_LIBS)
+ 
Index: harvest/src/broker/broker.h
diff -c harvest/src/broker/broker.h:2.1 harvest/src/broker/broker.h:2.2
*** harvest/src/broker/broker.h:2.1	Fri Mar 21 12:19:51 1997
--- harvest/src/broker/broker.h	Tue Jul 22 08:37:36 1997
***************
*** 4,10 ****
   *  DEBUG: none
   *  AUTHOR: Harvest derived
   *
!  *  broker.h,v 2.1 1997/03/21 17:19:51 sxw Exp
   *
   *  Harvest Indexer http://www.tardis.ed.ac.uk/harvest/
   *  ---------------------------------------------------
--- 4,10 ----
   *  DEBUG: none
   *  AUTHOR: Harvest derived
   *
!  *  broker.h,v 2.2 1997/07/22 12:37:36 sxw Exp
   *
   *  Harvest Indexer http://www.tardis.ed.ac.uk/harvest/
   *  ---------------------------------------------------
***************
*** 174,182 ****
  #ifndef QM_RET_EMBED_ATT
  #define QM_RET_EMBED_ATT
  #endif
- 
- #define USE_GLIMPSE	1
- #define USE_WAIS	1
  
  /* ============ Return Values =========== */
  /* we want to always redefine these values */
--- 174,179 ----
Index: harvest/src/broker/Glimpse/index.c
diff -c harvest/src/broker/Glimpse/index.c:2.6 harvest/src/broker/Glimpse/index.c:2.7
*** harvest/src/broker/Glimpse/index.c:2.6	Thu Jul 10 12:45:14 1997
--- harvest/src/broker/Glimpse/index.c	Thu Sep 18 14:30:17 1997
***************
*** 1,4 ****
! static char rcsid[] = "index.c,v 2.6 1997/07/10 16:45:14 sxw Exp";
  /* 
   *  index.c -- Broker indexing/search support using Glimpse
   *
--- 1,4 ----
! static char rcsid[] = "index.c,v 2.7 1997/09/18 18:30:17 sxw Exp";
  /* 
   *  index.c -- Broker indexing/search support using Glimpse
   *
***************
*** 170,175 ****
--- 170,176 ----
  LOCAL int GL_wordflag;
  LOCAL int GL_errflag;
  LOCAL int GL_regexflag;
+ LOCAL int GL_noregex;
  LOCAL int GL_maxresults = 0;	/* old way */
  LOCAL int GL_maxlines = 0;	/* new way */
  LOCAL int GL_maxfiles = 0;	/* new way */
***************
*** 1092,1097 ****
--- 1093,1102 ----
  	if (GL_caseflag == 1) {
  		strcat(commandstr, " -i");
  	}
+ 	/* If regexes are disabled */
+ 	if (GL_noregex == 1) {
+ 	        strcat(commandstr, " -k");
+ 	}
  	/* Generate Glimpse pattern to search */
  	patstr = GL_do_qlist(ql);
  
***************
*** 1226,1231 ****
--- 1231,1237 ----
  	GL_maxlines = 0;	/* Max number of lines per object */
  	GL_illegal_query = 0;	/* Is Glimpse capable of this query */
  	GL_regexflag = 0;	/* RE or not? */
+ 	GL_noregex = 0;         /* Explicitly disable regexes */
  }
  
  /* ----------------------------------------------------------------- *
***************
*** 1287,1292 ****
--- 1293,1302 ----
  		GL_maxfiles = atoi(val);
  		if (GL_maxfiles < 1)
  			GL_maxfiles = 0;
+ 		return;
+ 	}
+ 	if (strcasecmp(flag, "noregex") == 0) {
+ 	        GL_noregex=1;
  		return;
  	}
  	GL_illegal_query = 1;
Index: harvest/src/broker/example/brokers/queryhelp.html
diff -c harvest/src/broker/example/brokers/queryhelp.html:2.2 harvest/src/broker/example/brokers/queryhelp.html:2.4
*** harvest/src/broker/example/brokers/queryhelp.html:2.2	Sat Apr 19 10:15:10 1997
--- harvest/src/broker/example/brokers/queryhelp.html	Tue Aug 26 10:56:50 1997
***************
*** 1,6 ****
  <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
  
! <!--- queryhelp.html,v 2.2 1997/04/19 14:15:10 sxw Exp -->
  
  <HTML>
  <HEAD>
--- 1,6 ----
  <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
  
! <!-- queryhelp.html,v 2.4 1997/08/26 14:56:50 sxw Exp -->
  
  <HTML>
  <HEAD>
***************
*** 46,51 ****
--- 46,53 ----
  <LI> a limited form of regular expressions (e.g., allowing "wild card"
  expressions that match all words ending in a particular suffix).
  
+ <LI> negation of selections using the NOT operator.
+ 
  </UL>
  The different types of queries (and how to use them) are discussed below.
  Note that you use the same syntax regardless of what index/search engine is
***************
*** 95,100 ****
--- 97,108 ----
  	Arizona AND desert</pre>
  This query will return all objects in the Broker that contain both words
  anywhere in the object in any order.<p>
+ 
+ Negated query:
+ <pre>
+ 	Arizona AND NOT desert</pre>
+ This query will return all objects in the Broker that contain the word Arizona,
+ and don't contain the word dessert.<p>
  
  Phrase query: 
  <pre>
Index: harvest/src/broker/example/brokers/skeleton/admin/admin.html.in
diff -c harvest/src/broker/example/brokers/skeleton/admin/admin.html.in:2.2 harvest/src/broker/example/brokers/skeleton/admin/admin.html.in:2.3
*** harvest/src/broker/example/brokers/skeleton/admin/admin.html.in:2.2	Mon Apr 21 12:48:09 1997
--- harvest/src/broker/example/brokers/skeleton/admin/admin.html.in	Wed Aug 27 13:19:50 1997
***************
*** 13,19 ****
  for help on Broker administation commands.
  
  <HR>
! <FORM METHOD="GET" ACTION="http://@THIS_HTTP_HOST@/Harvest/cgi-bin/BrokerAdmin.cgi">
  <dl>
  <dt>Command:<dd>
  <SELECT NAME="command" SIZE=1>
--- 13,19 ----
  for help on Broker administation commands.
  
  <HR>
! <FORM METHOD="POST" ACTION="http://@THIS_HTTP_HOST@/Harvest/cgi-bin/BrokerAdmin.pl.cgi">
  <dl>
  <dt>Command:<dd>
  <SELECT NAME="command" SIZE=1>
Index: harvest/src/common/Makefile.in
diff -c harvest/src/common/Makefile.in:2.0 harvest/src/common/Makefile.in:2.2
*** harvest/src/common/Makefile.in:2.0	Sun Mar 16 17:12:46 1997
--- harvest/src/common/Makefile.in	Thu Sep 11 13:14:33 1997
***************
*** 1,7 ****
  #
  #  Makefile for the common source directory
  #
! #  Makefile.in,v 1.15 1995/08/21 20:26:38 duane Exp
  #
  SUBDIRS		= md5 util url template regex
  
--- 1,7 ----
  #
  #  Makefile for the common source directory
  #
! #  Makefile.in,v 2.2 1997/09/11 17:14:33 sxw Exp
  #
  SUBDIRS		= md5 util url template regex
  
***************
*** 19,88 ****
  XTRA_LIBS	= @XTRA_LIBS@
  DEBUG_TOP	= @DEBUG_TOP@
  
! # old variables for backward compatability
! INSTALLDIR 	= $(INSTALL_BINDIR)
! INSTALL_SCRIPT 	= $(INSTALL_BIN)
! 
! INSTALL_DIRS	= $(prefix) $(INSTALL_BINDIR) $(INSTALL_LIBDIR) \
! 		  $(INSTALL_MANDIR)
! 
! all:	all-gdbm
! 	@for dir in $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 			RANLIB="$(RANLIB)" \
! 			DEBUG_TOP="$(DEBUG_TOP)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			INSTALLDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_SCRIPT="$(INSTALL_SCRIPT)"  $@); \
! 	done
! 
! install: all
! 	@for dir in $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 			RANLIB="$(RANLIB)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			INSTALLDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_SCRIPT="$(INSTALL_SCRIPT)" $@); \
! 	done
! 
! clean:
! 	-@for dir in gdbm lib $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 			RANLIB="$(RANLIB)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			INSTALLDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_SCRIPT="$(INSTALL_SCRIPT)" $@); \
! 	done
! 
! realclean:	clean
! 	-rm -f Makefile include/autoconf.h include/paths.h config.status *~ core
! 	-@for dir in gdbm lib $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 			RANLIB="$(RANLIB)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			INSTALLDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_SCRIPT="$(INSTALL_SCRIPT)"  $@); \
! 	done
  
  #
  #  Compiles and installs gdbm from scratch.  Works with gdbm-1.7.3
--- 19,39 ----
  XTRA_LIBS	= @XTRA_LIBS@
  DEBUG_TOP	= @DEBUG_TOP@
  
! all: this-all do-all
! clean: do-clean this-clean
! distclean: do-distclean this-distclean
! install: do-install
! 
! this-all:	all-gdbm
! 
! this-clean:
! 	@(cd gdbm; $(MAKE) $(MFLAGS) clean)
! 	-rm -f lib/*.a include/gdbm.h
! 
! this-distclean:	this-clean
! 	@(cd gdbm; $(MAKE) $(MFLAGS) distclean)
! 	-rm -f Makefile include/autoconf.h include/paths.h config.status core
! 
  
  #
  #  Compiles and installs gdbm from scratch.  Works with gdbm-1.7.3
***************
*** 90,98 ****
  all-gdbm:
  	@echo Making all in gdbm
  	rm -f gdbm/autoconf.h
! 	$(LN_S) ../include/autoconf.h gdbm/autoconf.h
! 	(cd gdbm; $(MAKE) $(MFLAGS) gdbm.h libgdbm.a; \
! 		  $(INSTALL_FILE) gdbm.h ../include/gdbm.h; \
! 		  $(INSTALL_FILE) libgdbm.a ../lib/libgdbm.a; \
! 		  $(RANLIB) ../lib/libgdbm.a \
! 	)
--- 41,59 ----
  all-gdbm:
  	@echo Making all in gdbm
  	rm -f gdbm/autoconf.h
! 	@if (cd gdbm; $(LN_S) ../include/autoconf.h autoconf.h; \
! 	  	      $(MAKE) $(MFLAGS) gdbm.h libgdbm.a; ); \
! 	then true; else exit 1; fi;
! 	$(INSTALL_FILE) gdbm/gdbm.h include/gdbm.h; \
! 	$(INSTALL_FILE) gdbm/libgdbm.a lib/libgdbm.a; \
! 	$(RANLIB) lib/libgdbm.a
! 
! DO_X = do-clean do-distclean do-all do-install
! 
! $(DO_X):
! 	@target=`echo $@ | sed -e 's/^do-//'`; \
! 	for dir in $(SUBDIRS); do \
! 	echo Making $$target in $$dir; \
! 	if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
! 	then true; else exit 1; fi; \
! 	done    
Index: harvest/src/common/include/autoconf.h.in
diff -c harvest/src/common/include/autoconf.h.in:2.0 harvest/src/common/include/autoconf.h.in:2.1
*** harvest/src/common/include/autoconf.h.in:2.0	Sun Mar 16 17:14:17 1997
--- harvest/src/common/include/autoconf.h.in	Fri Sep 19 11:45:55 1997
***************
*** 28,36 ****
  /* If using the C implementation of alloca, define if you know the
     direction of stack growth for your system; otherwise it will be
     automatically deduced at run-time.
! 	STACK_DIRECTION > 0 => grows toward higher addresses
! 	STACK_DIRECTION < 0 => grows toward lower addresses
! 	STACK_DIRECTION = 0 => direction of growth unknown
   */
  #undef STACK_DIRECTION
  
--- 28,36 ----
  /* If using the C implementation of alloca, define if you know the
     direction of stack growth for your system; otherwise it will be
     automatically deduced at run-time.
!  STACK_DIRECTION > 0 => grows toward higher addresses
!  STACK_DIRECTION < 0 => grows toward lower addresses
!  STACK_DIRECTION = 0 => direction of growth unknown
   */
  #undef STACK_DIRECTION
  
Index: harvest/src/common/include/paths.h.in
diff -c harvest/src/common/include/paths.h.in:2.0 harvest/src/common/include/paths.h.in:2.1
*** harvest/src/common/include/paths.h.in:2.0	Sun Mar 16 17:14:28 1997
--- harvest/src/common/include/paths.h.in	Mon Sep 22 12:05:09 1997
***************
*** 1,6 ****
--- 1,18 ----
  #ifndef _PATHS_H_
  #define _PATHS_H_
  
+ #ifndef DEFAULT_HARVEST_HOME
+ #define DEFAULT_HARVEST_HOME "@prefix@"
+ #endif
+ 
+ #ifndef DEFAULT_HARVEST_LIBDIR 
+ #define DEFAULT_HARVEST_LIBDIR "@libdir@"
+ #endif
+ 
+ #ifndef DEFAULT_HARVEST_BINDIR
+ #define DEFAULT_HARVEST_BINDIR "@bindir@"
+ #endif
+ 
  #ifndef CMD_PERL
  #define CMD_PERL	"@CMD_PERL@"
  #endif
Index: harvest/src/common/md5/Makefile.in
diff -c harvest/src/common/md5/Makefile.in:2.2 harvest/src/common/md5/Makefile.in:2.3
*** harvest/src/common/md5/Makefile.in:2.2	Sun Mar 23 17:19:06 1997
--- harvest/src/common/md5/Makefile.in	Thu Sep 11 12:15:01 1997
***************
*** 1,7 ****
  #
  #  Makefile for MD5 library code and example
  #
! #  Makefile.in,v 2.2 1997/03/23 22:19:06 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,7 ----
  #
  #  Makefile for MD5 library code and example
  #
! #  Makefile.in,v 2.3 1997/09/11 16:15:01 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 34,40 ****
  clean:
  	-rm -f core md5 *.o $(LIBFILE) tags
  
! realclean:	clean
  	-rm -f Makefile
  
  install: all
--- 34,40 ----
  clean:
  	-rm -f core md5 *.o $(LIBFILE) tags
  
! distclean:	clean
  	-rm -f Makefile
  
  install: all
Index: harvest/src/common/regex/Makefile.in
diff -c harvest/src/common/regex/Makefile.in:2.0 harvest/src/common/regex/Makefile.in:2.1
*** harvest/src/common/regex/Makefile.in:2.0	Sun Mar 16 17:14:51 1997
--- harvest/src/common/regex/Makefile.in	Thu Sep 11 12:15:02 1997
***************
*** 1,7 ****
  #
  #  Makefile for POSIX regex library code
  #
! #  Makefile.in,v 1.3 1995/08/21 20:26:40 duane Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,7 ----
  #
  #  Makefile for POSIX regex library code
  #
! #  Makefile.in,v 2.1 1997/09/11 16:15:02 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 14,20 ****
  INSTALL_FILE 	= @INSTALL_DATA@
  RANLIB		= @RANLIB@
  
! DEBUG		= $(DEBUG_TOP) #-O #-g #-DDEBUG
  CFLAGS		= $(DEBUG) -I../include
  LIBDIR		= ../lib
  LIBFILE		= libregex.a
--- 14,20 ----
  INSTALL_FILE 	= @INSTALL_DATA@
  RANLIB		= @RANLIB@
  
! DEBUG		= $(DEBUG_TOP)
  CFLAGS		= $(DEBUG) -I../include
  LIBDIR		= ../lib
  LIBFILE		= libregex.a
***************
*** 34,40 ****
  clean:
  	-rm -f core *.o $(LIBFILE) tags
  
! realclean:	clean
  	-rm -f Makefile
  
  install:	all
--- 34,40 ----
  clean:
  	-rm -f core *.o $(LIBFILE) tags
  
! distclean:	clean
  	-rm -f Makefile
  
  install:	all
Index: harvest/src/common/template/Makefile.in
diff -c harvest/src/common/template/Makefile.in:2.0 harvest/src/common/template/Makefile.in:2.1
*** harvest/src/common/template/Makefile.in:2.0	Sun Mar 16 17:14:54 1997
--- harvest/src/common/template/Makefile.in	Thu Sep 11 12:15:03 1997
***************
*** 1,9 ****
  #
  #  Makefile for the SOIF template processing code
  #
! #  Darren Hardy, hardy@cs.colorado.edu, May 1994
! #
! #  Makefile.in,v 1.30 1995/11/16 19:26:27 duane Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,7 ----
  #
  #  Makefile for the SOIF template processing code
  #
! #  Makefile.in,v 2.1 1997/09/11 16:15:03 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 23,29 ****
  DEBUG_LIBS	=
  
  CFLAGS		= $(DEBUG) -I../include
! OBJS 		= template.o
  LIBDIR		= ../lib
  LDFLAGS		= -L$(LIBDIR)
  LIBS		= -ltemplate -lutil $(DEBUG_LIBS) $(XTRA_LIBS)
--- 21,27 ----
  DEBUG_LIBS	=
  
  CFLAGS		= $(DEBUG) -I../include
! OBJS 		= template.o cksoif.o print-attr.o
  LIBDIR		= ../lib
  LDFLAGS		= -L$(LIBDIR)
  LIBS		= -ltemplate -lutil $(DEBUG_LIBS) $(XTRA_LIBS)
***************
*** 40,46 ****
  clean:
  	-rm -f core $(OBJS) $(LIBFILE) $(BINS) *.o 
  
! realclean:
  	-rm -f Makefile
  
  install: all
--- 38,44 ----
  clean:
  	-rm -f core $(OBJS) $(LIBFILE) $(BINS) *.o 
  
! distclean: clean
  	-rm -f Makefile
  
  install: all
Index: harvest/src/common/url/Makefile.in
diff -c harvest/src/common/url/Makefile.in:2.5 harvest/src/common/url/Makefile.in:2.7
*** harvest/src/common/url/Makefile.in:2.5	Sat May  3 12:46:38 1997
--- harvest/src/common/url/Makefile.in	Thu Sep 11 13:14:35 1997
***************
*** 1,7 ****
  #
  #  Makefile for simple liburl
  #
! #  Makefile.in,v 2.5 1997/05/03 16:46:38 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,7 ----
  #
  #  Makefile for simple liburl
  #
! #  Makefile.in,v 2.7 1997/09/11 17:14:35 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 21,27 ****
  #SOCKET_PH_TYPE  = @SOCKET_PH_TYPE@
  
  
! DEBUG		= $(DEBUG_TOP) #-O #-g #-DDEBUG
  DEBUG_LIBS	=
  
  #
--- 21,27 ----
  #SOCKET_PH_TYPE  = @SOCKET_PH_TYPE@
  
  
! DEBUG		= $(DEBUG_TOP) 
  DEBUG_LIBS	=
  
  #
***************
*** 88,97 ****
  	$(CC) -o $@ mk-socket-ph.o
  
  clean:
! 	-rm -f core liburl.a *.o urlget urlpurge mk-socket-ph socket.ph tags ftpget
  	-rm -f $(GENPROGS)
  
! realclean:	clean
  	-rm -f Makefile
  
  install:	all
--- 88,97 ----
  	$(CC) -o $@ mk-socket-ph.o
  
  clean:
! 	-rm -f core liburl.a *.o urlget urlpurge mk-socket-ph socket.ph tags ftpget mime_table.h
  	-rm -f $(GENPROGS)
  
! distclean:	clean
  	-rm -f Makefile
  
  install:	all
Index: harvest/src/common/util/Makefile.in
diff -c harvest/src/common/util/Makefile.in:2.0 harvest/src/common/util/Makefile.in:2.1
*** harvest/src/common/util/Makefile.in:2.0	Sun Mar 16 17:16:20 1997
--- harvest/src/common/util/Makefile.in	Thu Sep 11 12:15:06 1997
***************
*** 1,7 ****
  #
  #  Makefile for the utilities source directory 
  #
! #  Makefile.in,v 1.11 1995/08/21 20:26:36 duane Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,7 ----
  #
  #  Makefile for the utilities source directory 
  #
! #  Makefile.in,v 2.1 1997/09/11 16:15:06 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 31,37 ****
  clean:
  	-rm -f core *.o $(LIBFILE) tags 
  
! realclean:	clean
  	-rm -rf Makefile
  
  install:	all
--- 31,37 ----
  clean:
  	-rm -f core *.o $(LIBFILE) tags 
  
! distclean:	clean
  	-rm -rf Makefile
  
  install:	all
***************
*** 45,47 ****
--- 45,49 ----
  $(LIBFILE):	$(OBJS)
  	ar r $(LIBFILE) $(OBJS)
  	$(RANLIB) $(LIBFILE)
+ 
+ 
Index: harvest/src/common/util/harvest.c
diff -c harvest/src/common/util/harvest.c:2.0 harvest/src/common/util/harvest.c:2.3
*** harvest/src/common/util/harvest.c:2.0	Sun Mar 16 17:16:25 1997
--- harvest/src/common/util/harvest.c	Mon Sep 22 12:05:10 1997
***************
*** 1,4 ****
! static char rcsid[] = "harvest.c,v 1.15 1996/01/05 20:28:32 duane Exp";
  /*
   *  harvest.c - Routines specific to the Harvest installation
   * 
--- 1,4 ----
! static char rcsid[] = "harvest.c,v 2.3 1997/09/22 16:05:10 sxw Exp";
  /*
   *  harvest.c - Routines specific to the Harvest installation
   * 
***************
*** 86,93 ****
  #include <stdlib.h>
  #include <sys/param.h>
  #include "util.h"
! 
! #define DEFAULT_HARVEST_HOME "/usr/local/harvest"
  
  /*
   *  harvest_bindir() - Returns a static buffer that contains the 
--- 86,92 ----
  #include <stdlib.h>
  #include <sys/param.h>
  #include "util.h"
! #include "paths.h"
  
  /*
   *  harvest_bindir() - Returns a static buffer that contains the 
***************
*** 167,172 ****
  	}
  	xfree(tmpxtra);
      }
!     Debug(82, 1, ("Adding new PATH to environment: %s\n", newpath));
      (void) putenv(newpath);
  }
--- 166,173 ----
  	}
  	xfree(tmpxtra);
      }
!     Debug(83, 1, ("Adding new PATH to environment: %s\n", newpath));
      (void) putenv(newpath);
  }
+ 
+ 
Index: harvest/src/gatherer/Makefile.in
diff -c harvest/src/gatherer/Makefile.in:2.1 harvest/src/gatherer/Makefile.in:2.2
*** harvest/src/gatherer/Makefile.in:2.1	Fri Mar 21 14:21:19 1997
--- harvest/src/gatherer/Makefile.in	Thu Sep 11 12:15:07 1997
***************
*** 1,7 ****
  #
  #  Makefile for the Gatherer source directory
  #
! #  Makefile.in,v 2.1 1997/03/21 19:21:19 sxw Exp
  #
  SUBDIRS		= essence db enumerate gatherd mgmt example
  
--- 1,7 ----
  #
  #  Makefile for the Gatherer source directory
  #
! #  Makefile.in,v 2.2 1997/09/11 16:15:07 sxw Exp
  #
  SUBDIRS		= essence db enumerate gatherd mgmt example
  
***************
*** 17,87 ****
  RANLIB		= @RANLIB@
  DEBUG_TOP	= @DEBUG_TOP@
  
! # old variables for backward compatability
! INSTALLDIR 	= $(INSTALL_BINDIR)
! INSTALL_SCRIPT 	= $(INSTALL_BIN)
! 
! INSTALL_DIRS	= $(prefix) $(INSTALL_BINDIR) $(INSTALL_LIBDIR) \
! 		  $(INSTALL_MANDIR)
! 
! all:	
! 	@for dir in $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			prefix="$(prefix)" \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 			RANLIB="$(RANLIB)" \
! 			DEBUG_TOP="$(DEBUG_TOP)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			INSTALLDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_SCRIPT="$(INSTALL_SCRIPT)"  $@); \
! 	done
! 
! install:	all
! 	@for dir in $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			prefix="$(prefix)" \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 			RANLIB="$(RANLIB)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			INSTALLDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_SCRIPT="$(INSTALL_SCRIPT)" $@); \
! 	done
! 
! clean:
! 	-@for dir in lib $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			prefix="$(prefix)" \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 			RANLIB="$(RANLIB)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			INSTALLDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_SCRIPT="$(INSTALL_SCRIPT)" $@); \
! 	done
! 
! realclean:	clean
! 	-rm -f Makefile include/autoconf.h config.status *~ core
! 	-@for dir in lib $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			prefix="$(prefix)" \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 			RANLIB="$(RANLIB)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			INSTALLDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_SCRIPT="$(INSTALL_SCRIPT)"  $@); \
! 	done
--- 17,42 ----
  RANLIB		= @RANLIB@
  DEBUG_TOP	= @DEBUG_TOP@
  
! all: do-all
! clean: do-clean this-clean
! distclean: do-distclean this-distclean
! install: do-install
! 
! this-distclean:	this-clean
! 	-rm -f Makefile include/autoconf.h config.status config.log \
! 	       config.cache *~ core
! 
! this-clean:
! 	-rm -f lib/*.a lib/core
! 
! DO_X = do-clean do-distclean do-all do-install
! 
! $(DO_X):
! 	@target=`echo $@ | sed -e 's/^do-//'`; \
! 	for dir in $(SUBDIRS); do \
! 	echo Making $$target in $$dir; \
! 	if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
! 	then true; else exit 1; fi; \
! 	done     
! 
! 
Index: harvest/src/gatherer/db/Makefile.in
diff -c harvest/src/gatherer/db/Makefile.in:2.0 harvest/src/gatherer/db/Makefile.in:2.1
*** harvest/src/gatherer/db/Makefile.in:2.0	Sun Mar 16 17:16:39 1997
--- harvest/src/gatherer/db/Makefile.in	Thu Sep 11 12:15:08 1997
***************
*** 1,7 ****
  #
  #  Makefile for the database manipulation source directory 
  #
! #  Makefile.in,v 1.23 1995/11/16 19:26:29 duane Exp
  #
  SUBDIRS		= gdbmutil
  
--- 1,7 ----
  #
  #  Makefile for the database manipulation source directory 
  #
! #  Makefile.in,v 2.1 1997/09/11 16:15:08 sxw Exp
  #
  SUBDIRS		= gdbmutil
  
***************
*** 38,116 ****
  PROGS		= mergedb template2db rmbinary consoldb cleandb expiredb
  SCRIPTS		= folddb mkgathererstats.pl
  
! all:	$(PROGS) $(SCRIPTS)
! 	@for dir in $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_UTILDIR="$(INSTALL_UTILDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 			RANLIB="$(RANLIB)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			DEBUG="$(DEBUG)" \
! 			DEBUG_TOP="$(DEBUG_TOP)" \
! 			DEBUG_LIBS="$(DEBUG_LIBS)" \
! 			INSTALLDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_SCRIPT="$(INSTALL_SCRIPT)" $@); \
! 	done
  
  ctags:
  	@ctags -w *.c
  
! clean:
  	-rm -f core $(PROGS) *.o tags mon.out Makefile.bak
- 	@for dir in $(SUBDIRS); do \
- 		echo Making $@ in $$dir; \
- 		(cd $$dir; $(MAKE) $(MFLAGS) \
- 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
- 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
- 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
- 			RANLIB="$(RANLIB)" \
- 			INSTALL_BIN="$(INSTALL_BIN)" \
- 			INSTALL_FILE="$(INSTALL_FILE)" \
- 			DEBUG="$(DEBUG)" \
- 			DEBUG_LIBS="$(DEBUG_LIBS)" \
- 			INSTALLDIR="$(INSTALL_BINDIR)" \
- 			INSTALL_SCRIPT="$(INSTALL_SCRIPT)" $@); \
- 	done
  
! realclean:	clean
  	-rm -f Makefile
- 	@for dir in $(SUBDIRS); do \
- 		echo Making $@ in $$dir; \
- 		(cd $$dir; $(MAKE) $(MFLAGS) \
- 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
- 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
- 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
- 			RANLIB="$(RANLIB)" \
- 			INSTALL_BIN="$(INSTALL_BIN)" \
- 			INSTALL_FILE="$(INSTALL_FILE)" \
- 			DEBUG="$(DEBUG)" \
- 			DEBUG_LIBS="$(DEBUG_LIBS)" \
- 			INSTALLDIR="$(INSTALL_BINDIR)" \
- 			INSTALL_SCRIPT="$(INSTALL_SCRIPT)" $@); \
- 	done
  
! install:	all install-bin 
! 	@for dir in $(SUBDIRS); do \
! 		echo Making $@ in $$dir; \
! 		(cd $$dir; $(MAKE) $(MFLAGS) \
! 			INSTALL_BINDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_LIBDIR="$(INSTALL_LIBDIR)" \
! 			INSTALL_UTILDIR="$(INSTALL_UTILDIR)" \
! 			INSTALL_MANDIR="$(INSTALL_MANDIR)" \
! 			RANLIB="$(RANLIB)" \
! 			INSTALL_BIN="$(INSTALL_BIN)" \
! 			INSTALL_FILE="$(INSTALL_FILE)" \
! 			DEBUG="$(DEBUG)" \
! 			DEBUG_LIBS="$(DEBUG_LIBS)" \
! 			INSTALLDIR="$(INSTALL_BINDIR)" \
! 			INSTALL_SCRIPT="$(INSTALL_SCRIPT)" $@); \
! 	done
! 
! install-bin:	$(PROGS)
  	@for f in $(PROGS) $(SCRIPTS); do \
  		echo $(INSTALL_BIN) $$f $(INSTALL_UTILDIR); \
  		$(INSTALL_BIN) $$f $(INSTALL_UTILDIR); \
--- 38,60 ----
  PROGS		= mergedb template2db rmbinary consoldb cleandb expiredb
  SCRIPTS		= folddb mkgathererstats.pl
  
! all: this-all do-all
! clean: this-clean do-clean 
! distclean: this-distclean do-distclean 
! install: this-install do-install
! 
! this-all:	$(PROGS) $(SCRIPTS)
  
  ctags:
  	@ctags -w *.c
  
! this-clean:
  	-rm -f core $(PROGS) *.o tags mon.out Makefile.bak
  
! this-distclean:	this-clean
  	-rm -f Makefile
  
! this-install:	this-all 
  	@for f in $(PROGS) $(SCRIPTS); do \
  		echo $(INSTALL_BIN) $$f $(INSTALL_UTILDIR); \
  		$(INSTALL_BIN) $$f $(INSTALL_UTILDIR); \
***************
*** 122,128 ****
  dbcheck:	
  	$(CC) $(CFLAGS) -o $@ $@.c $(LDFLAGS) -lurl -lmd5 $(LIBS)
  
- 
  mergedb:	mergedb.c 
  template2db:	template2db.c
  rmbinary:	rmbinary.c
--- 66,71 ----
***************
*** 131,133 ****
--- 74,86 ----
  cleandb:	cleandb.c
  extractdb:	extractdb.c
  expiredb:	expiredb.c
+ 
+ DO_X = do-clean do-distclean do-all do-install
+ 
+ $(DO_X):
+ 	@target=`echo $@ | sed -e 's/^do-//'`; \
+ 	for dir in $(SUBDIRS); do \
+ 	echo Making $$target in $$dir; \
+ 	if (cd $$dir; $(MAKE) $(MFLAGS) $${target}); \
+ 	then true; else exit 1; fi; \
+ 	done     
Index: harvest/src/gatherer/db/gdbmutil/Makefile.in
diff -c harvest/src/gatherer/db/gdbmutil/Makefile.in:2.0 harvest/src/gatherer/db/gdbmutil/Makefile.in:2.1
*** harvest/src/gatherer/db/gdbmutil/Makefile.in:2.0	Sun Mar 16 17:16:55 1997
--- harvest/src/gatherer/db/gdbmutil/Makefile.in	Thu Sep 11 12:15:10 1997
***************
*** 44,50 ****
  clean:
  	-rm -f core $(PROGS) *.o tags mon.out Makefile.bak
  
! realclean:	clean
  	-rm -f Makefile
  
  install:	all
--- 44,50 ----
  clean:
  	-rm -f core $(PROGS) *.o tags mon.out Makefile.bak
  
! distclean:	clean
  	-rm -f Makefile
  
  install:	all
Index: harvest/src/gatherer/enumerate/Makefile.in
diff -c harvest/src/gatherer/enumerate/Makefile.in:2.1 harvest/src/gatherer/enumerate/Makefile.in:2.2
*** harvest/src/gatherer/enumerate/Makefile.in:2.1	Fri Mar 21 14:21:24 1997
--- harvest/src/gatherer/enumerate/Makefile.in	Thu Sep 11 12:15:11 1997
***************
*** 1,7 ****
  #
  #  Makefile for the enumerators
  #
! #  Makefile.in,v 2.1 1997/03/21 19:21:24 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,7 ----
  #
  #  Makefile for the enumerators
  #
! #  Makefile.in,v 2.2 1997/09/11 16:15:11 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 39,45 ****
  clean:
  	-rm -f core *.o $(PROGS) tags enum.log tmpdb.gdbm
  
! realclean:	clean
  	-rm -f Makefile
  
  install:	all install-bin
--- 39,45 ----
  clean:
  	-rm -f core *.o $(PROGS) tags enum.log tmpdb.gdbm
  
! distclean:	clean
  	-rm -f Makefile
  
  install:	all install-bin
Index: harvest/src/gatherer/enumerate/enum.c
diff -c harvest/src/gatherer/enumerate/enum.c:2.1 harvest/src/gatherer/enumerate/enum.c:2.2
*** harvest/src/gatherer/enumerate/enum.c:2.1	Fri Mar 21 14:21:27 1997
--- harvest/src/gatherer/enumerate/enum.c	Wed Aug 27 14:06:28 1997
***************
*** 1,4 ****
! static char rcsid[] = "enum.c,v 2.1 1997/03/21 19:21:27 sxw Exp";
  /* 
   *  enum.c - Enumerate RootNode URLs into LeafNode URLs.  Also produce
   *  Timestamps or MD5s for each LeafNode URL to support incremental
--- 1,4 ----
! static char rcsid[] = "enum.c,v 2.2 1997/08/27 18:06:28 sxw Exp";
  /* 
   *  enum.c - Enumerate RootNode URLs into LeafNode URLs.  Also produce
   *  Timestamps or MD5s for each LeafNode URL to support incremental
***************
*** 756,761 ****
--- 756,766 ----
  	    (void) do_an_enumeration(up, cmd);
  	    url_close(up);
  	    xfree(tree_root);
+ 	} else if (ns->buf[0] == '#') {
+ 	  /* 
+ 	   * Pass comments
+ 	   */
+ 	  printf("%s\n", ns->buf);
  	}
        while_done:
  	xfree(ns->buf);
Index: harvest/src/gatherer/enumerate/gopherenum-breadth.c
diff -c harvest/src/gatherer/enumerate/gopherenum-breadth.c:2.3 harvest/src/gatherer/enumerate/gopherenum-breadth.c:2.4
*** harvest/src/gatherer/enumerate/gopherenum-breadth.c:2.3	Fri May  2 17:07:26 1997
--- harvest/src/gatherer/enumerate/gopherenum-breadth.c	Tue Sep 16 10:56:06 1997
***************
*** 1,4 ****
! static char rcsid[] = "gopherenum-breadth.c,v 2.3 1997/05/02 21:07:26 sxw Exp";
  /*
   *  gopherenum-breadth.c - RootNode URL enumerator for Gopher URLs
   *
--- 1,4 ----
! static char rcsid[] = "gopherenum-breadth.c,v 2.4 1997/09/16 14:56:06 sxw Exp";
  /*
   *  gopherenum-breadth.c - RootNode URL enumerator for Gopher URLs
   *
***************
*** 209,215 ****
  static void mark_failed(URL *up) {
      datum k,d;
   
!     Debug(42, 9, ("mark_failed: url='%s'",up->url));
   
      k.dptr = xstrdup(up->url);
      k.dsize = strlen(k.dptr) + 1;
--- 209,215 ----
  static void mark_failed(URL *up) {
      datum k,d;
   
!     Debug(43, 9, ("mark_failed: url='%s'",up->url));
   
      k.dptr = xstrdup(up->url);
      k.dsize = strlen(k.dptr) + 1;
Index: harvest/src/gatherer/enumerate/gopherenum-depth.c
diff -c harvest/src/gatherer/enumerate/gopherenum-depth.c:2.3 harvest/src/gatherer/enumerate/gopherenum-depth.c:2.4
*** harvest/src/gatherer/enumerate/gopherenum-depth.c:2.3	Fri May  2 17:07:29 1997
--- harvest/src/gatherer/enumerate/gopherenum-depth.c	Tue Sep 16 10:56:08 1997
***************
*** 1,4 ****
! static char rcsid[] = "gopherenum-depth.c,v 2.3 1997/05/02 21:07:29 sxw Exp";
  /*
   *  gopherenum-depth.c - Depth First RootNode URL enumerator for Gopher URLs
   *
--- 1,4 ----
! static char rcsid[] = "gopherenum-depth.c,v 2.4 1997/09/16 14:56:08 sxw Exp";
  /*
   *  gopherenum-depth.c - Depth First RootNode URL enumerator for Gopher URLs
   *
***************
*** 171,177 ****
  static void mark_failed(URL *up) {
      datum k,d;
   
!     Debug(42, 9, ("mark_failed: url='%s'",up->url));
   
      k.dptr = xstrdup(up->url);
      k.dsize = strlen(k.dptr) + 1;
--- 171,177 ----
  static void mark_failed(URL *up) {
      datum k,d;
   
!     Debug(43, 9, ("mark_failed: url='%s'",up->url));
   
      k.dptr = xstrdup(up->url);
      k.dsize = strlen(k.dptr) + 1;
Index: harvest/src/gatherer/enumerate/robots-txt.c
diff -c harvest/src/gatherer/enumerate/robots-txt.c:2.3 harvest/src/gatherer/enumerate/robots-txt.c:2.4
*** harvest/src/gatherer/enumerate/robots-txt.c:2.3	Thu Jun 12 16:08:18 1997
--- harvest/src/gatherer/enumerate/robots-txt.c	Tue Aug 26 14:06:46 1997
***************
*** 1,4 ****
! static char rcsid[]="robots-txt.c,v 2.3 1997/06/12 20:08:18 sxw Exp";
  /*
   *  DEBUG: section  48, level 1, 5      Gatherer enumeration robots.txt stuff
   *
--- 1,4 ----
! static char rcsid[]="robots-txt.c,v 2.4 1997/08/26 18:06:46 sxw Exp";
  /*
   *  DEBUG: section  48, level 1, 5      Gatherer enumeration robots.txt stuff
   *
***************
*** 141,147 ****
  
      for (W = Q->disallow; W; W = W->next) {
  	Debug(48, 5, ("RobotsTxtCheck: Pattern %s\n", W->word));
! 	if (pattern_match(W->word, up->raw_pathname)) {
  	  Debug(48, 1, ("RobotsTxtCheck: Matched '%s'\n", W->word));
  	  Debug(48, 1, ("RobotsTxtCheck: Returning ROBOTS_TXT_DISALLOW\n"));
  	  return ROBOTS_TXT_DISALLOW;
--- 141,147 ----
  
      for (W = Q->disallow; W; W = W->next) {
  	Debug(48, 5, ("RobotsTxtCheck: Pattern %s\n", W->word));
! 	if ((W->word !=NULL) && (pattern_match(W->word, up->raw_pathname))) {
  	  Debug(48, 1, ("RobotsTxtCheck: Matched '%s'\n", W->word));
  	  Debug(48, 1, ("RobotsTxtCheck: Returning ROBOTS_TXT_DISALLOW\n"));
  	  return ROBOTS_TXT_DISALLOW;
***************
*** 340,345 ****
--- 340,346 ----
  
      for (Q = R->record_list; Q; Q = Q->next) {
  	for (W = Q->user_agent; W; W = W->next) {
+ 	  if (W->word !=NULL) {
  	    if (!strcmp(W->word, "*"))
  		wildcard = Q;
  	    else {
***************
*** 361,366 ****
--- 362,369 ----
  	      if (!strncasecmp(W->word, UA, strlen(UA)))
  		return Q;
  	    }
+ 	  }
+ 
  	}
      }
      return wildcard;
Index: harvest/src/gatherer/enumerate/staturl.c
diff -c harvest/src/gatherer/enumerate/staturl.c:2.1 harvest/src/gatherer/enumerate/staturl.c:2.2
*** harvest/src/gatherer/enumerate/staturl.c:2.1	Fri Mar 21 14:21:42 1997
--- harvest/src/gatherer/enumerate/staturl.c	Wed Aug 27 14:06:29 1997
***************
*** 1,4 ****
! static char rcsid[] = "staturl.c,v 2.1 1997/03/21 19:21:42 sxw Exp";
  /*
   *  staturl.c - Prints timestamp or MD5 values for each input URL.
   *  Timestamps for file: URLs; otherwise, retrieves the URL and prints MD5.
--- 1,4 ----
! static char rcsid[] = "staturl.c,v 2.2 1997/08/27 18:06:29 sxw Exp";
  /*
   *  staturl.c - Prints timestamp or MD5 values for each input URL.
   *  Timestamps for file: URLs; otherwise, retrieves the URL and prints MD5.
***************
*** 170,177 ****
  
  	Debug(41, 1, ("staturl: Starting...\n"));
  	while (fgets(buf, BUFSIZ, stdin)) {
! 		if (buf[0] == '#')	/* skip comments */
! 			continue;
  		if ((s = strrchr(buf, '\n')) != NULL)
  			*s = '\0';	/* strip last newline */
  
--- 170,177 ----
  
  	Debug(41, 1, ("staturl: Starting...\n"));
  	while (fgets(buf, BUFSIZ, stdin)) {
! 		if (buf[0] == '#')	/* pass comments */
! 			printf("%s", buf);
  		if ((s = strrchr(buf, '\n')) != NULL)
  			*s = '\0';	/* strip last newline */
  
Index: harvest/src/gatherer/essence/Makefile.in
diff -c harvest/src/gatherer/essence/Makefile.in:2.1 harvest/src/gatherer/essence/Makefile.in:2.2
*** harvest/src/gatherer/essence/Makefile.in:2.1	Fri Mar 21 14:21:43 1997
--- harvest/src/gatherer/essence/Makefile.in	Thu Sep 11 12:15:12 1997
***************
*** 1,9 ****
  #
  #  Makefile for the Essence source directory 
  #
! #  Darren Hardy, University of Colorado - Boulder, July 1994
! #
! #  Makefile.in,v 2.1 1997/03/21 19:21:43 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,7 ----
  #
  #  Makefile for the Essence source directory 
  #
! #  Makefile.in,v 2.2 1997/09/11 16:15:12 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 107,113 ****
  	done
  	-rm -f lex.yy.? y.tab.?
  
! realclean:	clean
  	-rm -f Makefile
  	-@for dir in $(FILEDIR); do \
  		echo Making $@ in $$dir; \
--- 105,111 ----
  	done
  	-rm -f lex.yy.? y.tab.?
  
! distclean:	clean
  	-rm -f Makefile
  	-@for dir in $(FILEDIR); do \
  		echo Making $@ in $$dir; \
***************
*** 146,159 ****
  
  $(LIBFILE):	$(OBJS) $(PPOBJS)
  	@echo "Making file(1) objects..."
! 	@(cd $(FILEDIR); $(MAKE) $(MFLAGS) \
  		CC="$(CC)" \
  		LIBDEFS=-DMAKE_LIBRARY_ONLY \
  	       	INSTALL_BINDIR="$(INSTALL_BINDIR)" \
  		MAGIC="$(INSTALL_UTILDIR)/magic" \
  	       	INSTALLDIR="$(INSTALL_UTILDIR)" \
  	       	DEBUG_TOP="$(DEBUG_TOP)" \
! 		all-objs)
  	ar r $(LIBFILE) $(OBJS) $(FILE_OBJS) $(PPOBJS)
  	$(RANLIB) $(LIBFILE)
  
--- 144,158 ----
  
  $(LIBFILE):	$(OBJS) $(PPOBJS)
  	@echo "Making file(1) objects..."
! 	@if (cd $(FILEDIR); $(MAKE) $(MFLAGS) \
  		CC="$(CC)" \
  		LIBDEFS=-DMAKE_LIBRARY_ONLY \
  	       	INSTALL_BINDIR="$(INSTALL_BINDIR)" \
  		MAGIC="$(INSTALL_UTILDIR)/magic" \
  	       	INSTALLDIR="$(INSTALL_UTILDIR)" \
  	       	DEBUG_TOP="$(DEBUG_TOP)" \
! 		all-objs); \
! 	 then true; else exit 1; fi;
  	ar r $(LIBFILE) $(OBJS) $(FILE_OBJS) $(PPOBJS)
  	$(RANLIB) $(LIBFILE)
  
***************
*** 167,173 ****
  	$(CC) -o $@ $(MAIN) $(LDFLAGS) $(LIBS)
  
  mkmagic:
! 	@(cd $(FILEDIR); $(MAKE) $(MFLAGS) mkmagic)
  
  recognize.o:	recognize.c
  	$(CC) $(CFLAGS) $(REGEX_FLAGS) -c recognize.c
--- 166,173 ----
  	$(CC) -o $@ $(MAIN) $(LDFLAGS) $(LIBS)
  
  mkmagic:
! 	@if (cd $(FILEDIR); $(MAKE) $(MFLAGS) mkmagic); then true; \
! 	 else exit 1; fi;
  
  recognize.o:	recognize.c
  	$(CC) $(CFLAGS) $(REGEX_FLAGS) -c recognize.c
Index: harvest/src/gatherer/essence/main.c
diff -c harvest/src/gatherer/essence/main.c:2.1 harvest/src/gatherer/essence/main.c:2.2
*** harvest/src/gatherer/essence/main.c:2.1	Sun Mar 23 17:30:43 1997
--- harvest/src/gatherer/essence/main.c	Wed Aug 27 14:09:31 1997
***************
*** 1,4 ****
! static char rcsid[] = "main.c,v 2.1 1997/03/23 22:30:43 sxw Exp";
  /*
   *  main.c - User front-end for the Essence system.
   *
--- 1,4 ----
! static char rcsid[] = "main.c,v 2.2 1997/08/27 18:09:31 sxw Exp";
  /*
   *  main.c - User front-end for the Essence system.
   *
***************
*** 478,484 ****
  			strcpy(tbuf, buf);	/* make a copy */
  			Debug(62, 1, ("Input Line: %s", tbuf));
  			if (buf[0] == '#') {
! 				continue;	/* skip comments */
  			}
  			if ((s = strrchr(buf, '\n')) == NULL) {
  				errorlog("Illegal input: %s\n", tbuf);
--- 478,501 ----
  			strcpy(tbuf, buf);	/* make a copy */
  			Debug(62, 1, ("Input Line: %s", tbuf));
  			if (buf[0] == '#') {
! 			  if (strncmp(buf, "#env:", 5) == 0) {
! 			    char* ptr, *dup;
! 			    int len;
! 			    ptr = buf+5;
! 			    while (isspace(*ptr)) {
! 			      ++ptr;
! 			    }
! 			    len = strlen(ptr);
! 			    while (len  &&  isspace(ptr[len-1])) {
! 			      ptr[--len] = '\0';
! 			    }
! 			    if ((dup = xmalloc(len+1))) {
! 			      strcpy(dup, ptr);
! 			      putenv(dup);
! 			    }
! 			  }
! 
! 			  continue;	/* skip rest */
  			}
  			if ((s = strrchr(buf, '\n')) == NULL) {
  				errorlog("Illegal input: %s\n", tbuf);
Index: harvest/src/gatherer/essence/quick-sum
diff -c harvest/src/gatherer/essence/quick-sum:2.0 harvest/src/gatherer/essence/quick-sum:2.1
*** harvest/src/gatherer/essence/quick-sum:2.0	Sun Mar 16 17:18:12 1997
--- harvest/src/gatherer/essence/quick-sum	Mon Sep 22 12:05:12 1997
***************
*** 5,11 ****
  #  quick-sum - Quick hack for people who would rather use this than
  #              Essence's built-in quick-sum.
  #
! #  quick-sum,v 1.3 1995/09/05 20:18:27 hardy Exp
  #
  #######################################################################
  #
--- 5,11 ----
  #  quick-sum - Quick hack for people who would rather use this than
  #              Essence's built-in quick-sum.
  #
! # quick-sum,v 2.1 1997/09/22 16:05:12 sxw Exp
  #
  #######################################################################
  #
***************
*** 83,89 ****
  #    re-implementations of code complying to this set of standards.  
  #  
  #
- $ENV{'HARVEST_HOME'} = "/usr/local/harvest" if (!defined($ENV{'HARVEST_HOME'}));
  
  &usage() if ($#ARGV < 0);
  $configfile = shift(@ARGV);	# always the first arg
--- 83,88 ----
Index: harvest/src/gatherer/essence/file/Makefile.in
diff -c harvest/src/gatherer/essence/file/Makefile.in:2.0 harvest/src/gatherer/essence/file/Makefile.in:2.1
*** harvest/src/gatherer/essence/file/Makefile.in:2.0	Sun Mar 16 17:18:22 1997
--- harvest/src/gatherer/essence/file/Makefile.in	Thu Sep 11 12:15:13 1997
***************
*** 70,77 ****
  clean:
  		-rm -f core *.o file magic $(LIBFILE)
  
! realclean:	clean
! 	-rm -f Makefile
  
  file.o:		file.c
  	$(CC) $(CFLAGS) -DMAGIC='"$(MAGIC)"' -c file.c
--- 70,77 ----
  clean:
  		-rm -f core *.o file magic $(LIBFILE)
  
! distclean:	clean
! 		-rm -f Makefile
  
  file.o:		file.c
  	$(CC) $(CFLAGS) -DMAGIC='"$(MAGIC)"' -c file.c
Index: harvest/src/gatherer/example/Makefile.in
diff -c harvest/src/gatherer/example/Makefile.in:2.1 harvest/src/gatherer/example/Makefile.in:2.2
*** harvest/src/gatherer/example/Makefile.in:2.1	Fri Mar 21 14:21:50 1997
--- harvest/src/gatherer/example/Makefile.in	Thu Sep 11 12:15:14 1997
***************
*** 1,7 ****
  #
  #  Makefile for the Gatherer example directory
  #
! #  Makefile.in,v 2.1 1997/03/21 19:21:50 sxw Exp
  #
  
  prefix = @prefix@
--- 1,7 ----
  #
  #  Makefile for the Gatherer example directory
  #
! #  Makefile.in,v 2.2 1997/09/11 16:15:14 sxw Exp
  #
  
  prefix = @prefix@
***************
*** 27,33 ****
  
  clean:
  
! realclean:
  	rm -f Makefile
  
  
--- 27,33 ----
  
  clean:
  
! distclean:
  	rm -f Makefile
  
  
Index: harvest/src/gatherer/gatherd/Makefile.in
diff -c harvest/src/gatherer/gatherd/Makefile.in:2.1 harvest/src/gatherer/gatherd/Makefile.in:2.2
*** harvest/src/gatherer/gatherd/Makefile.in:2.1	Fri Mar 21 14:21:51 1997
--- harvest/src/gatherer/gatherd/Makefile.in	Thu Sep 11 12:15:15 1997
***************
*** 1,7 ****
  #
  #  Makefile for the Gatherer-Collector server interface.
  #
! #  Makefile.in,v 2.1 1997/03/21 19:21:51 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,7 ----
  #
  #  Makefile for the Gatherer-Collector server interface.
  #
! #  Makefile.in,v 2.2 1997/09/11 16:15:15 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 39,50 ****
  		$(INSTALL_BIN) $$f $(INSTALL_UTILDIR); \
  	done
  	-rm -f $(INSTALL_UTILDIR)/in.gatherd
! 	(cd $(INSTALL_UTILDIR); $(LN_S) gatherd in.gatherd)
  
  clean:
  	-rm -f core *.o $(PROGS) gatherd mkindex
  
! realclean:	clean
  	-rm -f Makefile
  
  gatherd:	$(OBJS)
--- 39,50 ----
  		$(INSTALL_BIN) $$f $(INSTALL_UTILDIR); \
  	done
  	-rm -f $(INSTALL_UTILDIR)/in.gatherd
! 	(cd $(INSTALL_UTILDIR) && $(LN_S) gatherd in.gatherd)
  
  clean:
  	-rm -f core *.o $(PROGS) gatherd mkindex
  
! distclean:	clean
  	-rm -f Makefile
  
  gatherd:	$(OBJS)
Index: harvest/src/gatherer/gatherd/gather.c
diff -c harvest/src/gatherer/gatherd/gather.c:2.1 harvest/src/gatherer/gatherd/gather.c:2.2
*** harvest/src/gatherer/gatherd/gather.c:2.1	Fri Mar 21 14:21:54 1997
--- harvest/src/gatherer/gatherd/gather.c	Mon Jul 21 12:04:30 1997
***************
*** 1,4 ****
! static char rcsid[] = "gather.c,v 2.1 1997/03/21 19:21:54 sxw Exp";
  /*
   *  gather.c - Simple, portable client to retrieve data from a Gatherer,
   *  and print it to stdout.  Uses the GNU zip compression to transmit
--- 1,4 ----
! static char rcsid[] = "gather.c,v 2.2 1997/07/21 16:04:30 sxw Exp";
  /*
   *  gather.c - Simple, portable client to retrieve data from a Gatherer,
   *  and print it to stdout.  Uses the GNU zip compression to transmit
***************
*** 370,391 ****
       FILE *ifp;
       FILE *ofp;
  {
! 	static char buf[BUFSIZ];
! 	int i;
  
! 	while (fgets(buf, BUFSIZ, ifp)) {
  		if (!strncmp(buf, "499 - Sent", 10))
  			return;
  		/* try to find the length of data we read in.  Note that
  		 * use of fgets() here is bad because we may be reading
  		 * arbitrary binary data (including NULLs) in a SOIF value. */
! 		for (i = 0; i < BUFSIZ; i++) {
! 			if (buf[i] == '\n') {
! 				i++;
! 				break;
! 			}
  		}
! 		fwrite(buf, 1, i, stdout);
  	}
  }
  
--- 370,389 ----
       FILE *ifp;
       FILE *ofp;
  {
! 	static char buf[BUFSIZ+1];
! 	char *pos;
  
! 	while (fgets(buf, BUFSIZ+1, ifp)) {
  		if (!strncmp(buf, "499 - Sent", 10))
  			return;
  		/* try to find the length of data we read in.  Note that
  		 * use of fgets() here is bad because we may be reading
  		 * arbitrary binary data (including NULLs) in a SOIF value. */
! 		while((pos = memchr(buf, '\n', BUFSIZ)) == NULL) {
! 			fwrite(buf, 1, BUFSIZ, stdout);
! 			fgets(buf, BUFSIZ+1, ifp);
  		}
! 		fwrite(buf, 1, (pos - buf) + 1, stdout);
  	}
  }
  
Index: harvest/src/gatherer/mgmt/Gatherer.in
diff -c harvest/src/gatherer/mgmt/Gatherer.in:2.2 harvest/src/gatherer/mgmt/Gatherer.in:2.5
*** harvest/src/gatherer/mgmt/Gatherer.in:2.2	Tue Jul  1 15:42:39 1997
--- harvest/src/gatherer/mgmt/Gatherer.in	Mon Sep 22 12:05:13 1997
***************
*** 7,13 ****
  #
  #  Usage: Gatherer [-manual | -export | -debug | -background] file.cf
  #
! #  Gatherer.in,v 2.2 1997/07/01 19:42:39 sxw Exp
  #
  #############################################################################
  #
--- 7,13 ----
  #
  #  Usage: Gatherer [-manual | -export | -debug | -background] file.cf
  #
! #  Gatherer.in,v 2.5 1997/09/22 16:05:13 sxw Exp
  #
  #############################################################################
  #
***************
*** 112,121 ****
  #    re-implementations of code complying to this set of standards.  
  #  
  #
! $ENV{'HARVEST_HOME'} = "/usr/local/harvest" if (!defined($ENV{'HARVEST_HOME'}));
! $ENV{'PATH'} = $ENV{'PATH'} . ":" . "$ENV{'HARVEST_HOME'}/bin" .
! 			      ":" . "$ENV{'HARVEST_HOME'}/lib/gatherer" .
! 			      ":" . "$ENV{'HARVEST_HOME'}/lib";
  $debug = 0;
  
  sub usage {
--- 112,123 ----
  #    re-implementations of code complying to this set of standards.  
  #  
  #
! $ENV{'HARVEST_HOME'} = "@prefix@" if (!defined($ENV{'HARVEST_HOME'}));
! 
! $ENV{'PATH'} = "$ENV{'HARVEST_HOME'}/bin" . ":" .
! 	       "$ENV{'HARVEST_HOME'}/lib/gatherer" . ":" .
! 	       "$ENV{'HARVEST_HOME'}/lib" . ":" .
!                "$ENV{'PATH'}";
  $debug = 0;
  
  sub usage {
***************
*** 283,288 ****
--- 285,295 ----
  			$pgm = $1;
  			die "$pgm: $!\n" unless open (PGM, "$pgm|");
  			while (<PGM>) {
+ 			        if (substr($_, 0, 1) eq '#') {
+ 				    # Pass comments
+ 				    print URL $_;
+ 				    next;
+ 				}
  				chop;
  				$rootargs = "$_ $urlmax $urlfilter $hostmax $hostfilter $delay $depth $accesstypes $enumeratepgm $searchtype";
  				print URL "ROOT\t$rootargs\n";
***************
*** 306,311 ****
--- 313,323 ----
  			$pgm = $1;
  			die "$pgm: $!\n" unless open (PGM, "$pgm|");
  			while (<PGM>) {
+ 			        if (substr($_, 0, 1) eq '#') {
+ 				    # Pass comments
+ 				    print URL $_;
+ 				    next;
+ 				}
  				print URL "LEAF\t$_";
  				print "LEAF\t$_" if ($debug);
  			}
Index: harvest/src/gatherer/mgmt/Makefile.in
diff -c harvest/src/gatherer/mgmt/Makefile.in:2.1 harvest/src/gatherer/mgmt/Makefile.in:2.2
*** harvest/src/gatherer/mgmt/Makefile.in:2.1	Fri Mar 21 14:15:44 1997
--- harvest/src/gatherer/mgmt/Makefile.in	Thu Sep 11 12:15:18 1997
***************
*** 1,7 ****
  #
  #  Makefile for the Gatherer management and configuration software
  #
! #  Makefile.in,v 2.1 1997/03/21 19:15:44 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
--- 1,7 ----
  #
  #  Makefile for the Gatherer management and configuration software
  #
! #  Makefile.in,v 2.2 1997/09/11 16:15:18 sxw Exp
  #
  prefix = @prefix@
  INSTALL_BINDIR	= $(prefix)/bin
***************
*** 31,37 ****
  clean:
  	-rm -f core *.o $(PROGS) tags
  
! realclean:	clean
  	-rm -f Makefile Gatherer
  
  install:	all install-bin install-script
--- 31,37 ----
  clean:
  	-rm -f core *.o $(PROGS) tags
  
! distclean:	clean
  	-rm -f Makefile Gatherer
  
  install:	all install-bin install-script
***************
*** 50,52 ****
--- 50,53 ----
  
  prepurls:   prepurls.o
  	$(CC) -o $@ $@.o $(LDFLAGS) $(LIBS)
+ 
Index: harvest/src/gatherer/mgmt/prepurls.c
diff -c harvest/src/gatherer/mgmt/prepurls.c:2.1 harvest/src/gatherer/mgmt/prepurls.c:2.2
*** harvest/src/gatherer/mgmt/prepurls.c:2.1	Fri Mar 21 14:15:46 1997
--- harvest/src/gatherer/mgmt/prepurls.c	Wed Aug 27 14:09:34 1997
***************
*** 1,4 ****
! static char rcsid[] = "prepurls.c,v 2.1 1997/03/21 19:15:46 sxw Exp";
  /*
   *  prepurls.c - Prepares URLs using an enumerator (for Root node) 
   *  and a URL-stat (for Leaf nodes).
--- 1,4 ----
! static char rcsid[] = "prepurls.c,v 2.2 1997/08/27 18:09:34 sxw Exp";
  /*
   *  prepurls.c - Prepares URLs using an enumerator (for Root node) 
   *  and a URL-stat (for Leaf nodes).
***************
*** 145,150 ****
--- 145,151 ----
  	char buf[BUFSIZ], *s;
  	int rpid, lpid, cpid, rootpipe[2], leafpipe[2], ncaught = 0;
  	FILE *logfp = NULL;
+ 	int leafSeen;
  
  	if (getenv("HARVEST_GATHERER_LOGFILE") != (char *) NULL)
  		logfp = fopen(getenv("HARVEST_GATHERER_LOGFILE"), "a+");
***************
*** 194,204 ****
  		log_errno("fdopen");
  		exit(1);
  	}
! 	/* Start up the leaf node processor */
  	if (pipe(leafpipe) < 0) {
  		log_errno("pipe");
  		exit(1);
  	}
  	if ((lpid = fork()) < 0) {
  		log_errno("fork");
  		exit(1);
--- 195,242 ----
  		log_errno("fdopen");
  		exit(1);
  	}
! 
! 	/* 
!          * Process the root nodes.
!          */
! 	leafSeen = 0;
! 	while (fgets(buf, BUFSIZ, stdin)) {
! 	  if (!strncmp(buf, "ROOT", strlen("ROOT"))) {
! 	    s = buf + strlen("ROOT");
! 	    while (isspace(*s))
! 	      s++;
! 	    fprintf(rootnodes, "%s", s);
! 	    fflush(rootnodes);
! #ifdef DEBUG
! 	    Log("Passing Root: %s\n", s);
! #endif
! 	  } else if (!strncmp(buf, "LEAF", strlen("LEAF"))) {
! 	    leafSeen = 1;
! 	    break;
! 	  } else if (buf[0] == '#') {
! 	    /*
! 	     * Pass comments
! 	     */
! 	    fprintf(rootnodes, "%s", buf);
! 	  } else {
! 	    Log("Illegal Input: %s\n", buf);
! 	  }
! 	}
! 	fclose(rootnodes);
! 	close(rootpipe[1]);
! 	ncaught = 0;
! 	while (ncaught < 1) {
! 	  cpid = wait(NULL);
! 	  if (cpid == rpid)
! 	    ncaught++;
! 	}
! 	
!       	/* Start up the leaf node processor */
  	if (pipe(leafpipe) < 0) {
  		log_errno("pipe");
  		exit(1);
  	}
+ 
  	if ((lpid = fork()) < 0) {
  		log_errno("fork");
  		exit(1);
***************
*** 220,239 ****
  		exit(1);
  	}
  	/* 
! 	 * Now, divide up the input by ROOT's and LEAF's and send to
! 	 * the correct node processor.
  	 */
! 	while (fgets(buf, BUFSIZ, stdin)) {
! 		if (!strncmp(buf, "ROOT", strlen("ROOT"))) {
! 			s = buf + strlen("ROOT");
! 			while (isspace(*s))
! 				s++;
! 			fprintf(rootnodes, "%s", s);
! 			fflush(rootnodes);
! #ifdef DEBUG
! 			Log("Passing Root: %s\n", s);
! #endif
! 		} else if (!strncmp(buf, "LEAF", strlen("LEAF"))) {
  			s = buf + strlen("LEAF");
  			while (isspace(*s))
  				s++;
--- 258,268 ----
  		exit(1);
  	}
  	/* 
! 	 * Process the leafnodes
  	 */
! 	while (leafSeen || fgets(buf, BUFSIZ, stdin)) {
! 	        leafSeen = 0;
! 		if (!strncmp(buf, "LEAF", strlen("LEAF"))) {
  			s = buf + strlen("LEAF");
  			while (isspace(*s))
  				s++;
***************
*** 242,258 ****
  #ifdef DEBUG
  			Log("Passing Leaf: %s\n", s);
  #endif
  		} else {
  			Log("Illegal Input: %s\n", buf);
  		}
  	}
- 	fclose(rootnodes);
- 	close(rootpipe[1]);
  	fclose(leafnodes);
  	close(leafpipe[1]);
! 	while (ncaught < 2) {
! 		cpid = wait(NULL);
! 		if ((cpid == rpid) || (cpid == lpid))
  			ncaught++;
  	}
  	exit(0);
--- 271,292 ----
  #ifdef DEBUG
  			Log("Passing Leaf: %s\n", s);
  #endif
+ 		} else if (buf[0] == '#') {
+ 		        /*
+ 			 * Pass comments
+ 			 */
+ 		        fprintf(leafnodes, "%s", buf);
  		} else {
  			Log("Illegal Input: %s\n", buf);
  		}
  	}
  	fclose(leafnodes);
  	close(leafpipe[1]);
! 	ncaught = 0;
! 	while (ncaught < 1) {
!                lpid = wait(NULL);
!                if (cpid == rpid)
! 
  			ncaught++;
  	}
  	exit(0);
