* 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.
(AC_CHECK_EMACS_FLAVOR): Rename from `AC_XEMACS_P'; check for MULE' as well.
(AM_PATH_LISPDIR): Remove.
* acinclude.m4: Remove.
* lisp/dgnushack.el: Don't add "/usr/share/emacs/site-lisp" to `load-path'.
* lisp/gnus-ems.el (gnus-ems-redefine): Defalias
`gnus-summary-set-display-table' to `(lambda ())' instead of `ignore'.
+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.
+ (AC_CHECK_EMACS_FLAVOR): Rename from `AC_XEMACS_P'; check for
+ `MULE' as well.
+ (AM_PATH_LISPDIR): Remove.
+
+ * acinclude.m4: Remove.
+
+ * lisp/dgnushack.el: Don't add "/usr/share/emacs/site-lisp" to
+ `load-path'.
+
+ * lisp/gnus-ems.el (gnus-ems-redefine): Defalias
+ `gnus-summary-set-display-table' to `(lambda ())' instead of
+ `ignore' (don't synch. with Gnus).
+
2000-07-21 Daiki Ueno <ueno@unixuser.org>
* lisp/gnus-bbdb.el (gnus-bbdb/update-record): Use
+++ /dev/null
-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)])
-
-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)
-])
-ye
-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_dir
-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}")
-])
-dnl aclocal.m4 generated automatically by aclocal 1.4
+AC_DEFUN(AC_DEFINE_GNUS_PRODUCT_NAME,
+ [dnl Defining gnus product name.
+ GNUS_PRODUCT_NAME=$1])
-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.
-
-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)
- 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"
+ [ --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
- case "$EMACS_BASENAME" in
- xemacs|xemacs-*)
- lispdir="$lispdir/lookup"
- ;;
- esac
- 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.
+ 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_EMACS_LISP, [
elisp="$2"
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)
-])
-ye
+AC_DEFUN(AC_CHECK_EMACS_FLAVOR,
+ [AC_MSG_CHECKING([what a flavor does $EMACS have])
+ AC_EMACS_LISP(flavor,
+ (cond ((featurep (quote xemacs)) \"XEmacs\")\
+ ((boundp (quote MULE)) \"MULE\")\
+ (t \"FSF Emacs\")),
+ "noecho")
+ case $EMACS_cv_SYS_flavor in
+ XEmacs)
+ EMACS_FLAVOR=xemacs;;
+ MULE)
+ EMACS_FLAVOR=mule;;
+ *)
+ EMACS_FLAVOR=emacs;;
+ esac
+ AC_MSG_RESULT($EMACS_cv_SYS_flavor)])
+
AC_DEFUN(AC_PATH_LISPDIR, [
- AC_XEMACS_P
+ AC_CHECK_EMACS_FLAVOR
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])
+ AC_ARG_WITH(lispdir,
+ [ --with-lispdir=DIR Where to install lisp files
+ (for XEmacs package, use --with-packagedir instead)],
+ lispdir=${withval})
+ AC_MSG_CHECKING([where lisp 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"
+ lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp/${GNUS_PRODUCT_NAME}"
for thedir in share lib; do
potential=
if test -d ${theprefix}/${thedir}/${EMACS_FLAVOR}/site-lisp; then
- lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-lisp"
+ lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-lisp/${GNUS_PRODUCT_NAME}"
break
fi
done
fi
- AC_MSG_RESULT($lispdir)
+ AC_MSG_RESULT([$lispdir
+ (it will be ignored when \"make install-package[[-ja]]\" is done)])
AC_SUBST(lispdir)
])
AC_MSG_RESULT("${W3}")
])
+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)])
ac_default_prefix=/usr/local
# Any additions from configure.in:
ac_help="$ac_help
- --with-xemacs Use XEmacs to build [XEMACS=xemacs]"
+ --with-emacs=EMACS compile with EMACS [EMACS=emacs, mule...]"
ac_help="$ac_help
- --with-emacs Use Emacs to build [EMACS=emacs]"
+ --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-w3=DIR Specify where to find the w3 package"
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"
-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
fi
+ GNUS_PRODUCT_NAME=t-gnus
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:539: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:541: 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
# 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:596: checking for a BSD compatible install" >&5
+echo "configure:598: 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
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-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"
- if test "${withval}" != "yes" && test "${withval}" != "no"; then
- EMACS=${withval};
- fi
-fi
-
-
-
# 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:681: checking for $ac_word" >&5
+echo "configure:657: checking for $ac_word" >&5
if eval "test \"\${ac_cv_prog_MAKEINFO+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo "$ac_t""no" 1>&6
fi
+ # 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:693: 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"
+
+ 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:727: 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 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:764: 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:795: 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:832: 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:712: 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:868: checking what a flavor does $EMACS have" >&5
+
+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:717: checking for xemacsp" >&5
+ echo $ac_n "checking for flavor""... $ac_c" 1>&6
+echo "configure:875: checking for flavor" >&5
fi
-if eval "test \"\${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
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
- XEMACSP=${EMACS_cv_SYS_xemacsp}
- EMACS_FLAVOR=emacs
- if test "$XEMACSP" = "yes"; then
- EMACS_FLAVOR=xemacs
- fi
- echo "$ac_t""$XEMACSP" 1>&6
-
-
+ 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:748: checking prefix for your Emacs" >&5
+echo "configure:907: 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
+echo "configure:912: checking for prefix" >&5
fi
if eval "test \"\${EMACS_cv_SYS_prefix+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
lispdir=${withval}
fi
- echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
-echo "configure:784: checking where .elc files should go" >&5
+ echo $ac_n "checking where lisp files should go""... $ac_c" 1>&6
+echo "configure:943: checking where lisp files should go" >&5
if test -z "$lispdir"; then
theprefix=$prefix
if test "x$theprefix" = "xNONE"; then
theprefix=$ac_default_prefix
fi
- lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp"
+ lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp/${GNUS_PRODUCT_NAME}"
for thedir in share lib; do
potential=
if test -d ${theprefix}/${thedir}/${EMACS_FLAVOR}/site-lisp; then
- lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-lisp"
+ lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-lisp/${GNUS_PRODUCT_NAME}"
break
fi
done
fi
- echo "$ac_t""$lispdir" 1>&6
+ echo "$ac_t""$lispdir
+ (it will be ignored when \"make install-package[-ja]\" is done)" 1>&6
-
echo $ac_n "checking for acceptable W3 version""... $ac_c" 1>&6
-echo "configure:805: checking for acceptable W3 version" >&5
+echo "configure:964: 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
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
+echo "configure:972: checking for w3-form-encode-xwfu in w3_forms" >&5
fi
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
+echo "configure:979: 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
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
+echo "configure:1023: 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
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
-
-
-
-PACKAGEDIR=
-# Check whether --with-packagedir or --without-packagedir was given.
+ # 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:1064: 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:1078: 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
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%@MAKEINFO@%$MAKEINFO%g
-s%@EMACS_FLAVOR@%$EMACS_FLAVOR%g
+s%@EMACS@%$EMACS%g
+s%@XEMACS@%$XEMACS%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%@PACKAGEDIR@%$PACKAGEDIR%g
+s%@ADDITIONAL_LOAD_PATH@%$ADDITIONAL_LOAD_PATH%g
CEOF
EOF
AC_INIT(lisp/gnus.el)
+AC_DEFINE_GNUS_PRODUCT_NAME(t-gnus)
AC_SET_MAKE
AC_PROG_INSTALL
-
-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_CHECK_EMACS
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})
-AC_SUBST(ADDITIONAL_LOAD_PATH)
-
-PACKAGEDIR=
-AC_ARG_WITH(
- packagedir,
- [ --with-packagedir=DIR package DIR for XEmacs [guessed]],
- PACKAGEDIR=${with_packagedir})
-AC_SUBST(PACKAGEDIR)
-
+AC_PATH_PACKAGEDIR
+AC_ADD_LOAD_PATH
AC_OUTPUT(Makefile lisp/Makefile lisp/dgnuspath.el texi/Makefile)
(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)
+(load (expand-file-name "dgnuspath.el" srcdir) nil nil t)
;; If we are building w3 in a different directory than the source
;; directory, we must read *.el from source directory and write *.elc
(load (expand-file-name "gnus-clfns.el" srcdir) nil t t)
-;(push "/usr/share/emacs/site-lisp" load-path)
-
-;; Attempt to pickup the additional load-path(s).
-(load (expand-file-name "dgnuspath.el" srcdir) nil nil t)
(condition-case err
(load "~/.lpath.el" t nil t)
(error (message "Error in \"~/.lpath.el\" file: %s" err)))
(defvar gnus-summary-display-table nil
"Display table used in summary mode buffers.")
- (defalias 'gnus-summary-set-display-table 'ignore)
+ (defalias 'gnus-summary-set-display-table (lambda ()))
(if (fboundp 'truncate-string-to-width)
(fset 'gnus-truncate-string 'truncate-string-to-width)
(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.
projects / elisp / gnus.git- / commitdiff