[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/configure,v |
Date: |
Thu, 19 Apr 2007 18:07:42 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 07/04/19 18:07:42
Index: configure
===================================================================
RCS file: /cvsroot/emacs/emacs/configure,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -b -r1.201 -r1.202
--- configure 5 Apr 2007 06:07:32 -0000 1.201
+++ configure 19 Apr 2007 18:07:41 -0000 1.202
@@ -2996,6 +2996,8 @@
;;
*-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"
@@ -12014,7 +12016,7 @@
fi
fi
-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
{ echo "$as_me:$LINENO: checking X11 version 5 with Xaw" >&5
echo $ECHO_N "checking X11 version 5 with Xaw... $ECHO_C" >&6; }
@@ -12073,10 +12075,16 @@
echo "${ECHO_T}5 or newer, with Xaw; use toolkit by default" >&6; }
USE_X_TOOLKIT=LUCID
else
+ if test x"${USE_X_TOOLKIT}" = xLUCID; then
+ { { echo "$as_me:$LINENO: error: Lucid toolkit requires X11/Xaw
include files" >&5
+echo "$as_me: error: Lucid toolkit requires X11/Xaw include files" >&2;}
+ { (exit 1); exit 1; }; }
+ else
{ echo "$as_me:$LINENO: result: before 5 or no Xaw; do not use toolkit
by default" >&5
echo "${ECHO_T}before 5 or no Xaw; do not use toolkit by default" >&6; }
USE_X_TOOLKIT=none
fi
+ fi
else
USE_X_TOOLKIT=none
fi