X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=configure.in;h=09881223e454cc2f1269c88af635d3522782b51a;hp=a3610f669bc702ab8304a166f1b0e56c2c2ee8de;hb=8da1336efbd60db3a837c2dd77c91bc6f1116661;hpb=b7b80acf6c8c04fe4b233a46e19f9a1d19ef024e

diff --git a/configure.in b/configure.in
index a3610f669..09881223e 100644
--- a/configure.in
+++ b/configure.in
@@ -3,22 +3,30 @@ 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)
 
 AC_CHECK_PROG(EMACS, emacs, emacs, xemacs)
 
 AC_PATH_LISPDIR
-AC_CHECK_W3
+AC_PATH_ETCDIR
+AC_PATH_INFO_DIR
+AC_SET_BUILD_FLAGS
+GNUS_CHECK_FONTS
 
-AC_OUTPUT(Makefile lisp/Makefile texi/Makefile)
+AC_OUTPUT(Makefile etc/Makefile lisp/Makefile texi/Makefile texi/gnusconfig.tex texi/ps/Makefile)