suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use pkg-config, fix test for success

Browse Source 
svn: r1375
This commit is contained in:
Matthew Flatt 2005-11-22 21:55:07 +00:00
parent 9875ed685e
commit 3e53a3fd05
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/configure vendored
View File

@ -9942,8 +9942,13 @@ if test "${enable_xft}" = "" ; then
fi
if test "${enable_xft}" = "yes" ; then
xft_config_ok=`xft-config --cflags 2> /dev/null`
if test "$xft_config_ok" = "" ; then
xft_config_prog="pkg-config xft"
xft_config_ok=`$xft_config_prog --cflags 2> /dev/null`
if test "$?" != 0 ; then
xft_config_prog="xft-config"
xft_config_ok=`$xft_config_prog --cflags 2> /dev/null`
fi
if test "$?" != 0 ; then
save_cpp_flags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $XFT_EXTRA_FLAGS $X_CFLAGS"
if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
@ -10172,9 +10177,9 @@ fi
fi
CPPFLAGS="$save_cpp_flags"
else
echo "Using xft-config..."
xft_cflags=`xft-config --cflags`
xft_libs=`xft-config --libs`
echo "Using $xft_config_prog..."
xft_cflags=`$xft_config_prog --cflags`
xft_libs=`$xft_config_prog --libs`
echo "Xft flags: $xft_cflags"
echo "Xft libs: $xft_libs"
MROPTIONS="$MROPTIONS -DWX_USE_XFT"
@ -10191,7 +10196,7 @@ fi
if test "${enable_cairo}" = "yes" ; then
cairo_config_ok=`pkg-config --cflags cairo 2> /dev/null`
if test "$cairo_config_ok" = "" ; then
if test "$?" != 0 ; then
echo "no information from pkg-config; Cairo support disabled"
else
echo "Using pkg-config for Cairo..."

17
src/mzscheme/configure.ac
View File

@ -809,8 +809,13 @@ if test "${enable_xft}" = "" ; then
fi
if test "${enable_xft}" = "yes" ; then
xft_config_ok=`xft-config --cflags 2> /dev/null`
if test "$xft_config_ok" = "" ; then
xft_config_prog="pkg-config xft"
xft_config_ok=`$xft_config_prog --cflags 2> /dev/null`
if test "$?" != 0 ; then
xft_config_prog="xft-config"
xft_config_ok=`$xft_config_prog --cflags 2> /dev/null`
fi
if test "$?" != 0 ; then
save_cpp_flags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $XFT_EXTRA_FLAGS $X_CFLAGS"
AC_CHECK_HEADER(X11/Xft/Xft.h, enable_xft=yes, enable_xft=no)
@ -827,9 +832,9 @@ if test "${enable_xft}" = "yes" ; then
fi
CPPFLAGS="$save_cpp_flags"
else
echo "Using xft-config..."
xft_cflags=`xft-config --cflags`
xft_libs=`xft-config --libs`
echo "Using $xft_config_prog..."
xft_cflags=`$xft_config_prog --cflags`
xft_libs=`$xft_config_prog --libs`
echo "Xft flags: $xft_cflags"
echo "Xft libs: $xft_libs"
MROPTIONS="$MROPTIONS -DWX_USE_XFT"
@ -846,7 +851,7 @@ fi
if test "${enable_cairo}" = "yes" ; then
cairo_config_ok=`pkg-config --cflags cairo 2> /dev/null`
if test "$cairo_config_ok" = "" ; then
if test "$?" != 0 ; then
echo "no information from pkg-config; Cairo support disabled"
else
echo "Using pkg-config for Cairo..."