aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2007-04-19 18:07:26 +0000
committerChong Yidong2007-04-19 18:07:26 +0000
commit465ace28f89e41b1ed284dca2240fd37e25bb53e (patch)
tree217e88a21224c11bff25190b65d075734b99a335
parente45f35a0bb20a0bc076c8f9a9cdcefdbc29c4dc7 (diff)
downloademacs-465ace28f89e41b1ed284dca2240fd37e25bb53e.tar.gz
emacs-465ace28f89e41b1ed284dca2240fd37e25bb53e.zip
Signal error if Xaw libs are missing in a Lucid build.
-rw-r--r--configure.in10
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 108fa4f429d..4c64970fe0f 100644
--- a/configure.in
+++ b/configure.in
@@ -2206,7 +2206,7 @@ fi
2206 2206
2207dnl Do not put whitespace before the #include statements below. 2207dnl Do not put whitespace before the #include statements below.
2208dnl Older compilers (eg sunos4 cc) choke on it. 2208dnl Older compilers (eg sunos4 cc) choke on it.
2209if test x"${USE_X_TOOLKIT}" = xmaybe; then 2209if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
2210 if test x"${HAVE_X11R5}" = xyes; then 2210 if test x"${HAVE_X11R5}" = xyes; then
2211 AC_MSG_CHECKING(X11 version 5 with Xaw) 2211 AC_MSG_CHECKING(X11 version 5 with Xaw)
2212 AC_CACHE_VAL(emacs_cv_x11_version_5_with_xaw, 2212 AC_CACHE_VAL(emacs_cv_x11_version_5_with_xaw,
@@ -2220,8 +2220,12 @@ if test x"${USE_X_TOOLKIT}" = xmaybe; then
2220 AC_MSG_RESULT([5 or newer, with Xaw; use toolkit by default]) 2220 AC_MSG_RESULT([5 or newer, with Xaw; use toolkit by default])
2221 USE_X_TOOLKIT=LUCID 2221 USE_X_TOOLKIT=LUCID
2222 else 2222 else
2223 AC_MSG_RESULT(before 5 or no Xaw; do not use toolkit by default) 2223 if test x"${USE_X_TOOLKIT}" = xLUCID; then
2224 USE_X_TOOLKIT=none 2224 AC_MSG_ERROR([Lucid toolkit requires X11/Xaw include files])
2225 else
2226 AC_MSG_RESULT(before 5 or no Xaw; do not use toolkit by default)
2227 USE_X_TOOLKIT=none
2228 fi
2225 fi 2229 fi
2226 else 2230 else
2227 USE_X_TOOLKIT=none 2231 USE_X_TOOLKIT=none