diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2006-11-08 15:39:28 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2006-11-08 15:39:28 (GMT) |
| commit | ba16786f04a14a4e1bb4e939ca9c17d4934931f1 (patch) | |
| tree | 1fc720497a53533ddd67a25cfeebdcbcb342f022 /unix/configure | |
| parent | 30f4adf499a0f678329b9e173152c951e2236e77 (diff) | |
| download | tk-ba16786f04a14a4e1bb4e939ca9c17d4934931f1.zip tk-ba16786f04a14a4e1bb4e939ca9c17d4934931f1.tar.gz tk-ba16786f04a14a4e1bb4e939ca9c17d4934931f1.tar.bz2 | |
Silence warnings about Xft unless Xft is requested explicitly.
Diffstat (limited to 'unix/configure')
| -rwxr-xr-x | unix/configure | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/unix/configure b/unix/configure index 1734e67..52d4bcc 100755 --- a/unix/configure +++ b/unix/configure @@ -9265,25 +9265,32 @@ if test "${enable_xft+set}" = set; then enableval="$enable_xft" enable_xft=$enableval else - enable_xft="yes" + enable_xft="default" fi; XFT_CFLAGS="" XFT_LIBS="" - if test "$enable_xft" = "yes" ; then - XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || enable_xft="no" - XFT_LIBS=`xft-config --libs 2>/dev/null` || enable_xft="no" - if test "$enable_xft" = "no" ; then - enable_xft=yes - XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || enable_xft="no" - XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || enable_xft="no" + if test "$enable_xft" == "no" ; then + echo "$as_me:$LINENO: result: $enable_xft" >&5 +echo "${ECHO_T}$enable_xft" >&6 + else + found_xft="yes" + XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no" + XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no" + if test "$found_xft" = "no" ; then + found_xft=yes + XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no" + XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no" fi - if test "$enable_xft" = "no" ; then - { echo "$as_me:$LINENO: WARNING: Can't find xft configuration" >&5 + echo "$as_me:$LINENO: result: $found_xft" >&5 +echo "${ECHO_T}$found_xft" >&6 + if test "$found_xft" = "no" ; then + if test "$enable_xft" = "yes" ; then + { echo "$as_me:$LINENO: WARNING: Can't find xft configuration" >&5 echo "$as_me: WARNING: Can't find xft configuration" >&2;} + fi + enable_xft=no fi fi - echo "$as_me:$LINENO: result: $enable_xft" >&5 -echo "${ECHO_T}$enable_xft" >&6 if test $enable_xft = "yes" ; then UNIX_FONT_OBJS=tkUnixRFont.o |