From 852af711f331d430a3a21712e8907e0b804a78b3 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Mon, 24 Jul 2000 04:22:22 +0000
Subject: [PATCH] AC major changed. * lisp/gnus-vers.el
 (gnus-revision-number): Increment to 03. * configure:
 Regenerate with autoconf v2.14.1. * configure.in: Rewrite
 for using new macros in aclocal.m4. * aclocal.m4:
 (AC_ADD_LOAD_PATH, AC_PATH_PACKAGEDIR, AC_CHECK_EMACS,
 AC_DEFINE_GNUS_PRODUCT_NAME): New macros.
 (AC_PATH_LISPDIR): Set `lispdir' to ".../site-lisp/t-gnus"
 by default. (AM_PATH_LISPDIR): Remove. * acinclude.m4:
 Remove. * lisp/dgnushack.el: Don't add
 "/usr/share/emacs/site-lisp" to `load-path'.

---
 ChangeLog         |   19 +++
 acinclude.m4      |  103 --------------
 aclocal.m4        |  282 ++++++++++---------------------------
 configure         |  402 ++++++++++++++++++++++++++++++++---------------------
 configure.in      |   34 +----
 lisp/dgnushack.el |    2 -
 lisp/gnus-vers.el |    2 +-
 7 files changed, 350 insertions(+), 494 deletions(-)
 delete mode 100644 acinclude.m4

