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_PATH_LISPDIR
AC_PATH_ETCDIR
AC_PATH_INFO_DIR
-AC_CHECK_URL
-AC_CHECK_W3
AC_SET_BUILD_FLAGS
GNUS_CHECK_FONTS