Mercurial > emacs
diff configure @ 90813:e6fdae9180d4
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
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 24 Apr 2007 21:56:25 +0000 |
parents | 4ef881a120fe 4bae97ce3ac6 |
children | 3816faf8a124 |
line wrap: on
line diff
--- a/configure Tue Apr 24 11:35:23 2007 +0000 +++ b/configure Tue Apr 24 21:56:25 2007 +0000 @@ -3026,6 +3026,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" @@ -11723,7 +11725,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; } @@ -11782,9 +11784,15 @@ echo "${ECHO_T}5 or newer, with Xaw; use toolkit by default" >&6; } USE_X_TOOLKIT=LUCID else - { echo "$as_me:$LINENO: result: before 5 or no Xaw; do not use toolkit by default" >&5 + 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 + USE_X_TOOLKIT=none + fi fi else USE_X_TOOLKIT=none @@ -12924,13 +12932,13 @@ { echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5 echo $ECHO_N "checking FREETYPE_CFLAGS... $ECHO_C" >&6; } - FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2"` + FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2"|sed -e 's,///*,/,g'` { echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5 echo "${ECHO_T}$FREETYPE_CFLAGS" >&6; } { echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5 echo $ECHO_N "checking FREETYPE_LIBS... $ECHO_C" >&6; } - FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2"` + FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2"|sed -e 's,///*,/,g'` { echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5 echo "${ECHO_T}$FREETYPE_LIBS" >&6; } else @@ -13021,13 +13029,13 @@ { echo "$as_me:$LINENO: checking FONTCONFIG_CFLAGS" >&5 echo $ECHO_N "checking FONTCONFIG_CFLAGS... $ECHO_C" >&6; } - FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig"` + FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig"|sed -e 's,///*,/,g'` { echo "$as_me:$LINENO: result: $FONTCONFIG_CFLAGS" >&5 echo "${ECHO_T}$FONTCONFIG_CFLAGS" >&6; } { echo "$as_me:$LINENO: checking FONTCONFIG_LIBS" >&5 echo $ECHO_N "checking FONTCONFIG_LIBS... $ECHO_C" >&6; } - FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig"` + FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig"|sed -e 's,///*,/,g'` { echo "$as_me:$LINENO: result: $FONTCONFIG_LIBS" >&5 echo "${ECHO_T}$FONTCONFIG_LIBS" >&6; } else