diff --git a/ChangeLog b/ChangeLog
index 5c356ed..0f7187e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2000-07-24  Katsumi Yamaoka <yamaoka@jpl.org>
+
+	* lisp/gnus-vers.el (gnus-revision-number): Increment to 03.
+
+	* configure: Regenerate with autoconf v2.14.1.
+
+	* configure.in: Rewrite for using new macros in aclocal.m4.
+
+	* aclocal.m4: (AC_ADD_LOAD_PATH, AC_PATH_PACKAGEDIR,
+	AC_CHECK_EMACS, AC_DEFINE_GNUS_PRODUCT_NAME): New macros.
+	(AC_PATH_LISPDIR): Set `lispdir' to ".../site-lisp/t-gnus" by
+	default.
+	(AM_PATH_LISPDIR): Remove.
+
+	* acinclude.m4: Remove.
+
+	* lisp/dgnushack.el: Don't add "/usr/share/emacs/site-lisp" to
+	`load-path'.
+
 2000-07-21   Daiki Ueno  <ueno@unixuser.org>
 
 	* lisp/gnus-bbdb.el (gnus-bbdb/update-record): Use
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 79ff3ac..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,103 +0,0 @@
-dnl Copyright (C) 1999 NISHIDA Keisuke <knishida@ring.aist.go.jp>
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
-dnl any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-dnl 02111-1307, USA.
-
-AC_DEFUN(AM_PATH_LISPDIR,
- [dnl #
-  dnl # Check Emacs
-  dnl #
-  AC_ARG_WITH(emacs,
-    [  --with-emacs=EMACS      compile with EMACS [EMACS=emacs, xemacs...]],
-    [case "${withval}" in
-       yes)	EMACS= ;;
-       no)	AC_MSG_ERROR([emacs is not available]) ;;
-       *)	EMACS=${withval} ;;
-     esac], EMACS=)
-  if test "x$EMACS" = "xt" -o "x$EMACS" = x; then
-    AC_PATH_PROGS(EMACS, emacs xemacs mule, no)
-    if test $EMACS = no; then
-      AC_MSG_ERROR(you should install Emacs first)
-    fi
-  fi
-  dnl # 
-  dnl # Check Emacs directories
-  dnl #
-  AC_MSG_CHECKING([where emacs files are in])
-  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
-  fi
-  AC_MSG_RESULT($emacsdir)
-  AC_SUBST(emacsdir)
-  dnl # 
-  dnl # Check Emacs site-lisp directories
-  dnl #
-  AC_ARG_WITH(lispdir,
-    [  --with-lispdir=DIR      emacs lisp files go to DIR [guessed]],
-    [case "${withval}" in
-       yes)	lispdir= ;;
-       no)	AC_MSG_ERROR(lispdir is not available) ;;
-       *)	lispdir=${withval} ;;
-     esac], lispdir=)
-  AC_MSG_CHECKING([where .elc files should go])
-  if test "x$lispdir" = x; then
-    lispdir="$emacsdir/site-lisp"
-    if test -d $emacsdir/lisp; then
-      lispdir="$emacsdir/lisp"
-    fi
-    case "$EMACS_BASENAME" in
-    xemacs|xemacs-*)
-      lispdir="$lispdir/lookup"
-      ;;
-    esac
-  fi
-  AC_MSG_RESULT($lispdir)
-  AC_SUBST(lispdir)])
diff --git a/aclocal.m4 b/aclocal.m4
index fa32a2a..4410f56 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,217 +1,89 @@
-dnl aclocal.m4 generated automatically by aclocal 1.3
+AC_DEFUN(AC_DEFINE_GNUS_PRODUCT_NAME,
+ [dnl Defining gnus product name.
+  GNUS_PRODUCT_NAME=$1])
 
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in 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.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl Copyright (C) 1999 NISHIDA Keisuke <knishida@ring.aist.go.jp>
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
-dnl any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-dnl 02111-1307, USA.
-
-AC_DEFUN(AM_PATH_LISPDIR,
- [dnl #
-  dnl # Check Emacs
-  dnl #
+AC_DEFUN(AC_CHECK_EMACS,
+ [dnl Check for Emacsen.
   AC_ARG_WITH(emacs,
-    [  --with-emacs=EMACS      compile with EMACS [EMACS=emacs, xemacs...]],
-    [case "${withval}" in
-       yes)	EMACS= ;;
-       no)	AC_MSG_ERROR([emacs is not available]) ;;
-       *)	EMACS=${withval} ;;
-     esac], EMACS=)
-  if test "x$EMACS" = "xt" -o "x$EMACS" = x; then
-    AC_PATH_PROGS(EMACS, emacs xemacs mule, no)
-    if test $EMACS = no; then
-      AC_MSG_ERROR(you should install Emacs first)
+   [  --with-emacs=EMACS      compile with EMACS [EMACS=emacs, mule...]],
+   [if test x$withval = xyes -o x$withval = xt -o x$withval = x; then
+      AC_CHECK_PROGS(EMACS, emacs xemacs mule, emacs)
+    else
+      AC_CHECK_PROG(EMACS, $withval, $withval, emacs)
+    fi])
+  AC_ARG_WITH(xemacs,
+   [  --with-xemacs=XEMACS    compile with XEMACS [XEMACS=xemacs]],
+   [if test x$withval = xyes -o x$withval = x; then
+      AC_CHECK_PROG(XEMACS, xemacs, xemacs, xemacs)
+    else
+      AC_CHECK_PROG(XEMACS, $withval, $withval, xemacs)
     fi
-  fi
-  dnl # 
-  dnl # Check Emacs directories
-  dnl #
-  AC_MSG_CHECKING([where emacs files are in])
-  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=$XEMACS],
+   [XEMACS=xemacs
+    test x$EMACS = xt -o x$EMACS = x &&\
+      AC_CHECK_PROGS(EMACS, emacs xemacs mule, emacs)])
+  AC_SUBST(EMACS)
+  AC_SUBST(XEMACS)])
+
+AC_DEFUN(AC_PATH_LISPDIR,
+ [dnl Check for LISPDIR.
+  AC_MSG_CHECKING([where lisp files should go])
+  AC_ARG_WITH(lispdir,
+   [  --with-lispdir=DIR      Where to install lisp files
+                          (for XEmacs package, use --with-packagedir instead)],
+   lispdir=$withval,
+   [emacsdir=$datadir/emacs
+    test x$prefix = xNONE && prefix=$ac_default_prefix
+    case `echo x$EMACS | sed -e 's/x//' -e 's/^.*\///'` 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
-      ;;
+        emacsdir=$prefix/share/emacs
+      elif test -d $prefix/lib/emacs; then
+        emacsdir=$prefix/lib/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
-      ;;
+        emacsdir=$prefix/lib/xemacs
+      elif 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
-      ;;
+        emacsdir=$prefix/share/mule
+      elif test -d $prefix/lib/mule; then
+        emacsdir=$prefix/lib/mule
+      elif test -d $prefix/share/emacs; then
+        emacsdir=$prefix/share/emacs
+      elif test -d $prefix/lib/emacs; then
+        emacsdir=$prefix/lib/emacs
+      fi;;
     esac
-  fi
-  AC_MSG_RESULT($emacsdir)
-  AC_SUBST(emacsdir)
-  dnl # 
-  dnl # Check Emacs site-lisp directories
-  dnl #
-  AC_ARG_WITH(lispdir,
-    [  --with-lispdir=DIR      emacs lisp files go to DIR [guessed]],
-    [case "${withval}" in
-       yes)	lispdir= ;;
-       no)	AC_MSG_ERROR(lispdir is not available) ;;
-       *)	lispdir=${withval} ;;
-     esac], lispdir=)
-  AC_MSG_CHECKING([where .elc files should go])
-  if test "x$lispdir" = x; then
-    lispdir="$emacsdir/site-lisp"
-    if test -d $emacsdir/lisp; then
-      lispdir="$emacsdir/lisp"
-    fi
-    case "$EMACS_BASENAME" in
-    xemacs|xemacs-*)
-      lispdir="$lispdir/tgnus"
-      ;;
-    esac
-  fi
-  AC_MSG_RESULT($lispdir)
+    lispdir=$emacsdir/site-lisp/$GNUS_PRODUCT_NAME])
+  AC_MSG_RESULT([$lispdir
+         (it will be ignored when \"make install-package[[-ja]]\" is done)])
   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])
-
-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])
-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(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
-
-      # 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
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-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)
-fi
-AC_SUBST($1)])
-
+AC_DEFUN(AC_PATH_PACKAGEDIR,
+ [dnl Check for PACKAGEDIR.
+  AC_ARG_WITH(packagedir,
+   [  --with-packagedir=DIR   package DIR for XEmacs],
+   [if test x$withval != xyes -a x$withval != x; then
+      AC_MSG_CHECKING([where the package should go])
+      PACKAGEDIR=$withval
+      AC_MSG_RESULT($PACKAGEDIR)
+    fi],
+    PACKAGEDIR=)
+  AC_SUBST(PACKAGEDIR)])
+
+AC_DEFUN(AC_ADD_LOAD_PATH,
+ [dnl Check for additional load path.
+  AC_ARG_WITH(addpath,
+   [  --with-addpath=PATH     search Emacs-Lisp libraries with PATH
+                          use colons to separate directory names],
+   [if test x$withval != xyes -a x$withval != x; then
+      AC_MSG_CHECKING([where to find the additional elisp libraries])
+      ADDITIONAL_LOAD_PATH=$withval
+      AC_MSG_RESULT($ADDITIONAL_LOAD_PATH)
+    fi],
+    ADDITIONAL_LOAD_PATH=)
+  AC_SUBST(ADDITIONAL_LOAD_PATH)])
diff --git a/configure b/configure
index f96ef07..0b4a08c 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,16 +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-emacs=EMACS      compile with EMACS [EMACS=emacs, mule...]"
 ac_help="$ac_help
