aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-05-14 12:52:13 -0700
committerGlenn Morris2011-05-14 12:52:13 -0700
commitd681f183cfe5347915f74a38078cb13f8c4ce2c2 (patch)
tree85bea7aaf8200e91f38697e5be1cc169fe9b2297
parent4691905a95e3a70a0a3eb538a0af1164ce0af8f1 (diff)
downloademacs-d681f183cfe5347915f74a38078cb13f8c4ce2c2.tar.gz
emacs-d681f183cfe5347915f74a38078cb13f8c4ce2c2.zip
Make configure.in give an error if no X-toolkit was detected.
* configure.in: Treat failure to find an X toolkit the same way we treat failure to find X and image support.
-rw-r--r--ChangeLog5
-rw-r--r--configure.in7
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 @@
12011-05-14 Glenn Morris <rgm@gnu.org>
2
3 * configure.in: Treat failure to find an X toolkit the same way we treat
4 failure to find X and image support.
5
12011-05-12 Glenn Morris <rgm@gnu.org> 62011-05-12 Glenn Morris <rgm@gnu.org>
2 7
3 * Makefile.in (src, install-arch-indep, bootstrap-clean) 8 * 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
2036 elif test x"${USE_X_TOOLKIT}" = xLUCID; then 2036 elif test x"${USE_X_TOOLKIT}" = xLUCID; then
2037 AC_MSG_ERROR([Lucid toolkit requires X11/Xaw include files]) 2037 AC_MSG_ERROR([Lucid toolkit requires X11/Xaw include files])
2038 else 2038 else
2039 AC_MSG_RESULT([no; do not use toolkit by default]) 2039 AC_MSG_ERROR([No X toolkit could be found.
2040 USE_X_TOOLKIT=none 2040If you are sure you want Emacs compiled without an X toolkit, pass
2041 --with-x-toolkit=no
2042to configure. Otherwise, install the development libraries for the toolkit
2043that you want to use (e.g. Gtk+) and re-run configure.])
2041 fi 2044 fi
2042 fi 2045 fi
2043fi 2046fi