Regenerate.

diff --git a/configure b/configure
index dd774d0..7006968 100755 (executable)
--- a/configure
+++ b/configure
@@ -18,6 +18,10 @@ ac_help="$ac_help
 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.
 # The variables have the same names as the options, with
@@ -529,7 +533,7 @@ fi
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:533: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:537: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -586,7 +590,7 @@ ac_configure="$SHELL $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:590: checking for a BSD compatible install" >&5
+echo "configure:594: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"\${ac_cv_path_install+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -660,7 +664,7 @@ 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
+echo "configure:668: checking for $ac_word" >&5
 if eval "test \"\${ac_cv_path_EMACS+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -701,7 +705,7 @@ test -n "$EMACS" || EMACS="no"
     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
+echo "configure:709: 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
@@ -756,7 +760,7 @@ else
 fi
 
   echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
-echo "configure:760: checking where .elc files should go" >&5
+echo "configure:764: checking where .elc files should go" >&5
   if test "x$lispdir" = x; then
     lispdir="$emacsdir/site-lisp"
     if test -d $emacsdir/lisp; then
@@ -773,7 +777,7 @@ echo "configure:760: checking where .elc files should go" >&5
 # 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
+echo "configure:781: checking for $ac_word" >&5
 if eval "test \"\${ac_cv_path_MAKEINFO+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -807,7 +811,7 @@ else
 fi
 
 
-ADDITIONAL_LOAD_PATH="NONE"
+ADDITIONAL_LOAD_PATH=
 # Check whether --with-addpath or --without-addpath was given.
 if test "${with_addpath+set}" = set; then
   withval="$with_addpath"
@@ -816,6 +820,24 @@ 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
+fi
+
+
+
+PACKAGEDIR=
+# Check whether --with-packagedir or --without-packagedir was given.
+if test "${with_packagedir+set}" = set; then
+  withval="$with_packagedir"
+  PACKAGEDIR=$with_packagedir
+fi
+
+
+
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -929,7 +951,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile lisp/Makefile lisp/paths.el texi/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile lisp/Makefile lisp/dgnuspath.el texi/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -970,6 +992,8 @@ s%@emacsdir@%$emacsdir%g
 s%@lispdir@%$lispdir%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@ADDITIONAL_LOAD_PATH@%$ADDITIONAL_LOAD_PATH%g
+s%@XEMACS@%$XEMACS%g
+s%@PACKAGEDIR@%$PACKAGEDIR%g
 
 CEOF
 EOF
@@ -1011,7 +1035,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile lisp/Makefile lisp/paths.el texi/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile lisp/Makefile lisp/dgnuspath.el texi/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then