-  --with-lispdir=DIR      emacs lisp files go to DIR [guessed]"
+  --with-xemacs=XEMACS    compile with XEMACS [XEMACS=xemacs]"
 ac_help="$ac_help
-  --with-addpath=PATH     search Emacs-Lisp libraries with PATH
-                          use colons to separate directory names"
+  --with-lispdir=DIR      Where to install lisp files
+                          (for XEmacs package, use --with-packagedir instead)"
 ac_help="$ac_help
-  --with-xemacs=XEMACS    compile with XEMACS [XEMACS=xemacs]"
+  --with-packagedir=DIR   package DIR for XEmacs"
 ac_help="$ac_help
-  --with-packagedir=DIR   package DIR for XEmacs [guessed]"
+  --with-addpath=PATH     search Emacs-Lisp libraries with PATH
+                          use colons to separate directory names"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -344,7 +345,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 +505,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
@@ -532,10 +533,11 @@ else
 fi
 
 
+  GNUS_PRODUCT_NAME=t-gnus
 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,54 +644,69 @@ 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.
-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
+# 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:655: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_MAKEINFO+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$MAKEINFO"; then
+  ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
 else
-  EMACS=
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_MAKEINFO="makeinfo"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_MAKEINFO" && ac_cv_prog_MAKEINFO="no"
+fi
+fi
+MAKEINFO="$ac_cv_prog_MAKEINFO"
+if test -n "$MAKEINFO"; then
+  echo "$ac_t""$MAKEINFO" 1>&6
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-  if test "x$EMACS" = "xt" -o "x$EMACS" = x; then
-    for ac_prog in emacs xemacs mule
+  # Check whether --with-emacs or --without-emacs was given.
+if test "${with_emacs+set}" = set; then
+  withval="$with_emacs"
+  if test x$withval = xyes -o x$withval = xt -o x$withval = 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
 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:691: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_EMACS+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 "$EMACS"; then
+  ac_cv_prog_EMACS="$EMACS" # 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_EMACS="$ac_prog"
       break
     fi
   done
   IFS="$ac_save_ifs"
-  ;;
-esac
 fi
