X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=configure;h=92de619104538a08014f7bded46b1ef7c305b477;hb=d8f7efd1ce52b6a692873cc41a208d32aca02a59;hp=66b39e61d2756883e7cd02130da27339092a2b72;hpb=a707b63af25b91cb730c12e65156ca364bf49a44;p=elisp%2Fgnus.git-

diff --git a/configure b/configure
index 66b39e6..92de619 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.12 
+# 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,13 +12,25 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
-  --with-xemacs           Use XEmacs to build"
+  --with-emacs=EMACS      compile with EMACS [EMACS=emacs, mule...]"
 ac_help="$ac_help
-  --with-emacs            Use Emacs to build"
+  --with-xemacs=XEMACS    compile with XEMACS [XEMACS=xemacs]"
 ac_help="$ac_help
-  --with-lispdir=DIR      Where to install lisp files"
+  --with-lispdir=DIR      Where to install lisp files
+                          (for XEmacs package, use --with-packagedir instead)"
+ac_help="$ac_help
+  --with-etcdir=DIR       Where to install etc files"
+ac_help="$ac_help
+  --with-url=DIR          Specify where to find the url package"
 ac_help="$ac_help
   --with-w3=DIR           Specify where to find the w3 package"
+ac_help="$ac_help
+  --with-fonts            Assume all fonts required are available"
+ac_help="$ac_help
+  --with-packagedir=DIR   package DIR for XEmacs"
+ac_help="$ac_help
+  --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
@@ -57,6 +69,7 @@ mandir='${prefix}/man'
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 # Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
 
@@ -340,7 +353,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
+    echo "configure generated by autoconf version 2.14.1"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -500,7 +513,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
@@ -510,9 +523,11 @@ ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+ac_exeext=
+ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -526,10 +541,20 @@ else
 fi
 
 
+echo $ac_n "defining gnus product name... $ac_c"
+  if eval "test \"\${EMACS_cv_GNUS_PRODUCT_NAME+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  EMACS_cv_GNUS_PRODUCT_NAME=t-gnus
+fi
+
+  GNUS_PRODUCT_NAME=${EMACS_cv_GNUS_PRODUCT_NAME}
+  echo "$ac_t""${GNUS_PRODUCT_NAME}" 1>&6
+  
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:531: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:556: 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
@@ -568,9 +593,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
@@ -579,28 +604,34 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:587: checking for a BSD compatible install" >&5
+echo "configure:613: 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="${IFS}:"
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
   for ac_dir in $PATH; do
     # Account for people who put trailing slashes in PATH elements.
     case "$ac_dir/" in
     /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
-      for ac_prog in ginstall installbsd scoinst install; do
+      # Don't use installbsd from OSF since it installs stuff as root
+      # by default.
+      for ac_prog in ginstall scoinst install; do
         if test -f $ac_dir/$ac_prog; then
 	  if test $ac_prog = install &&
             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
-	    # OSF/1 installbsd also uses dspmsg, but is usable.
+	    :
+	  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"
@@ -630,37 +661,23 @@ 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_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-if test "${EMACS}" = "t"; then
-   EMACS=""
-fi
-
-# 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; else EMACS=${withval}; fi 
-fi
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
-# Check whether --with-emacs or --without-emacs was given.
-if test "${with_emacs+set}" = set; then
-  withval="$with_emacs"
-   if test "${withval}" = "yes"; then EMACS=emacs; else EMACS=${withval}; fi 
-fi
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 # 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:656: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
+echo "configure:672: 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
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_MAKEINFO="makeinfo"
@@ -679,26 +696,36 @@ else
 fi
 
 
