X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=configure.in;h=e4c53c938ad74b52c27bc3ba8b974e59009e9571;hp=675635b35598e2fbb8fb1cb78e25e929dddb4cfc;hb=bf3a2ae182befb9616f6615fd9ab0771dd5a8ccb;hpb=754a007c9c67f3506008dab6e7e8943eb51848f2

diff --git a/configure.in b/configure.in
index 675635b35..e4c53c938 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,29 @@
 AC_INIT(lisp/gnus.el)
 AC_SET_MAKE
 AC_PROG_INSTALL
-AM_PATH_LISPDIR
-AC_PATH_PROG(MAKEINFO, makeinfo, no)
-AC_OUTPUT(Makefile lisp/Makefile texi/Makefile)
+
+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
+if test "${EMACS}" = "t"; then
+   EMACS=""
+fi
+
+AC_ARG_WITH(xemacs,[  --with-xemacs           Use XEmacs to build], 
+	[ if test "${withval}" = "yes"; then EMACS=xemacs; else EMACS=${withval}; fi ])
+AC_ARG_WITH(emacs,[  --with-emacs            Use Emacs to build], 
+	[ 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_PATH_ETCDIR
+AC_PATH_INFO_DIR
+AC_CHECK_URL
+AC_CHECK_W3
+AC_SET_BUILD_FLAGS
+GNUS_CHECK_FONTS
+
+AC_OUTPUT(Makefile etc/Makefile lisp/Makefile texi/Makefile texi/gnusconfig.tex texi/ps/Makefile)