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

diff --git a/configure.in b/configure.in
index 675635b35..09881223e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,32 @@
 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 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" -o -n "${INSIDE_EMACS}"; then
+   EMACS=""
+fi
+
+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,
+	[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_PATH_ETCDIR
+AC_PATH_INFO_DIR
+AC_SET_BUILD_FLAGS
+GNUS_CHECK_FONTS
+
+AC_OUTPUT(Makefile etc/Makefile lisp/Makefile texi/Makefile texi/gnusconfig.tex texi/ps/Makefile)