-EMACS="$ac_cv_path_EMACS"
+fi
+EMACS="$ac_cv_prog_EMACS"
 if test -n "$EMACS"; then
   echo "$ac_t""$EMACS" 1>&6
 else
@@ -694,146 +715,218 @@ fi
 
 test -n "$EMACS" && break
 done
-test -n "$EMACS" || EMACS="no"
+test -n "$EMACS" || EMACS="emacs"
 
-    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
+    else
+      # Extract the first word of "$withval", so it can be a program name with args.
+set dummy $withval; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:725: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$EMACS"; then
+  ac_cv_prog_EMACS="$EMACS" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_EMACS="$withval"
+      break
     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
-  fi
-  echo "$ac_t""$emacsdir" 1>&6
-  
-        # 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
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_EMACS" && ac_cv_prog_EMACS="emacs"
+fi
+fi
+EMACS="$ac_cv_prog_EMACS"
+if test -n "$EMACS"; then
+  echo "$ac_t""$EMACS" 1>&6
 else
-  lispdir=
+  echo "$ac_t""no" 1>&6
 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"
     fi
-    case "$EMACS_BASENAME" in
-    xemacs|xemacs-*)
-      lispdir="$lispdir/tgnus"
-      ;;
-    esac
-  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
+fi
+
+  # Check whether --with-xemacs or --without-xemacs was given.
+if test "${with_xemacs+set}" = set; then
+  withval="$with_xemacs"
+  if test x$withval = xyes -o x$withval = x; then
+      # Extract the first word of "xemacs", so it can be a program name with args.
+set dummy xemacs; 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 "configure:762: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_XEMACS+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.
-  ;;
-  *)
+  if test -n "$XEMACS"; then
+  ac_cv_prog_XEMACS="$XEMACS" # 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_MAKEINFO="$ac_dir/$ac_word"
+      ac_cv_prog_XEMACS="xemacs"
       break
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MAKEINFO" && ac_cv_path_MAKEINFO="no"
-  ;;
-esac
+  test -z "$ac_cv_prog_XEMACS" && ac_cv_prog_XEMACS="xemacs"
 fi
-MAKEINFO="$ac_cv_path_MAKEINFO"
-if test -n "$MAKEINFO"; then
-  echo "$ac_t""$MAKEINFO" 1>&6
+fi
+XEMACS="$ac_cv_prog_XEMACS"
+if test -n "$XEMACS"; then
+  echo "$ac_t""$XEMACS" 1>&6
 else
   echo "$ac_t""no" 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
+    else
+      # Extract the first word of "$withval", so it can be a program name with args.
+set dummy $withval; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:793: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_XEMACS+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$XEMACS"; then
+  ac_cv_prog_XEMACS="$XEMACS" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_XEMACS="$withval"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_XEMACS" && ac_cv_prog_XEMACS="xemacs"
+fi
+fi
+XEMACS="$ac_cv_prog_XEMACS"
+if test -n "$XEMACS"; then
+  echo "$ac_t""$XEMACS" 1>&6
+else
+  echo "$ac_t""no" 1>&6
 fi
 
+    fi
+    EMACS=$XEMACS
+else
+  XEMACS=xemacs
+    test x$EMACS = xt -o x$EMACS = x &&\
+      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
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:830: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$EMACS"; then
+  ac_cv_prog_EMACS="$EMACS" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_EMACS="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+EMACS="$ac_cv_prog_EMACS"
+if test -n "$EMACS"; then
+  echo "$ac_t""$EMACS" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
 
+test -n "$EMACS" && break
+done
+test -n "$EMACS" || EMACS="emacs"
 
-XEMACS="xemacs"
-# Check whether --with-xemacs or --without-xemacs was given.
-if test "${with_xemacs+set}" = set; then
-  withval="$with_xemacs"
-  XEMACS=$with_xemacs
 fi
 
