configure.in: Work for term-mode running in Emacs

[gnus] / configure.in

diff --git a/configure.in b/configure.in
index 939e964..daca503 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,16 +3,21 @@ AC_SET_MAKE
 AC_PROG_INSTALL
 
 dnl
-dnl Apparently, if you run a shell window in Emacs, it sets the EMACS
-dnl environment variable to 't'.  Lets undo the damage.
+dnl Apparently, if you run a shell window or a term window in Emacs,
+dnl it sets the EMACS environment variable to 't' or a version number
+dnl of Emacs.  Lets undo the damage.
 dnl
-if test "${EMACS}" = "t"; then
+if test "${EMACS}" = "t" -o -n "${INSIDE_EMACS}"; then
    EMACS=""
 fi
 
-AC_ARG_WITH(xemacs,[  --with-xemacs           Use XEmacs to build], 
+AC_ARG_WITH(xemacs,
+       [AS_HELP_STRING([[--with-xemacs[=PROG]]],
+                       [use XEmacs to build (default: PROG=xemacs)])],
        [ if test "${withval}" = "yes"; then EMACS=xemacs; else EMACS=${withval}; fi ])
-AC_ARG_WITH(emacs,[  --with-emacs            Use Emacs to build], 
+AC_ARG_WITH(emacs,
+       [AS_HELP_STRING([[--with-emacs[=PROG]]],
+                       [use Emacs to build (default: PROG=emacs)])],
        [ if test "${withval}" = "yes"; then EMACS=emacs; else EMACS=${withval}; fi ])
 AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, no)
 
@@ -27,7 +32,3 @@ AC_SET_BUILD_FLAGS
 GNUS_CHECK_FONTS
 
 AC_OUTPUT(Makefile etc/Makefile lisp/Makefile texi/Makefile texi/gnusconfig.tex texi/ps/Makefile)
-
-ifelse(dnl     Do not change this comment
-   arch-tag: 4fda042e-c632-45be-867f-4d90bc87746b
-)dnl