-# Extract the first word of "emacs", so it can be a program name with args.
-set dummy emacs; ac_word=$2
+      test "$EMACS" = t && EMACS=
+
+    unset ac_cv_prog_EMACS; unset ac_cv_prog_XEMACS;
+
+  # Check whether --with-emacs or --without-emacs was given.
+if test "${with_emacs+set}" = set; then
+  withval="$with_emacs"
+  if test "$withval" = yes -o -z "$withval"; 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:686: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_EMACS'+set}'`\" = set"; then
+echo "configure:713: 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="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_EMACS="emacs"
+      ac_cv_prog_EMACS="$ac_prog"
       break
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_EMACS" && ac_cv_prog_EMACS="xemacs"
 fi
 fi
 EMACS="$ac_cv_prog_EMACS"
@@ -708,61 +735,210 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+test -n "$EMACS" && break
+done
+test -n "$EMACS" || EMACS="emacs"
 
+    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:747: 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
+  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
+  echo "$ac_t""no" 1>&6
+fi
+
+    fi
+fi
+
+  # Check whether --with-xemacs or --without-xemacs was given.
+if test "${with_xemacs+set}" = set; then
+  withval="$with_xemacs"
+  if test "$withval" = yes -o -z "$withval"; 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:784: 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="xemacs"
+      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
+
+    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:815: 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 -z "$EMACS" && 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:851: 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"
+
+fi
 
   
-  echo $ac_n "checking if $EMACS is really XEmacs""... $ac_c" 1>&6
-echo "configure:716: checking if $EMACS is really XEmacs" >&5
   
-elisp="(if (string-match \"XEmacs\" emacs-version) \"yes\" \"no\") "
+
+  echo $ac_n "checking what a flavor does $EMACS have""... $ac_c" 1>&6
+echo "configure:887: checking what a flavor does $EMACS have" >&5
+
+    unset EMACS_cv_SYS_flavor;
+
+  
+elisp="(cond ((featurep (quote xemacs)) \"XEmacs\")\
+          ((boundp (quote MULE)) \"MULE\")\
+          (t \"FSF Emacs\"))"
 if test -z ""noecho""; then
-	echo $ac_n "checking for xemacsp""... $ac_c" 1>&6
-echo "configure:721: checking for xemacsp" >&5
+	echo $ac_n "checking for flavor""... $ac_c" 1>&6
+echo "configure:897: checking for flavor" >&5
 fi
-if eval "test \"`echo '$''{'EMACS_cv_SYS_xemacsp'+set}'`\" = set"; then
+if eval "test \"\${EMACS_cv_SYS_flavor+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}\"))" >& 5 2>&1  
-	${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x 'ignore) (prin1-to-string x)) nil \"${OUTPUT}\"nil 5))" >& 5 2>&1
+	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
+	EMACS_cv_SYS_flavor=$retval
 
 fi
 
-xemacsp=${EMACS_cv_SYS_xemacsp}
+flavor=${EMACS_cv_SYS_flavor}
 if test -z ""noecho""; then
-	echo "$ac_t""$xemacsp" 1>&6
+	echo "$ac_t""$flavor" 1>&6
 fi
 
-  XEMACS=${EMACS_cv_SYS_xemacsp}
-  EMACS_FLAVOR=emacs
-  if test "$XEMACS" = "yes"; then
-     EMACS_FLAVOR=xemacs
-  fi
-  echo "$ac_t""$XEMACS" 1>&6
-  
-  
-
-  if test "$prefix" = "NONE"; then
+  case $EMACS_cv_SYS_flavor in
+  XEmacs)
+    EMACS_FLAVOR=xemacs;;
+  MULE)
+    EMACS_FLAVOR=mule;;
+  *)
+    EMACS_FLAVOR=emacs;;
+  esac
+  echo "$ac_t""$EMACS_cv_SYS_flavor" 1>&6
+  if test "$prefix" = NONE; then
 	echo $ac_n "checking prefix for your Emacs""... $ac_c" 1>&6
-echo "configure:753: checking prefix for your Emacs" >&5
+echo "configure:929: 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:758: checking for prefix" >&5
+echo "configure:934: checking for prefix" >&5
 fi
-if eval "test \"`echo '$''{'EMACS_cv_SYS_prefix'+set}'`\" = set"; then
+if eval "test \"\${EMACS_cv_SYS_prefix+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}\"))" >& 5 2>&1  
-	${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x 'ignore) (prin1-to-string x)) nil \"${OUTPUT}\"nil 5))" >& 5 2>&1
+	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}
@@ -784,51 +960,209 @@ if test "${with_lispdir+set}" = set; then
   lispdir=${withval}
 fi
 
-  echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
-echo "configure:789: checking where .elc files should go" >&5
+  echo $ac_n "checking where lisp files should go""... $ac_c" 1>&6
+echo "configure:965: checking where lisp files should go" >&5
   if test -z "$lispdir"; then
         theprefix=$prefix
-    if test "x$theprefix" = "xNONE"; then
+    if test "$theprefix" = NONE; then
 	theprefix=$ac_default_prefix
     fi
-    lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp"
+    if test "$EMACS_FLAVOR" = "xemacs"; then
+	lispdir="\$(datadir)/${EMACS_FLAVOR}/site-packages/lisp/${GNUS_PRODUCT_NAME}"
+    else
+	lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp/${GNUS_PRODUCT_NAME}"
+    fi
     for thedir in share lib; do
 	potential=
 	if test -d ${theprefix}/${thedir}/${EMACS_FLAVOR}/site-lisp; then
-	   lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-lisp"
+	   if test "$EMACS_FLAVOR" = "xemacs"; then
+	       lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-packages/lisp/${GNUS_PRODUCT_NAME}"
+	   else
+	       lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-lisp/${GNUS_PRODUCT_NAME}"
+	   fi
 	   break
 	fi
     done
   fi
-  echo "$ac_t""$lispdir" 1>&6
+  if test ${EMACS_FLAVOR} = xemacs; then
+    echo "$ac_t""$lispdir
+         (it will be ignored when \"make install-package[-ja]\" is done)" 1>&6
+  else
+    echo "$ac_t""$lispdir" 1>&6
+  fi
+  
+
+
+  # Check whether --with-etcdir or --without-etcdir was given.
+if test "${with_etcdir+set}" = set; then
+  withval="$with_etcdir"
+  etcdir=${withval}
+fi
+
+  echo $ac_n "checking where etc files should go""... $ac_c" 1>&6
+echo "configure:1004: checking where etc files should go" >&5
+  if test -z "$etcdir"; then
+        if test "$EMACS_FLAVOR" = "xemacs"; then
+      etcdir="\$(lispdir)/../../etc"
+    else
+    etcdir="\$(lispdir)/../etc"
+    fi
+  fi
+  echo "$ac_t""$etcdir" 1>&6
   
 
 
+  echo $ac_n "checking where the TeXinfo docs should go""... $ac_c" 1>&6
+echo "configure:1017: checking where the TeXinfo docs should go" >&5
+    if test "$infodir" = "\${prefix}/info"; then
+    if test "$EMACS_FLAVOR" = "xemacs"; then
+      info_dir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-packages/info"
+    else
+      info_dir="\$(prefix)/info"
+    fi
+  else
+    info_dir=$infodir
+  fi
+  echo "$ac_t""$info_dir" 1>&6
+  
+
+
+echo $ac_n "checking for acceptable URL version""... $ac_c" 1>&6
+echo "configure:1032: checking for acceptable URL version" >&5
+
+unset EMACS_cv_ACCEPTABLE_URL;
+unset EMACS_cv_SYS_url_dir;
+unset EMACS_cv_SYS_url;
+
+if eval "test \"\${EMACS_cv_ACCEPTABLE_URL+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+
+if test -z ""noecho""; then
+	echo $ac_n "checking for url-retrieve in url""... $ac_c" 1>&6
+echo "configure:1045: checking for url-retrieve in url" >&5
+fi
+library=`echo url | tr _ -`
+
+elisp="(progn (fmakunbound (quote url-retrieve)) (condition-case nil (progn (require (quote $library)) (fboundp (quote url-retrieve))) (error (prog1 nil (message \"$library not found\")))))"
+if test -z ""noecho""; then
+	echo $ac_n "checking for url""... $ac_c" 1>&6
+echo "configure:1052: checking for url" >&5
+fi
+if eval "test \"\${EMACS_cv_SYS_url+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_url=$retval
+
+fi
+
+url=${EMACS_cv_SYS_url}
+if test -z ""noecho""; then
+	echo "$ac_t""$url" 1>&6
+fi
+
+if test "${EMACS_cv_SYS_url}" = nil; then
+	EMACS_cv_SYS_url=no
+fi
+if test "${EMACS_cv_SYS_url}" = t; then
+	EMACS_cv_SYS_url=yes
+fi
+HAVE_url=${EMACS_cv_SYS_url}
+
+if test -z ""noecho""; then
+	echo "$ac_t""$HAVE_url" 1>&6
+fi
+
+if test "${HAVE_url}" = yes; then
+	EMACS_cv_ACCEPTABLE_URL=yes
+else
+	EMACS_cv_ACCEPTABLE_URL=
+fi
+
+if test "${EMACS_cv_ACCEPTABLE_URL}" = yes; then
+	
+elisp="(file-name-directory (locate-library \"url\"))"
+if test -z ""noecho""; then
+	echo $ac_n "checking for url_dir""... $ac_c" 1>&6
+echo "configure:1096: checking for url_dir" >&5
+fi
+if eval "test \"\${EMACS_cv_SYS_url_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_url_dir=$retval
+
+fi
+
+url_dir=${EMACS_cv_SYS_url_dir}
+if test -z ""noecho""; then
+	echo "$ac_t""$url_dir" 1>&6
+fi
+
+	EMACS_cv_ACCEPTABLE_URL=$EMACS_cv_SYS_url_dir
+fi
+
+fi
+
+   # Check whether --with-url or --without-url was given.
+if test "${with_url+set}" = set; then
+  withval="$with_url"
+   EMACS_cv_ACCEPTABLE_URL=`( cd $withval && pwd || echo "$withval" ) 2> /dev/null` 
+fi
+
+   URL=${EMACS_cv_ACCEPTABLE_URL}
+   
+   if test -z "${EMACS_cv_ACCEPTABLE_URL}"; then
+	echo "$ac_t""not found" 1>&6
+   else
+	echo "$ac_t"""${URL}"" 1>&6
+   fi
+
+
 echo $ac_n "checking for acceptable W3 version""... $ac_c" 1>&6
-echo "configure:809: checking for acceptable W3 version" >&5
-if eval "test \"`echo '$''{'EMACS_cv_ACCEPTABLE_W3'+set}'`\" = set"; then
+echo "configure:1138: checking for acceptable W3 version" >&5
+
+unset EMACS_cv_ACCEPTABLE_W3;
+unset EMACS_cv_SYS_w3_dir;
+unset EMACS_cv_SYS_w3_forms;
+
+if eval "test \"\${EMACS_cv_ACCEPTABLE_W3+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
 
 if test -z ""noecho""; then
 	echo $ac_n "checking for w3-form-encode-xwfu in w3_forms""... $ac_c" 1>&6
-echo "configure:817: checking for w3-form-encode-xwfu in w3_forms" >&5
+echo "configure:1151: checking for w3-form-encode-xwfu in w3_forms" >&5
 fi
 library=`echo w3_forms | tr _ -`
 
-elisp="(progn (fmakunbound 'w3-form-encode-xwfu) (condition-case nil (progn (require '$library) (fboundp 'w3-form-encode-xwfu)) (error (prog1 nil (message \"$library not found\")))))"
+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:824: checking for w3_forms" >&5
+echo "configure:1158: checking for w3_forms" >&5
 fi
-if eval "test \"`echo '$''{'EMACS_cv_SYS_w3_forms'+set}'`\" = set"; then
+if eval "test \"\${EMACS_cv_SYS_w3_forms+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}\"))" >& 5 2>&1  
-	${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x 'ignore) (prin1-to-string x)) nil \"${OUTPUT}\"nil 5))" >& 5 2>&1
+	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}
@@ -841,10 +1175,10 @@ if test -z ""noecho""; then
 	echo "$ac_t""$w3_forms" 1>&6
 fi
 
-if test "${EMACS_cv_SYS_w3_forms}" = "nil"; then
+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
+if test "${EMACS_cv_SYS_w3_forms}" = t; then
 	EMACS_cv_SYS_w3_forms=yes
 fi
 HAVE_w3_forms=${EMACS_cv_SYS_w3_forms}
@@ -853,26 +1187,26 @@ if test -z ""noecho""; then
 	echo "$ac_t""$HAVE_w3_forms" 1>&6
 fi
 
-if test "${HAVE_w3_forms}" = "yes"; then
+if test "${HAVE_w3_forms}" = yes; then
 	EMACS_cv_ACCEPTABLE_W3=yes
 else
-	EMACS_cv_ACCEPTABLE_W3=no
+	EMACS_cv_ACCEPTABLE_W3=
 fi
 
-if test "${EMACS_cv_ACCEPTABLE_W3}" = "yes"; then
+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:868: checking for w3_dir" >&5
+echo "configure:1202: checking for w3_dir" >&5
 fi
-if eval "test \"`echo '$''{'EMACS_cv_SYS_w3_dir'+set}'`\" = set"; then
+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}\"))" >& 5 2>&1  
-	${EMACS} -batch -eval "(let ((x ${elisp})) (write-region (if (stringp x) (princ x 'ignore) (prin1-to-string x)) nil \"${OUTPUT}\"nil 5))" >& 5 2>&1
+	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}
@@ -898,9 +1232,252 @@ fi
 
    W3=${EMACS_cv_ACCEPTABLE_W3}
    
-   echo "$ac_t"""${W3}"" 1>&6
+   if test -z "${EMACS_cv_ACCEPTABLE_W3}"; then
+	echo "$ac_t""not found" 1>&6
+   else
+	echo "$ac_t""${W3}" 1>&6
+   fi
+
+
+test "$LATEX" = t && LATEX=
+test "$LATEX" || for ac_prog in latex
+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:1249: checking for $ac_word" >&5
+if eval "test \"\${ac_cv_path_LATEX+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$LATEX" in
+  /*)
+  ac_cv_path_LATEX="$LATEX" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_LATEX="$LATEX" # 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_LATEX="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+LATEX="$ac_cv_path_LATEX"
+if test -n "$LATEX"; then
+  echo "$ac_t""$LATEX" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$LATEX" && break
+done
+test -n "$LATEX" || LATEX="no"
+
+echo $ac_n "checking for available fonts""... $ac_c" 1>&6
+echo "configure:1286: checking for available fonts" >&5
+# Check whether --with-fonts or --without-fonts was given.
+if test "${with_fonts+set}" = set; then
+  withval="$with_fonts"
+  USE_FONTS="$withval"
+fi
+
+WITH_FONTS_bembo='%'
+WITHOUT_FONTS_bembo=
+WITH_FONTS_pfu='%'
+WITHOUT_FONTS_pfu=
+WITH_FONTS_bcr='%'
+WITHOUT_FONTS_bcr=
+if test -z "${USE_FONTS}"; then
+  if test "${LATEX}" = no; then
+	:
+  else
+    OUTPUT=./conftest-$$
+    echo '\nonstopmode\documentclass{article}\usepackage{bembo}\begin{document}\end{document}' > ${OUTPUT}
+    if ${LATEX} ${OUTPUT} </dev/null >& 5 2>&1  ; then  
+      if test -z "${USE_FONTS}"; then
+	USE_FONTS="Adobe Bembo"
+      else
+	USE_FONTS="${USE_FONTS}, Adobe Bembo"
+      fi
+      WITH_FONTS_bembo=
+      WITHOUT_FONTS_bembo='%'
+    fi
+    echo '\nonstopmode\documentclass{article}\begin{document}{\fontfamily{pfu}\fontsize{10pt}{10}\selectfont test}\end{document}' > ${OUTPUT}
+    if retval=`${LATEX} ${OUTPUT} </dev/null 2>& 5`; then
+      if echo "$retval" | grep 'Some font shapes were not available' >& 5 2>&1  ; then  
+	:
+      else
+	 if test -z "${USE_FONTS}"; then
+	  USE_FONTS="Adobe Futura"
+	 else
+	  USE_FONTS="${USE_FONTS}, Adobe Futura"
+	 fi
+	 WITH_FONTS_pfu=
+	 WITHOUT_FONTS_pfu='%'
+      fi
+    fi
+    echo '\nonstopmode\documentclass{article}\begin{document}{\fontfamily{bcr}\fontsize{10pt}{10}\selectfont test}\end{document}' > ${OUTPUT}
+    if retval=`${LATEX} ${OUTPUT} </dev/null 2>& 5`; then
+      if echo "$retval" | grep 'Some font shapes were not available' >& 5 2>&1  ; then  
+	:
+      else
+	 if test -z "${USE_FONTS}"; then
+	  USE_FONTS="Bitstream Courier"
+	 else
+	  USE_FONTS="${USE_FONTS}, Bitstream Courier"
+	 fi
+	 WITH_FONTS_bcr=
+	 WITHOUT_FONTS_bcr='%'
+      fi
+    fi
+    rm -f ${OUTPUT} ${OUTPUT}.aux ${OUTPUT}.log ${OUTPUT}.dvi
+  fi
+elif test "${USE_FONTS}" = yes ; then
+  WITH_FONTS_bembo=
+  WITHOUT_FONTS_bembo='%'
+  WITH_FONTS_pfu=
+  WITHOUT_FONTS_pfu='%'
+  WITH_FONTS_bcr=
+  WITHOUT_FONTS_bcr='%'
+fi
+
+
+
+
+
+
+if test -z "${USE_FONTS}" ; then
+  USE_FONTS=no
+fi
+USE_FONTS=`echo "${USE_FONTS}" | sed 's/,\([^,]*\)$/ and\1/'`
+echo "$ac_t"""${USE_FONTS}"" 1>&6
+if test "${USE_FONTS}" = yes ; then
+  USE_FONTS='Set in Adobe Bembo, Adobe Futura and Bitstream Courier.'
+elif test "${USE_FONTS}" = no ; then
+  USE_FONTS=''
+else
+  USE_FONTS="Set in ${USE_FONTS}."
+fi
+
+
+  if test ${EMACS_FLAVOR} = xemacs; then
+    echo $ac_n "checking where the XEmacs package is""... $ac_c" 1>&6
+echo "configure:1374: checking where the XEmacs package is" >&5
+    # Check whether --with-packagedir or --without-packagedir was given.
+if test "${with_packagedir+set}" = set; then
+  withval="$with_packagedir"
+  if test "$withval" != yes -a -n "$withval"; then
+	PACKAGEDIR=$withval
+      else
+	  
+elisp="(let (package-dir)\
+      (if (boundp (quote early-packages))\
+	  (let ((dirs (delq nil (append (if early-package-load-path\
+					    early-packages)\
+					(if late-package-load-path\
+					    late-packages)\
+					(if last-package-load-path\
+					    last-packages)))))\
+	    (while (and dirs (not package-dir))\
+	      (if (file-directory-p (car dirs))\
+		  (setq package-dir (car dirs)\
+			dirs (cdr dirs))))))\
+      (or package-dir \"\"))"
+if test -z ""noecho""; then
+	echo $ac_n "checking for PACKAGEDIR""... $ac_c" 1>&6
+echo "configure:1397: checking for PACKAGEDIR" >&5
+fi
+if eval "test \"\${EMACS_cv_SYS_PACKAGEDIR+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_PACKAGEDIR=$retval
+
+fi
+
+PACKAGEDIR=${EMACS_cv_SYS_PACKAGEDIR}
+if test -z ""noecho""; then
+	echo "$ac_t""$PACKAGEDIR" 1>&6
+fi
+
+      fi
+else
+    
+elisp="(let (package-dir)\
+      (if (boundp (quote early-packages))\
+	  (let ((dirs (delq nil (append (if early-package-load-path\
+					    early-packages)\
+					(if late-package-load-path\
+					    late-packages)\
+					(if last-package-load-path\
+					    last-packages)))))\
+	    (while (and dirs (not package-dir))\
+	      (if (file-directory-p (car dirs))\
+		  (setq package-dir (car dirs)\
+			dirs (cdr dirs))))))\
+      (or package-dir \"\"))"
+if test -z ""noecho""; then
+	echo $ac_n "checking for PACKAGEDIR""... $ac_c" 1>&6
+echo "configure:1436: checking for PACKAGEDIR" >&5
+fi
+if eval "test \"\${EMACS_cv_SYS_PACKAGEDIR+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_PACKAGEDIR=$retval
+
+fi
+
+PACKAGEDIR=${EMACS_cv_SYS_PACKAGEDIR}
+if test -z ""noecho""; then
+	echo "$ac_t""$PACKAGEDIR" 1>&6
+fi
+
+fi
 
+    if test -z "$PACKAGEDIR"; then
+      echo "$ac_t""not found" 1>&6
+    else
+      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 "$withval" != yes -a -n "$withval"; then
+      echo $ac_n "checking where to find the additional elisp libraries""... $ac_c" 1>&6
+echo "configure:1473: 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
@@ -924,7 +1501,7 @@ EOF
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  case `(ac_space=' '; set) 2>&1` in
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
     # turns \\\\ into \\, and sed turns \\ into \).
@@ -968,7 +1545,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
@@ -1003,7 +1580,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.12"
+    echo "$CONFIG_STATUS generated by autoconf version 2.14.1"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -1014,7 +1591,8 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile lisp/Makefile texi/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile etc/Makefile lisp/Makefile texi/Makefile \
+ texi/gnusconfig.tex texi/ps/Makefile lisp/dgnuspath.el" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -1023,9 +1601,11 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
+s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
 s%@DEFS@%$DEFS%g
 s%@LDFLAGS@%$LDFLAGS%g
 s%@LIBS@%$LIBS%g
@@ -1044,16 +1624,31 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
+s%@GNUS_PRODUCT_NAME@%$GNUS_PRODUCT_NAME%g
 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%@MAKEINFO@%$MAKEINFO%g
 s%@EMACS@%$EMACS%g
 s%@XEMACS@%$XEMACS%g
-s%@EMACS_FLAVOR@%$EMACS_FLAVOR%g
 s%@lispdir@%$lispdir%g
+s%@etcdir@%$etcdir%g
+s%@info_dir@%$info_dir%g
+s%@HAVE_url@%$HAVE_url%g
+s%@URL@%$URL%g
 s%@HAVE_w3_forms@%$HAVE_w3_forms%g
 s%@W3@%$W3%g
+s%@LATEX@%$LATEX%g
+s%@WITH_FONTS_bembo@%$WITH_FONTS_bembo%g
+s%@WITHOUT_FONTS_bembo@%$WITHOUT_FONTS_bembo%g
+s%@WITH_FONTS_pfu@%$WITH_FONTS_pfu%g
+s%@WITHOUT_FONTS_pfu@%$WITHOUT_FONTS_pfu%g
+s%@WITH_FONTS_bcr@%$WITH_FONTS_bcr%g
+s%@WITHOUT_FONTS_bcr@%$WITHOUT_FONTS_bcr%g
+s%@USE_FONTS@%$USE_FONTS%g
+s%@PACKAGEDIR@%$PACKAGEDIR%g
+s%@ADDITIONAL_LOAD_PATH@%$ADDITIONAL_LOAD_PATH%g
 
 CEOF
 EOF
@@ -1095,7 +1690,8 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile lisp/Makefile texi/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile etc/Makefile lisp/Makefile texi/Makefile \
+ texi/gnusconfig.tex texi/ps/Makefile lisp/dgnuspath.el"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then