X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=configure.in;h=daca503b8a8547b724b2c6730923ec203d9cc0ee;hb=9c9b185102abe1d61db032674a559e9ffb0e0b61;hp=d302640157709fb45084692c47daa00b736f01b3;hpb=30a53c1d7e64f14130f9ef4d28a86b180b895f67;p=gnus

diff --git a/configure.in b/configure.in
index d30264015..daca503b8 100644
--- 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)
 
@@ -20,7 +25,10 @@ AC_CHECK_PROG(EMACS, emacs, emacs, xemacs)
 
 AC_PATH_LISPDIR
 AC_PATH_ETCDIR
+AC_PATH_INFO_DIR
 AC_CHECK_URL
 AC_CHECK_W3
+AC_SET_BUILD_FLAGS
+GNUS_CHECK_FONTS
 
-AC_OUTPUT(Makefile lisp/Makefile texi/Makefile etc/Makefile texi/ps/Makefile)
+AC_OUTPUT(Makefile etc/Makefile lisp/Makefile texi/Makefile texi/gnusconfig.tex texi/ps/Makefile)