From: yamaoka <yamaoka>
Date: Thu, 13 Jul 2000 08:51:34 +0000 (+0000)
Subject: Sync.
X-Git-Tag: t-gnus-6_14-quimby-before-installer-changed-~173
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=4cae3582b834f8a847842b1cb82ef8acc40cc91f;p=elisp%2Fgnus.git-

Sync.
---

diff --git a/ChangeLog b/ChangeLog
index 31a3e6b..469b3dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2000-07-13  Katsumi Yamaoka <yamaoka@jpl.org>
+
+	* configure: Regenerate with autoconf v2.14.1.
+	* aclocal.m4: Regenerate with aclocal v1.4.
+
+	* configure.in: Don't call `AC_CHECK_PROG' for `EMACS'.
+
+	* acinclude.m4: Merge ShengHuo's changes.
+	(AC_CHECK_W3): Use `quote' instead of '.
+	(AC_XEMACS_P): Don't modify the value of `XEMACS'.
+	(AC_EMACS_LISP): Safely quote the elisp form.
+
+2000-07-12 15:47:06  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* aclocal.m4: Stolen macros from w3.
+	* configure.in: Use them.
+	* configure: Generate it.
+
 2000-07-03  Katsumi Yamaoka <yamaoka@jpl.org>
 
 	* lisp/gnus-vers.el (T-gnus): Update to 6.14.5.
