2 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9fccc2e06f9..86aa8222f10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-14  Glenn Morris  <rgm@gnu.org>
+
+        * configure.in: Treat failure to find an X toolkit the same way we treat
+        failure to find X and image support.
+
 2011-05-12  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (src, install-arch-indep, bootstrap-clean)
diff --git a/configure.in b/configure.in
index f46645c1bd2..5d2992539f0 100644
--- a/configure.in
+++ b/configure.in
@@ -2036,8 +2036,11 @@ if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
     elif test x"${USE_X_TOOLKIT}" = xLUCID; then
       AC_MSG_ERROR([Lucid toolkit requires X11/Xaw include files])
     else
-      AC_MSG_RESULT([no; do not use toolkit by default])
-      USE_X_TOOLKIT=none
+      AC_MSG_ERROR([No X toolkit could be found.
+If you are sure you want Emacs compiled without an X toolkit, pass
+  --with-x-toolkit=no
+to configure.  Otherwise, install the development libraries for the toolkit
+that you want to use (e.g. Gtk+) and re-run configure.])
     fi
   fi
 fi