diff options
| author | Miles Bader <miles@gnu.org> | 2007-04-24 21:56:25 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-04-24 21:56:25 +0000 |
| commit | 991a760232de757d71d8dbbed47ee12d81e29d53 (patch) | |
| tree | 2440730c37ae3f167a50f5c3ac5eaeab9b72b7b0 /configure.in | |
| parent | 0bb328f8f6fce06a7fc65670c7d5c011b613e1c5 (diff) | |
| parent | 3851329262d6558d5e1a93157d44777d0a39e38e (diff) | |
| download | emacs-991a760232de757d71d8dbbed47ee12d81e29d53.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 698-710)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 216)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-196
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/configure.in b/configure.in index b536d8dc105..46d574171e0 100644 --- a/configure.in +++ b/configure.in @@ -1039,6 +1039,8 @@ dnl see the `changequote' comment above. ;; *-sunos5* | *-solaris* ) opsys=sol2-6 +## FIXME: make this into a proper fix that checks the compiler type, +## rather than relying on path. Or is /usr/ccs/lib/cpp a bad default now? if [ "x$CC" = x/opt/SUNWspro/bin/cc ]; then ## -Xs prevents spurious whitespace. NON_GNU_CPP="/opt/SUNWspro/bin/cc -E -Xs" @@ -2182,7 +2184,7 @@ fi dnl Do not put whitespace before the #include statements below. dnl Older compilers (eg sunos4 cc) choke on it. -if test x"${USE_X_TOOLKIT}" = xmaybe; then +if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then if test x"${HAVE_X11R5}" = xyes; then AC_MSG_CHECKING(X11 version 5 with Xaw) AC_CACHE_VAL(emacs_cv_x11_version_5_with_xaw, @@ -2196,8 +2198,12 @@ if test x"${USE_X_TOOLKIT}" = xmaybe; then AC_MSG_RESULT([5 or newer, with Xaw; use toolkit by default]) USE_X_TOOLKIT=LUCID else - AC_MSG_RESULT(before 5 or no Xaw; do not use toolkit by default) - USE_X_TOOLKIT=none + if test x"${USE_X_TOOLKIT}" = xLUCID; then + AC_MSG_ERROR([Lucid toolkit requires X11/Xaw include files]) + else + AC_MSG_RESULT(before 5 or no Xaw; do not use toolkit by default) + USE_X_TOOLKIT=none + fi fi else USE_X_TOOLKIT=none |