+  
+  
+  echo $ac_n "checking where lisp files should go""... $ac_c" 1>&6
+echo "configure:865: checking where lisp files should go" >&5
+  # Check whether --with-lispdir or --without-lispdir was given.
+if test "${with_lispdir+set}" = set; then
+  withval="$with_lispdir"
+  lispdir=$withval
+else
+  emacsdir=$datadir/emacs
+    test x$prefix = xNONE && prefix=$ac_default_prefix
+    case `echo x$EMACS | sed -e 's/x//' -e 's/^.*\///'` in
+    emacs|emacs-*)
+      if test -d $prefix/share/emacs; then
+        emacsdir=$prefix/share/emacs
+      elif test -d $prefix/lib/emacs; then
+        emacsdir=$prefix/lib/emacs
+      fi;;
+    xemacs|xemacs-*)
+      if test -d $prefix/lib/xemacs; then
+        emacsdir=$prefix/lib/xemacs
+      elif test -d $prefix/share/xemacs; then
+        emacsdir=$prefix/share/xemacs
+      fi;;
+    mule|mule-*)
+      if test -d $prefix/share/mule; then
+        emacsdir=$prefix/share/mule
+      elif test -d $prefix/lib/mule; then
+        emacsdir=$prefix/lib/mule
+      elif test -d $prefix/share/emacs; then
+        emacsdir=$prefix/share/emacs
+      elif test -d $prefix/lib/emacs; then
+        emacsdir=$prefix/lib/emacs
+      fi;;
+    esac
+    lispdir=$emacsdir/site-lisp/$GNUS_PRODUCT_NAME
+fi
 
-
-PACKAGEDIR=
-# Check whether --with-packagedir or --without-packagedir was given.
+  echo "$ac_t""$lispdir
+         (it will be ignored when \"make install-package[-ja]\" is done)" 1>&6
+  
+  # Check whether --with-packagedir or --without-packagedir was given.
 if test "${with_packagedir+set}" = set; then
   withval="$with_packagedir"
-  PACKAGEDIR=$with_packagedir
+  if test x$withval != xyes -a x$withval != x; then
+      echo $ac_n "checking where the package should go""... $ac_c" 1>&6
+echo "configure:908: checking where the package should go" >&5
+      PACKAGEDIR=$withval
+      echo "$ac_t""$PACKAGEDIR" 1>&6
+    fi
+else
+  PACKAGEDIR=
 fi
 
+  
+  # Check whether --with-addpath or --without-addpath was given.
+if test "${with_addpath+set}" = set; then
+  withval="$with_addpath"
+  if test x$withval != xyes -a x$withval != x; then
+      echo $ac_n "checking where to find the additional elisp libraries""... $ac_c" 1>&6
+echo "configure:922: checking where to find the additional elisp libraries" >&5
+      ADDITIONAL_LOAD_PATH=$withval
+      echo "$ac_t""$ADDITIONAL_LOAD_PATH" 1>&6
+    fi
+else
+  ADDITIONAL_LOAD_PATH=
+fi
 
-
+  
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -901,7 +994,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 +1029,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,13 +1076,12 @@ 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%@EMACS@%$EMACS%g
-s%@emacsdir@%$emacsdir%g
-s%@lispdir@%$lispdir%g
 s%@MAKEINFO@%$MAKEINFO%g
-s%@ADDITIONAL_LOAD_PATH@%$ADDITIONAL_LOAD_PATH%g
+s%@EMACS@%$EMACS%g
 s%@XEMACS@%$XEMACS%g
+s%@lispdir@%$lispdir%g
 s%@PACKAGEDIR@%$PACKAGEDIR%g
+s%@ADDITIONAL_LOAD_PATH@%$ADDITIONAL_LOAD_PATH%g
 
 CEOF
 EOF
diff --git a/configure.in b/configure.in
index dc7bafa..80829f0 100644
--- a/configure.in
+++ b/configure.in
@@ -1,32 +1,10 @@
 AC_INIT(lisp/gnus.el)
+AC_DEFINE_GNUS_PRODUCT_NAME(t-gnus)
 AC_SET_MAKE
 AC_PROG_INSTALL
-AM_PATH_LISPDIR
-AC_PATH_PROG(MAKEINFO, makeinfo, no)
-
-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,
-)
-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,
-)
-AC_SUBST(PACKAGEDIR)
-
+AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, no)
+AC_CHECK_EMACS
+AC_PATH_LISPDIR
+AC_PATH_PACKAGEDIR
+AC_ADD_LOAD_PATH
 AC_OUTPUT(Makefile lisp/Makefile lisp/dgnuspath.el texi/Makefile)
diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index c1c933e..cac6741 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -51,8 +51,6 @@
 
 (require 'cl)
 
-(push "/usr/share/emacs/site-lisp" 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
 ;; into the building directory.  For that, we define this function
diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el
index afaa853..cfaabbb 100644
--- a/lisp/gnus-vers.el
+++ b/lisp/gnus-vers.el
@@ -31,7 +31,7 @@
 (require 'product)
 (provide 'gnus-vers)
 
-(defconst gnus-revision-number "02"
+(defconst gnus-revision-number "03"
   "Revision number for this version of gnus.")
 
 ;; Product information of this gnus.
-- 
1.7.10.4