From: yamaoka Date: Tue, 1 Aug 2000 07:30:23 +0000 (+0000) Subject: Synch with `t-gnus-6_14'. X-Git-Tag: t-gnus-6_14-quimby-before-installer-changed-~155 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7505cbd915ffb6814c8dfabf0e77b4b0544ab1e;p=elisp%2Fgnus.git- Synch with `t-gnus-6_14'. --- diff --git a/ChangeLog b/ChangeLog index e0c5d97..99151bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-08-01 Katsumi Yamaoka + + * configure: Regenerate. + * aclocal.m4 (AC_CHECK_EMACS): Unset `EMACS' environment variable + if it is `t'. + 2000-07-24 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 03. diff --git a/aclocal.m4 b/aclocal.m4 index 5766fc4..fc0ba51 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -4,9 +4,14 @@ AC_DEFUN(AC_DEFINE_GNUS_PRODUCT_NAME, AC_DEFUN(AC_CHECK_EMACS, [dnl Check for Emacsen. + + dnl Apparently, if you run a shell window in Emacs, it sets the EMACS + dnl environment variable to 't'. Lets undo the damage. + test x$EMACS = xt && EMACS= + AC_ARG_WITH(emacs, [ --with-emacs=EMACS compile with EMACS [EMACS=emacs, mule...]], - [if test x$withval = xyes -o x$withval = xt -o x$withval = x; then + [if test x$withval = xyes -o x$withval = x; then AC_CHECK_PROGS(EMACS, emacs xemacs mule, emacs) else AC_CHECK_PROG(EMACS, $withval, $withval, emacs) @@ -20,7 +25,7 @@ AC_DEFUN(AC_CHECK_EMACS, fi EMACS=$XEMACS], [XEMACS=xemacs - test x$EMACS = xt -o x$EMACS = x &&\ + test x$EMACS = x &&\ AC_CHECK_PROGS(EMACS, emacs xemacs mule, emacs)]) AC_SUBST(EMACS) AC_SUBST(XEMACS)]) diff --git a/configure b/configure index 9666b4e..ee8726d 100755 --- a/configure +++ b/configure @@ -680,16 +680,19 @@ else echo "$ac_t""no" 1>&6 fi + + test x$EMACS = xt && EMACS= + # 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 + if test x$withval = xyes -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 +echo "configure:696: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -723,7 +726,7 @@ test -n "$EMACS" || EMACS="emacs" # 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 +echo "configure:730: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -760,7 +763,7 @@ if test "${with_xemacs+set}" = set; 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 +echo "configure:767: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_XEMACS+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -791,7 +794,7 @@ fi # 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 +echo "configure:798: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_XEMACS+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -822,13 +825,13 @@ fi EMACS=$XEMACS else XEMACS=xemacs - test x$EMACS = xt -o x$EMACS = x &&\ + test 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 +echo "configure:835: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_EMACS+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -864,14 +867,14 @@ fi 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 +echo "configure:871: 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 flavor""... $ac_c" 1>&6 -echo "configure:875: checking for flavor" >&5 +echo "configure:878: checking for flavor" >&5 fi if eval "test \"\${EMACS_cv_SYS_flavor+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -903,12 +906,12 @@ fi 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:907: checking prefix for your Emacs" >&5 +echo "configure:910: 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:912: checking for prefix" >&5 +echo "configure:915: checking for prefix" >&5 fi if eval "test \"\${EMACS_cv_SYS_prefix+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -939,7 +942,7 @@ if test "${with_lispdir+set}" = set; then fi echo $ac_n "checking where lisp files should go""... $ac_c" 1>&6 -echo "configure:943: checking where lisp files should go" >&5 +echo "configure:946: checking where lisp files should go" >&5 if test -z "$lispdir"; then theprefix=$prefix if test "x$theprefix" = "xNONE"; then @@ -960,7 +963,7 @@ echo "configure:943: checking where lisp files should go" >&5 echo $ac_n "checking for acceptable W3 version""... $ac_c" 1>&6 -echo "configure:964: checking for acceptable W3 version" >&5 +echo "configure:967: 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 @@ -968,14 +971,14 @@ else if test -z ""noecho""; then echo $ac_n "checking for w3-form-encode-xwfu in w3_forms""... $ac_c" 1>&6 -echo "configure:972: checking for w3-form-encode-xwfu in w3_forms" >&5 +echo "configure:975: 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:979: checking for w3_forms" >&5 +echo "configure:982: 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 @@ -1019,7 +1022,7 @@ 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:1023: checking for w3_dir" >&5 +echo "configure:1026: 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 @@ -1060,7 +1063,7 @@ if test "${with_packagedir+set}" = set; then withval="$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 +echo "configure:1067: checking where the package should go" >&5 PACKAGEDIR=$withval echo "$ac_t""$PACKAGEDIR" 1>&6 fi @@ -1074,7 +1077,7 @@ 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 +echo "configure:1081: checking where to find the additional elisp libraries" >&5 ADDITIONAL_LOAD_PATH=$withval echo "$ac_t""$ADDITIONAL_LOAD_PATH" 1>&6 fi