diff --git a/acinclude.m4 b/acinclude.m4
index 79ff3ac..5c642e5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -32,7 +32,7 @@ AC_DEFUN(AM_PATH_LISPDIR,
       AC_MSG_ERROR(you should install Emacs first)
     fi
   fi
-  dnl # 
+  dnl #
   dnl # Check Emacs directories
   dnl #
   AC_MSG_CHECKING([where emacs files are in])
@@ -77,7 +77,7 @@ AC_DEFUN(AM_PATH_LISPDIR,
   fi
   AC_MSG_RESULT($emacsdir)
   AC_SUBST(emacsdir)
-  dnl # 
+  dnl #
   dnl # Check Emacs site-lisp directories
   dnl #
   AC_ARG_WITH(lispdir,
@@ -101,3 +101,115 @@ AC_DEFUN(AM_PATH_LISPDIR,
   fi
   AC_MSG_RESULT($lispdir)
   AC_SUBST(lispdir)])
+
+dnl AC_EMACS_LIST AC_XEMACS_P AC_PATH_LISPDIR and AC_EMACS_CHECK_LIB
+dnl are stolen from w3.
+dnl AC_PATH_LISPDIR obsoletes AM_PATH_LISPDIR.
+
+AC_DEFUN(AC_EMACS_LISP, [
+elisp="$2"
+if test -z "$3"; then
+	AC_MSG_CHECKING(for $1)
+fi
+AC_CACHE_VAL(EMACS_cv_SYS_$1,[
+	OUTPUT=./conftest-$$
+	echo ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& AC_FD_CC 2>&1
+	eval ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& AC_FD_CC 2>&1
+	retval=`cat ${OUTPUT}`
+	echo "=> ${retval}" >& AC_FD_CC 2>&1
+	rm -f ${OUTPUT}
+	EMACS_cv_SYS_$1=$retval
+])
+$1=${EMACS_cv_SYS_$1}
+if test -z "$3"; then
+	AC_MSG_RESULT($$1)
+fi
+])
+
+AC_DEFUN(AC_XEMACS_P, [
+  AC_MSG_CHECKING([if $EMACS is really XEmacs])
+  AC_EMACS_LISP(xemacsp,(if (string-match \"XEmacs\" emacs-version) \"yes\" \"no\") ,"noecho")
+  XEMACSP=${EMACS_cv_SYS_xemacsp}
+  EMACS_FLAVOR=emacs
+  if test "$XEMACSP" = "yes"; then
+     EMACS_FLAVOR=xemacs
+  fi
+  AC_MSG_RESULT($XEMACSP)
+  AC_SUBST(EMACS_FLAVOR)
+])
+
+AC_DEFUN(AC_PATH_LISPDIR, [
+  AC_XEMACS_P
+  if test "$prefix" = "NONE"; then
+	AC_MSG_CHECKING([prefix for your Emacs])
+	AC_EMACS_LISP(prefix,(expand-file-name \"..\" invocation-directory),"noecho")
+	prefix=${EMACS_cv_SYS_prefix}
+	AC_MSG_RESULT($prefix)
+  fi
+  AC_ARG_WITH(lispdir,[  --with-lispdir=DIR      Where to install lisp files], lispdir=${withval})
+  AC_MSG_CHECKING([where .elc files should go])
+  if test -z "$lispdir"; then
+    dnl Set default value
+    theprefix=$prefix
+    if test "x$theprefix" = "xNONE"; then
+	theprefix=$ac_default_prefix
+    fi
+    lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp"
+    for thedir in share lib; do
+	potential=
+	if test -d ${theprefix}/${thedir}/${EMACS_FLAVOR}/site-lisp; then
+	   lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-lisp"
+	   break
+	fi
+    done
+  fi
+  AC_MSG_RESULT($lispdir)
+  AC_SUBST(lispdir)
+])
+
+dnl
+dnl Check whether a function exists in a library
+dnl All '_' characters in the first argument are converted to '-'
+dnl
+AC_DEFUN(AC_EMACS_CHECK_LIB, [
+if test -z "$3"; then
+	AC_MSG_CHECKING(for $2 in $1)
+fi
+library=`echo $1 | tr _ -`
+AC_EMACS_LISP($1,(progn (fmakunbound (quote $2)) (condition-case nil (progn (require (quote $library)) (fboundp (quote $2))) (error (prog1 nil (message \"$library not found\"))))),"noecho")
+if test "${EMACS_cv_SYS_$1}" = "nil"; then
+	EMACS_cv_SYS_$1=no
+fi
+if test "${EMACS_cv_SYS_$1}" = "t"; then
+	EMACS_cv_SYS_$1=yes
+fi
+HAVE_$1=${EMACS_cv_SYS_$1}
+AC_SUBST(HAVE_$1)
+if test -z "$3"; then
+	AC_MSG_RESULT($HAVE_$1)
+fi
+])
+
+dnl
+dnl Perform sanity checking and try to locate the W3 package
+dnl
+AC_DEFUN(AC_CHECK_W3, [
+AC_MSG_CHECKING(for acceptable W3 version)
+AC_CACHE_VAL(EMACS_cv_ACCEPTABLE_W3,[
+AC_EMACS_CHECK_LIB(w3_forms, w3-form-encode-xwfu,"noecho")
+if test "${HAVE_w3_forms}" = "yes"; then
+	EMACS_cv_ACCEPTABLE_W3=yes
+else
+	EMACS_cv_ACCEPTABLE_W3=no
+fi
+
+if test "${EMACS_cv_ACCEPTABLE_W3}" = "yes"; then
+	AC_EMACS_LISP(w3_dir,(file-name-directory (locate-library \"w3-forms\")),"noecho")
+	EMACS_cv_ACCEPTABLE_W3=$EMACS_cv_SYS_w3_forms
+fi
+])
+   AC_ARG_WITH(w3,[  --with-w3=DIR           Specify where to find the w3 package], [ EMACS_cv_ACCEPTABLE_W3=`( cd $withval && pwd || echo "$withval" ) 2> /dev/null` ])
+   W3=${EMACS_cv_ACCEPTABLE_W3}
+   AC_SUBST(W3)
+   AC_MSG_RESULT("${W3}")
+])
diff --git a/aclocal.m4 b/aclocal.m4
index fa32a2a..bb0dca0 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-dnl aclocal.m4 generated automatically by aclocal 1.3
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
@@ -44,7 +44,7 @@ AC_DEFUN(AM_PATH_LISPDIR,
       AC_MSG_ERROR(you should install Emacs first)
     fi
   fi
-  dnl # 
+  dnl #
   dnl # Check Emacs directories
   dnl #
   AC_MSG_CHECKING([where emacs files are in])
@@ -89,7 +89,7 @@ AC_DEFUN(AM_PATH_LISPDIR,
   fi
   AC_MSG_RESULT($emacsdir)
   AC_SUBST(emacsdir)
-  dnl # 
+  dnl #
   dnl # Check Emacs site-lisp directories
   dnl #
   AC_ARG_WITH(lispdir,
@@ -107,111 +107,122 @@ AC_DEFUN(AM_PATH_LISPDIR,
     fi
     case "$EMACS_BASENAME" in
     xemacs|xemacs-*)
-      lispdir="$lispdir/tgnus"
+      lispdir="$lispdir/lookup"
       ;;
     esac
   fi
   AC_MSG_RESULT($lispdir)
   AC_SUBST(lispdir)])
 
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+dnl AC_EMACS_LIST AC_XEMACS_P AC_PATH_LISPDIR and AC_EMACS_CHECK_LIB
+dnl are stolen from w3.
+dnl AC_PATH_LISPDIR obsoletes AM_PATH_LISPDIR.
 
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AM_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+AC_DEFUN(AC_EMACS_LISP, [
+elisp="$2"
+if test -z "$3"; then
+	AC_MSG_CHECKING(for $1)
+fi
+AC_CACHE_VAL(EMACS_cv_SYS_$1,[
+	OUTPUT=./conftest-$$
+	echo ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& AC_FD_CC 2>&1
+	eval ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& AC_FD_CC 2>&1
+	retval=`cat ${OUTPUT}`
+	echo "=> ${retval}" >& AC_FD_CC 2>&1
+	rm -f ${OUTPUT}
+	EMACS_cv_SYS_$1=$retval
+])
+$1=${EMACS_cv_SYS_$1}
+if test -z "$3"; then
+	AC_MSG_RESULT($$1)
 fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-
-# serial 1
-
-AC_DEFUN(AM_PROG_INSTALL,
-[AC_REQUIRE([AC_PROG_INSTALL])
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-AC_SUBST(INSTALL_SCRIPT)dnl
 ])
 
-#
-# Check to make sure that the build environment is sane.
-#
+AC_DEFUN(AC_XEMACS_P, [
+  AC_MSG_CHECKING([if $EMACS is really XEmacs])
+  AC_EMACS_LISP(xemacsp,(if (string-match \"XEmacs\" emacs-version) \"yes\" \"no\") ,"noecho")
+  XEMACSP=${EMACS_cv_SYS_xemacsp}
+  EMACS_FLAVOR=emacs
+  if test "$XEMACSP" = "yes"; then
+     EMACS_FLAVOR=xemacs
+  fi
+  AC_MSG_RESULT($XEMACSP)
+  AC_SUBST(EMACS_FLAVOR)
+])
 
-AC_DEFUN(AM_SANITY_CHECK,
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
+AC_DEFUN(AC_PATH_LISPDIR, [
+  AC_XEMACS_P
+  if test "$prefix" = "NONE"; then
+	AC_MSG_CHECKING([prefix for your Emacs])
+	AC_EMACS_LISP(prefix,(expand-file-name \"..\" invocation-directory),"noecho")
+	prefix=${EMACS_cv_SYS_prefix}
+	AC_MSG_RESULT($prefix)
+  fi
+  AC_ARG_WITH(lispdir,[  --with-lispdir=DIR      Where to install lisp files], lispdir=${withval})
+  AC_MSG_CHECKING([where .elc files should go])
+  if test -z "$lispdir"; then
+    dnl Set default value
+    theprefix=$prefix
+    if test "x$theprefix" = "xNONE"; then
+	theprefix=$ac_default_prefix
+    fi
+    lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp"
+    for thedir in share lib; do
+	potential=
+	if test -d ${theprefix}/${thedir}/${EMACS_FLAVOR}/site-lisp; then
+	   lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-lisp"
+	   break
+	fi
+    done
+  fi
+  AC_MSG_RESULT($lispdir)
+  AC_SUBST(lispdir)
+])
 
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
+dnl
+dnl Check whether a function exists in a library
+dnl All '_' characters in the first argument are converted to '-'
+dnl
+AC_DEFUN(AC_EMACS_CHECK_LIB, [
+if test -z "$3"; then
+	AC_MSG_CHECKING(for $2 in $1)
+fi
+library=`echo $1 | tr _ -`
+AC_EMACS_LISP($1,(progn (fmakunbound (quote $2)) (condition-case nil (progn (require (quote $library)) (fboundp (quote $2))) (error (prog1 nil (message \"$library not found\"))))),"noecho")
+if test "${EMACS_cv_SYS_$1}" = "nil"; then
+	EMACS_cv_SYS_$1=no
+fi
+if test "${EMACS_cv_SYS_$1}" = "t"; then
+	EMACS_cv_SYS_$1=yes
+fi
+HAVE_$1=${EMACS_cv_SYS_$1}
+AC_SUBST(HAVE_$1)
+if test -z "$3"; then
+	AC_MSG_RESULT($HAVE_$1)
+fi
+])
 
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
+dnl
+dnl Perform sanity checking and try to locate the W3 package
+dnl
+AC_DEFUN(AC_CHECK_W3, [
+AC_MSG_CHECKING(for acceptable W3 version)
+AC_CACHE_VAL(EMACS_cv_ACCEPTABLE_W3,[
+AC_EMACS_CHECK_LIB(w3_forms, w3-form-encode-xwfu,"noecho")
+if test "${HAVE_w3_forms}" = "yes"; then
+	EMACS_cv_ACCEPTABLE_W3=yes
 else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
+	EMACS_cv_ACCEPTABLE_W3=no
 fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
 
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
+if test "${EMACS_cv_ACCEPTABLE_W3}" = "yes"; then
+	AC_EMACS_LISP(w3_dir,(file-name-directory (locate-library \"w3-forms\")),"noecho")
+	EMACS_cv_ACCEPTABLE_W3=$EMACS_cv_SYS_w3_forms
 fi
-AC_SUBST($1)])
+])
+   AC_ARG_WITH(w3,[  --with-w3=DIR           Specify where to find the w3 package], [ EMACS_cv_ACCEPTABLE_W3=`( cd $withval && pwd || echo "$withval" ) 2> /dev/null` ])
+   W3=${EMACS_cv_ACCEPTABLE_W3}
+   AC_SUBST(W3)
+   AC_MSG_RESULT("${W3}")
+])
 
diff --git a/configure b/configure
index f96ef07..519c2a7 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
+# Generated automatically using autoconf version 2.14.1 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -12,15 +12,17 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
-  --with-emacs=EMACS      compile with EMACS [EMACS=emacs, xemacs...]"
+  --with-xemacs           Use XEmacs to build [XEMACS=xemacs]"
 ac_help="$ac_help
-  --with-lispdir=DIR      emacs lisp files go to DIR [guessed]"
+  --with-emacs            Use Emacs to build  [EMACS=emacs]"
+ac_help="$ac_help
+  --with-lispdir=DIR      Where to install lisp files"
+ac_help="$ac_help
+  --with-w3=DIR           Specify where to find the w3 package"
 ac_help="$ac_help
   --with-addpath=PATH     search Emacs-Lisp libraries with PATH
                           use colons to separate directory names"
 ac_help="$ac_help
-  --with-xemacs=XEMACS    compile with XEMACS [XEMACS=xemacs]"
-ac_help="$ac_help
   --with-packagedir=DIR   package DIR for XEmacs [guessed]"
 
 # Initialize some variables set by options.
@@ -344,7 +346,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
+    echo "configure generated by autoconf version 2.14.1"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -504,7 +506,7 @@ done
 
 if test -r "$cache_file"; then
   echo "loading cache $cache_file"
-  . $cache_file
+      test -f "$cache_file" && . $cache_file
 else
   echo "creating cache $cache_file"
   > $cache_file
@@ -533,9 +535,9 @@ fi
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:537: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:539: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftestmake <<\EOF
@@ -574,9 +576,9 @@ done
 if test -z "$ac_aux_dir"; then
   { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
 fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -590,9 +592,9 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # 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:594: checking for a BSD compatible install" >&5
+echo "configure:596: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_path_install+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
@@ -610,6 +612,10 @@ else
             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus $ac_dir/$ac_prog >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
 	    break 2
@@ -638,189 +644,264 @@ echo "$ac_t""$INSTALL" 1>&6
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-      # Check whether --with-emacs or --without-emacs was given.
+
+XEMACS="xemacs"
+EMACS="emacs"
+# Check whether --with-xemacs or --without-xemacs was given.
+if test "${with_xemacs+set}" = set; then
+  withval="$with_xemacs"
+   if test "${withval}" = "yes"; then
+		EMACS=${XEMACS};
+	elif test "${withval}" != "no"; then
+		XEMACS=${withval};
+		EMACS=${withval};
+	fi 
+fi
+
+
+
+# Check whether --with-emacs or --without-emacs was given.
 if test "${with_emacs+set}" = set; then
   withval="$with_emacs"
-  case "${withval}" in
-       yes)	EMACS= ;;
-       no)	{ echo "configure: error: emacs is not available" 1>&2; exit 1; } ;;
-       *)	EMACS=${withval} ;;
-     esac
-else
-  EMACS=
+   if test "${withval}" != "yes" && test "${withval}" != "no"; then
+		EMACS=${withval};
+	fi 
 fi
 
-  if test "x$EMACS" = "xt" -o "x$EMACS" = x; then
-    for ac_prog in emacs xemacs mule
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+
+
+# Extract the first word of "makeinfo", so it can be a program name with args.
+set dummy makeinfo; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:664: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then
+echo "configure:681: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_MAKEINFO+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$EMACS" in
-  /*)
-  ac_cv_path_EMACS="$EMACS" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_EMACS="$EMACS" # Let the user override the test with a dos path.
-  ;;
-  *)
+  if test -n "$MAKEINFO"; then
+  ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
+else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_path_EMACS="$ac_dir/$ac_word"
+      ac_cv_prog_MAKEINFO="makeinfo"
       break
     fi
   done
   IFS="$ac_save_ifs"
-  ;;
-esac
+  test -z "$ac_cv_prog_MAKEINFO" && ac_cv_prog_MAKEINFO="no"
+fi
 fi
-EMACS="$ac_cv_path_EMACS"
-if test -n "$EMACS"; then
-  echo "$ac_t""$EMACS" 1>&6
+MAKEINFO="$ac_cv_prog_MAKEINFO"
+if test -n "$MAKEINFO"; then
+  echo "$ac_t""$MAKEINFO" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-test -n "$EMACS" && break
-done
-test -n "$EMACS" || EMACS="no"
 
-    if test $EMACS = no; then
-      { echo "configure: error: you should install Emacs first" 1>&2; exit 1; }
-    fi
-  fi
-        echo $ac_n "checking where emacs files are in""... $ac_c" 1>&6
-echo "configure:705: checking where emacs files are in" >&5
-  EMACS_BASENAME="`echo x$EMACS | sed -e 's/x//' -e 's/^.*\///'`"
-  if test "x$emacsdir" = x; then
-    if test "x$prefix" = "xNONE"; then
-      prefix=$ac_default_prefix
-    fi
-    emacsdir="\$(datadir)/emacs"
-    case "$EMACS_BASENAME" in
-    emacs|emacs-*)
-      if test -d $prefix/lib/emacs; then
-	emacsdir="$prefix/lib/emacs"
-      fi
-      if test -d $prefix/share/emacs; then
-	emacsdir="$prefix/share/emacs"
-      fi
-      ;;
-    xemacs|xemacs-*)
-      if test -d $prefix/lib/xemacs; then
-	emacsdir="$prefix/lib/xemacs"
-      fi
-      if test -d $prefix/share/xemacs; then
-	emacsdir="$prefix/share/xemacs"
-      fi
-      ;;
-    mule|mule-*)
-      if test -d $prefix/lib/emacs; then
-	emacsdir="$prefix/lib/emacs"
-      fi
-      if test -d $prefix/share/emacs; then
-	emacsdir="$prefix/share/emacs"
-      fi
-      if test -d $prefix/lib/mule; then
-	emacsdir="$prefix/lib/mule"
-      fi
-      if test -d $prefix/share/mule; then
-	emacsdir="$prefix/share/mule"
-      fi
-      ;;
-    esac
+
+  
+  echo $ac_n "checking if $EMACS is really XEmacs""... $ac_c" 1>&6
+echo "configure:712: checking if $EMACS is really XEmacs" >&5
+  
+elisp="(if (string-match \"XEmacs\" emacs-version) \"yes\" \"no\") "
+if test -z ""noecho""; then
+	echo $ac_n "checking for xemacsp""... $ac_c" 1>&6
+echo "configure:717: checking for xemacsp" >&5
+fi
+if eval "test \"\${EMACS_cv_SYS_xemacsp+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+	OUTPUT=./conftest-$$
+	echo ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1
+	eval ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1
+	retval=`cat ${OUTPUT}`
+	echo "=> ${retval}" >& 5 2>&1
+	rm -f ${OUTPUT}
+	EMACS_cv_SYS_xemacsp=$retval
+
+fi
+
+xemacsp=${EMACS_cv_SYS_xemacsp}
+if test -z ""noecho""; then
+	echo "$ac_t""$xemacsp" 1>&6
+fi
+
+  XEMACSP=${EMACS_cv_SYS_xemacsp}
+  EMACS_FLAVOR=emacs
+  if test "$XEMACSP" = "yes"; then
+     EMACS_FLAVOR=xemacs
   fi
-  echo "$ac_t""$emacsdir" 1>&6
+  echo "$ac_t""$XEMACSP" 1>&6
+  
+
+  if test "$prefix" = "NONE"; then
+	echo $ac_n "checking prefix for your Emacs""... $ac_c" 1>&6
+echo "configure:748: checking prefix for your Emacs" >&5
+	
+elisp="(expand-file-name \"..\" invocation-directory)"
+if test -z ""noecho""; then
+	echo $ac_n "checking for prefix""... $ac_c" 1>&6
+echo "configure:753: checking for prefix" >&5
+fi
+if eval "test \"\${EMACS_cv_SYS_prefix+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
   
-        # Check whether --with-lispdir or --without-lispdir was given.
+	OUTPUT=./conftest-$$
+	echo ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1
+	eval ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1
+	retval=`cat ${OUTPUT}`
+	echo "=> ${retval}" >& 5 2>&1
+	rm -f ${OUTPUT}
+	EMACS_cv_SYS_prefix=$retval
+
+fi
+
+prefix=${EMACS_cv_SYS_prefix}
+if test -z ""noecho""; then
+	echo "$ac_t""$prefix" 1>&6
+fi
+
+	prefix=${EMACS_cv_SYS_prefix}
+	echo "$ac_t""$prefix" 1>&6
+  fi
+  # Check whether --with-lispdir or --without-lispdir was given.
 if test "${with_lispdir+set}" = set; then
   withval="$with_lispdir"
-  case "${withval}" in
-       yes)	lispdir= ;;
-       no)	{ echo "configure: error: lispdir is not available" 1>&2; exit 1; } ;;
-       *)	lispdir=${withval} ;;
-     esac
-else
-  lispdir=
+  lispdir=${withval}
 fi
 
   echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
-echo "configure:760: checking where .elc files should go" >&5
-  if test "x$lispdir" = x; then
-    lispdir="$emacsdir/site-lisp"
-    if test -d $emacsdir/lisp; then
-      lispdir="$emacsdir/lisp"
+echo "configure:784: checking where .elc files should go" >&5
+  if test -z "$lispdir"; then
+        theprefix=$prefix
+    if test "x$theprefix" = "xNONE"; then
+	theprefix=$ac_default_prefix
     fi
-    case "$EMACS_BASENAME" in
-    xemacs|xemacs-*)
-      lispdir="$lispdir/tgnus"
-      ;;
-    esac
+    lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp"
+    for thedir in share lib; do
+	potential=
+	if test -d ${theprefix}/${thedir}/${EMACS_FLAVOR}/site-lisp; then
+	   lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-lisp"
+	   break
+	fi
+    done
   fi
   echo "$ac_t""$lispdir" 1>&6
   
-# Extract the first word of "makeinfo", so it can be a program name with args.
-set dummy makeinfo; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:777: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MAKEINFO'+set}'`\" = set"; then
+
+
+
+echo $ac_n "checking for acceptable W3 version""... $ac_c" 1>&6
+echo "configure:805: checking for acceptable W3 version" >&5
+if eval "test \"\${EMACS_cv_ACCEPTABLE_W3+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$MAKEINFO" in
-  /*)
-  ac_cv_path_MAKEINFO="$MAKEINFO" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_MAKEINFO="$MAKEINFO" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_MAKEINFO="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MAKEINFO" && ac_cv_path_MAKEINFO="no"
-  ;;
-esac
+  
+
+if test -z ""noecho""; then
+	echo $ac_n "checking for w3-form-encode-xwfu in w3_forms""... $ac_c" 1>&6
+echo "configure:813: checking for w3-form-encode-xwfu in w3_forms" >&5
 fi
-MAKEINFO="$ac_cv_path_MAKEINFO"
-if test -n "$MAKEINFO"; then
-  echo "$ac_t""$MAKEINFO" 1>&6
+library=`echo w3_forms | tr _ -`
+
+elisp="(progn (fmakunbound (quote w3-form-encode-xwfu)) (condition-case nil (progn (require (quote $library)) (fboundp (quote w3-form-encode-xwfu))) (error (prog1 nil (message \"$library not found\")))))"
+if test -z ""noecho""; then
+	echo $ac_n "checking for w3_forms""... $ac_c" 1>&6
+echo "configure:820: checking for w3_forms" >&5
+fi
+if eval "test \"\${EMACS_cv_SYS_w3_forms+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  echo "$ac_t""no" 1>&6
+  
+	OUTPUT=./conftest-$$
+	echo ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1
+	eval ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1
+	retval=`cat ${OUTPUT}`
+	echo "=> ${retval}" >& 5 2>&1
+	rm -f ${OUTPUT}
+	EMACS_cv_SYS_w3_forms=$retval
+
 fi
 
+w3_forms=${EMACS_cv_SYS_w3_forms}
+if test -z ""noecho""; then
+	echo "$ac_t""$w3_forms" 1>&6
+fi
 
-ADDITIONAL_LOAD_PATH=
-# Check whether --with-addpath or --without-addpath was given.
-if test "${with_addpath+set}" = set; then
-  withval="$with_addpath"
-  ADDITIONAL_LOAD_PATH=$with_addpath
+if test "${EMACS_cv_SYS_w3_forms}" = "nil"; then
+	EMACS_cv_SYS_w3_forms=no
 fi
+if test "${EMACS_cv_SYS_w3_forms}" = "t"; then
+	EMACS_cv_SYS_w3_forms=yes
+fi
+HAVE_w3_forms=${EMACS_cv_SYS_w3_forms}
 
+if test -z ""noecho""; then
+	echo "$ac_t""$HAVE_w3_forms" 1>&6
+fi
 
+if test "${HAVE_w3_forms}" = "yes"; then
+	EMACS_cv_ACCEPTABLE_W3=yes
+else
+	EMACS_cv_ACCEPTABLE_W3=no
+fi
 
-XEMACS="xemacs"
-# Check whether --with-xemacs or --without-xemacs was given.
-if test "${with_xemacs+set}" = set; then
-  withval="$with_xemacs"
-  XEMACS=$with_xemacs
+if test "${EMACS_cv_ACCEPTABLE_W3}" = "yes"; then
+	
+elisp="(file-name-directory (locate-library \"w3-forms\"))"
+if test -z ""noecho""; then
+	echo $ac_n "checking for w3_dir""... $ac_c" 1>&6
+echo "configure:864: checking for w3_dir" >&5
+fi
+if eval "test \"\${EMACS_cv_SYS_w3_dir+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+	OUTPUT=./conftest-$$
+	echo ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1
+	eval ${EMACS}' -batch -eval '\''(let ((x '${elisp}')) (write-region (if (stringp x) (princ x) (prin1-to-string x)) nil "'${OUTPUT}'" nil 5))'\' >& 5 2>&1
+	retval=`cat ${OUTPUT}`
+	echo "=> ${retval}" >& 5 2>&1
+	rm -f ${OUTPUT}
+	EMACS_cv_SYS_w3_dir=$retval
+
+fi
+
+w3_dir=${EMACS_cv_SYS_w3_dir}
+if test -z ""noecho""; then
+	echo "$ac_t""$w3_dir" 1>&6
+fi
+
+	EMACS_cv_ACCEPTABLE_W3=$EMACS_cv_SYS_w3_forms
+fi
+
+fi
+
+   # Check whether --with-w3 or --without-w3 was given.
+if test "${with_w3+set}" = set; then
+  withval="$with_w3"
+   EMACS_cv_ACCEPTABLE_W3=`( cd $withval && pwd || echo "$withval" ) 2> /dev/null` 
+fi
+
+   W3=${EMACS_cv_ACCEPTABLE_W3}
+   
+   echo "$ac_t"""${W3}"" 1>&6
+
+
+ADDITIONAL_LOAD_PATH=
+# Check whether --with-addpath or --without-addpath was given.
+if test "${with_addpath+set}" = set; then
+  withval="$with_addpath"
+  ADDITIONAL_LOAD_PATH=${with_addpath}
 fi
 
 
@@ -829,7 +910,7 @@ PACKAGEDIR=
 # Check whether --with-packagedir or --without-packagedir was given.
 if test "${with_packagedir+set}" = set; then
   withval="$with_packagedir"
-  PACKAGEDIR=$with_packagedir
+  PACKAGEDIR=${with_packagedir}
 fi
 
 
@@ -901,7 +982,7 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
 cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%#define \([^ 	][^ 	]*\) *\(.*\)%-D\1=\2%g
 s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
 s%\[%\\&%g
 s%\]%\\&%g
@@ -936,7 +1017,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+    echo "$CONFIG_STATUS generated by autoconf version 2.14.1"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -983,12 +1064,14 @@ s%@SET_MAKE@%$SET_MAKE%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
+s%@XEMACS@%$XEMACS%g
 s%@EMACS@%$EMACS%g
-s%@emacsdir@%$emacsdir%g
-s%@lispdir@%$lispdir%g
 s%@MAKEINFO@%$MAKEINFO%g
+s%@EMACS_FLAVOR@%$EMACS_FLAVOR%g
+s%@lispdir@%$lispdir%g
+s%@HAVE_w3_forms@%$HAVE_w3_forms%g
+s%@W3@%$W3%g
 s%@ADDITIONAL_LOAD_PATH@%$ADDITIONAL_LOAD_PATH%g
-s%@XEMACS@%$XEMACS%g
 s%@PACKAGEDIR@%$PACKAGEDIR%g
 
 CEOF
diff --git a/configure.in b/configure.in
index dc7bafa..cf9ad75 100644
--- a/configure.in
+++ b/configure.in
@@ -1,32 +1,47 @@
 AC_INIT(lisp/gnus.el)
 AC_SET_MAKE
 AC_PROG_INSTALL
-AM_PATH_LISPDIR
-AC_PATH_PROG(MAKEINFO, makeinfo, no)
+
+XEMACS="xemacs"
+EMACS="emacs"
+AC_ARG_WITH(
+	xemacs,
+	[  --with-xemacs           Use XEmacs to build [XEMACS=xemacs]],
+	[ if test "${withval}" = "yes"; then
+		EMACS=${XEMACS};
+	elif test "${withval}" != "no"; then
+		XEMACS=${withval};
+		EMACS=${withval};
+	fi ])
+AC_SUBST(XEMACS)
+
+AC_ARG_WITH(
+	emacs,
+	[  --with-emacs            Use Emacs to build  [EMACS=emacs]],
+	[ if test "${withval}" != "yes" && test "${withval}" != "no"; then
+		EMACS=${withval};
+	fi ])
+AC_SUBST(EMACS)
+
+AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, no)
+
+AC_PATH_LISPDIR
+
+AC_CHECK_W3
 
 ADDITIONAL_LOAD_PATH=
 AC_ARG_WITH(
 	addpath,
 	[  --with-addpath=PATH     search Emacs-Lisp libraries with PATH
                           use colons to separate directory names],
-	ADDITIONAL_LOAD_PATH=$with_addpath,
-)
+	ADDITIONAL_LOAD_PATH=${with_addpath})
 AC_SUBST(ADDITIONAL_LOAD_PATH)
 
-XEMACS="xemacs"
-AC_ARG_WITH(
-	xemacs,
-	[  --with-xemacs=XEMACS    compile with XEMACS [XEMACS=xemacs]],
-	XEMACS=$with_xemacs,
-)
-AC_SUBST(XEMACS)
-
 PACKAGEDIR=
 AC_ARG_WITH(
 	packagedir,
 	[  --with-packagedir=DIR   package DIR for XEmacs [guessed]],
-	PACKAGEDIR=$with_packagedir,
-)
+	PACKAGEDIR=${with_packagedir})
 AC_SUBST(PACKAGEDIR)
 
 AC_OUTPUT(Makefile lisp/Makefile lisp/dgnuspath.el texi/Makefile)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3873c35..2675dbb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2000-07-12 16:50:06  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* lpath.el: Fbind subst-char-in-string.
+
+2000-07-12 15:48:29  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* Makefile.in: Use W3DIR and lispdir.
+	* dgnushack.el: Ditto.
+
+2000-07-12 10:12:31  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus-art.el (article-de-base64-unreadable): Typo.
+
+2000-07-12  Simon Josefsson  <jas@pdc.kth.se>
+
+	* gnus-agent.el (require): Require timer.
+
 2000-07-11 18:29:50  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* message.el (message-bounce): Call mime-to-mml.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 2672f43..7bc3dbf 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -12,19 +12,22 @@ INSTALL_DATA = @INSTALL_DATA@
 SHELL = /bin/sh
 VPATH = @srcdir@
 PACKAGEDIR = @PACKAGEDIR@
+W3DIR = @W3@
 
 all total:
 	rm -f *.elc auto-autoloads.el custom-load.el
-	srcdir=$(srcdir) $(EMACS) $(FLAGS) -f dgnushack-compile
+	W3DIR=$(W3DIR) lispdir=$(lispdir) \
+		srcdir=$(srcdir) $(EMACS) $(FLAGS) -f dgnushack-compile
 
 warn:
 	rm -f *.elc
-	srcdir=$(srcdir) $(EMACS) $(FLAGS) --eval '(dgnushack-compile t)' 2>&1 | egrep -v "variable G|inhibit-point-motion-hooks|coding-system|temp-results|variable gnus|variable nn|scroll-in-place|deactivate-mark|filladapt-mode|byte-code-function-p|print-quoted|ps-right-header|ps-left-header|article-inhibit|print-escape|ssl-program-arguments|message-log-max"
+	W3DIR=$(W3DIR) lispdir=$(lispdir) srcdir=$(srcdir) $(EMACS) $(FLAGS) --eval '(dgnushack-compile t)' 2>&1 | egrep -v "variable G|inhibit-point-motion-hooks|coding-system|temp-results|variable gnus|variable nn|scroll-in-place|deactivate-mark|filladapt-mode|byte-code-function-p|print-quoted|ps-right-header|ps-left-header|article-inhibit|print-escape|ssl-program-arguments|message-log-max"
 
 # The "clever" rule is unsafe, since redefined macros are loaded from
 # .elc files, and not the .el file.
 clever some:
-	srcdir=$(srcdir) $(EMACS) $(FLAGS) -f dgnushack-compile
+	W3DIR=$(W3DIR) lispdir=$(lispdir) \
+		srcdir=$(srcdir) $(EMACS) $(FLAGS) -f dgnushack-compile
 
 install: clever
 	rm -f dgnushack.elc
diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index c1c933e..067e15b 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -51,7 +51,13 @@
 
 (require 'cl)
 
-(push "/usr/share/emacs/site-lisp" load-path)
+(defvar srcdir (or (getenv "srcdir") "."))
+
+(push (or (getenv "lispdir")
+	  "/usr/share/emacs/site-lisp")
+      load-path)
+(push (or (getenv "W3DIR") (expand-file-name "../../w3/lisp/" srcdir))
+      load-path)
 
 ;; If we are building w3 in a different directory than the source
 ;; directory, we must read *.el from source directory and write *.elc
@@ -99,8 +105,6 @@
       (si:byte-optimize-form-code-walker form for-effect)))
   (byte-compile 'byte-optimize-form-code-walker))
 
-(defvar srcdir (or (getenv "srcdir") "."))
-
 (load (expand-file-name "gnus-clfns.el" srcdir) nil t t)
 
 ;(push "/usr/share/emacs/site-lisp" load-path)
diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 78be9e9..073306c 100644
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -31,7 +31,10 @@
 (require 'gnus-cache)
 (require 'nnvirtual)
 (require 'gnus-sum)
-(eval-when-compile (require 'gnus-score) (require 'gnus-group))
+(eval-when-compile
+  (require 'timer)
+  (require 'gnus-score)
+  (require 'gnus-group))
 
 (defcustom gnus-agent-directory (nnheader-concat gnus-directory "agent/")
   "Where the Gnus agent will store its files."
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index b9751e5..0332dda 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1673,7 +1673,7 @@ If FORCE, decode the article whether it is marked as base64 not."
 	  (type (gnus-fetch-field "content-transfer-encoding"))
 	  (charset gnus-newsgroup-charset))
       (when (or force
-		(and type (string-match "quoted-printable" (downcase type))))
+		(and type (string-match "base64" (downcase type))))
 	(article-goto-body)
 	(save-restriction
 	  (narrow-to-region (point) (point-max))
diff --git a/lisp/lpath.el b/lisp/lpath.el
index 49b5eae..5edcab5 100644
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -39,7 +39,7 @@
 		     url-view-url w3-prepare-buffer
 		     set-buffer-multibyte
 		     find-non-ascii-charset-region char-charset
-		     find-charset-region
+		     find-charset-region subst-char-in-string
 		     find-coding-systems-region get-charset-property
 		     coding-system-get w3-region
 		     w3-coding-system-for-mime-charset
@@ -50,8 +50,7 @@
 		     vcard-pretty-print image-type-available-p
 		     put-image create-image  display-graphic-p
 		     find-image insert-image image-size
-		     make-overlay overlay-put make-symbolic-link
-		     subst-char-in-string))
+		     make-overlay overlay-put make-symbolic-link))
       (maybe-bind '(global-face-data
 		    mark-active transient-mark-mode mouse-selection-click-count
 		    mouse-selection-click-count-buffer buffer-display-table
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 2cc25e2..f53b2ec 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-12 15:49:34  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* Makefile.in: Add EMACS. Test -x "$(MAKEINFO)" does not work.
+	Use sed instead of perl (suggested by Nick V. Pakoulin).
+
 2000-07-03 00:24:55  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus.texi (Splitting Mail): Mention gnus-summary-respool-trace. 
diff --git a/texi/Makefile.in b/texi/Makefile.in
index 9f9633e..2e07a96 100644
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -8,15 +8,14 @@ top_srcdir = @top_srcdir@
 VPATH=$(srcdir)
 TEXI2DVI=texi2dvi
 TEXI2PDF=texi2pdf
-EMACS=@EMACS@
 MAKEINFO=@MAKEINFO@
-FLAGS=-batch -q -no-site-file
+EMACS=@EMACS@
+EMACSINFO=$(EMACS) -batch -q -no-site-file
 INFOSWI=-l ./dgnushack.el -f dgnushack-texi-format
 XINFOSWI=-l ./dgnushack.el -f dgnushack-texi-add-suffix-and-format
 PDFLATEX=pdflatex
 LATEX=latex
 DVIPS=dvips
-PERL=perl
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 SHELL = /bin/sh
@@ -39,7 +38,7 @@ most: texi2latex.elc latex latexps
 
 %.info: %.texi
 	if test $(MAKEINFO) = no; then \
-	  cd ../lisp && $(EMACS) $(FLAGS) $(XINFOSWI) ../texi/$<; \
+	  cd ../lisp && $(EMACSINFO) $(XINFOSWI) ../texi/$<; \
 	else \
 	  makeinfo -o $@ $<; \
 	fi
@@ -47,24 +46,24 @@ most: texi2latex.elc latex latexps
 .SUFFIXES: .texi .dvi .ps .pdf
 
 .texi:
-	if test $(MAKEINFO) = no; then \
-	  cd ../lisp && $(EMACS) $(FLAGS) $(INFOSWI) ../texi/$<; \
+	if test "x$(MAKEINFO)" != "xno" ; then \
+	  makeinfo -o $* $<; \
 	else \
-	  makeinfo $<; \
+	  cd ../lisp && $(EMACSINFO) $(INFOSWI) ../texi/$<; \
 	fi
 
 dvi: gnus.dvi message.dvi refcard.dvi emacs-mime.dvi
 
 pdf: gnus.pdf message.pdf refcard.pdf emacs-mime.pdf
- 
+
 .texi.dvi :
-	$(PERL) -n -e 'print unless (/\@iflatex/ .. /\@end iflatex/)' $< > gnustmp.texi
+	sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi
 	$(TEXI2DVI) gnustmp.texi
 	cp gnustmp.dvi $*.dvi
 	rm gnustmp.*
 
 .texi.pdf :
-	$(PERL) -n -e 'print unless (/\@iflatex/ .. /\@end iflatex/)' $< > gnustmp.texi
+	sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi
 	$(TEXI2PDF) gnustmp.texi
 	cp gnustmp.pdf $*.pdf
 	rm gnustmp.*
@@ -79,7 +78,7 @@ refcard.pdf: refcard.tex gnuslogo.refcard gnusref.tex
 
 clean:
 	rm -f gnus.*.bak *.ky *.cp *.fn *.cps *.kys *.log *.aux *.dvi *.vr \
-	*.tp *.toc *.pg gnus.latexi *.aux *.[cgk]idx \
+	*.pdf *.tp *.toc *.pg gnus.latexi *.aux *.[cgk]idx \
 	gnus.ilg gnus.ind gnus.[cgk]ind gnus.idx \
 	gnus.tmptexi *.tmplatexi gnus.tmplatexi1 texput.log *.orig *.rej \
 	gnus.latexi*~* tmp/*.ps xface.tex picons.tex smiley.tex *.latexi \