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

Xft for xonx

Browse Source 
svn: r1032
This commit is contained in:
Matthew Flatt 2005-10-09 22:37:34 +00:00
parent b4182a661b
commit 52d22b9bde
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/configure vendored
View File

@ -5131,6 +5131,9 @@ PREFLAGS="$CPPFLAGS"
ar_libtool_no_undefined="" ar_libtool_no_undefined=""
LIBMZSCHEME_DEP="" LIBMZSCHEME_DEP=""
XFT_EXTRA_FLAGS=
XFT_EXTRA_LIBS=
###### OSKit stuff ####### ###### OSKit stuff #######
if test "${enable_oskit}" = "yes" ; then if test "${enable_oskit}" = "yes" ; then
@ -8625,6 +8628,10 @@ case $OS in
else else
PREFLAGS="$PREFLAGS -DXONX " PREFLAGS="$PREFLAGS -DXONX "
X_EXTRA_LIBS="$X_EXTRA_LIBS -lz" X_EXTRA_LIBS="$X_EXTRA_LIBS -lz"
# need help finding fontconfig and freetype headers:
XFT_EXTRA_FLAGS="-I/usr/X11R6/include -I/usr/X11R6/include/freetype2"
XFT_EXTRA_LIBS="-lfontconfig"
fi fi
;; ;;
*) *)
@ -9881,6 +9888,8 @@ fi
if test "${enable_xft}" = "yes" ; then if test "${enable_xft}" = "yes" ; then
xft_config_ok=`xft-config --cflags 2> /dev/null` xft_config_ok=`xft-config --cflags 2> /dev/null`
if test "$xft_config_ok" = "" ; then if test "$xft_config_ok" = "" ; then
save_cpp_flags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $XFT_EXTRA_FLAGS $X_CFLAGS"
if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6 echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6
@ -10097,14 +10106,15 @@ else
fi fi
if test "${enable_xft}" = "yes" ; then if test "${enable_xft}" = "yes" ; then
MROPTIONS="$MROPTIONS -DWX_USE_XFT" MROPTIONS="$MROPTIONS $XFT_EXTRA_FLAGS -DWX_USE_XFT"
X_EXTRA_LIBS="$X_EXTRA_LIBS -lXft" X_EXTRA_LIBS="$X_EXTRA_LIBS $XFT_EXTRA_LIBS -lXft"
else else
echo "no Xft libs; Xft support disabled" echo "no Xft libs; Xft support disabled"
fi fi
else else
echo "no Xft headers; Xft support disabled" echo "no Xft headers; Xft support disabled"
fi fi
CPPFLAGS="$save_cpp_flags"
else else
echo "Using xft-config..." echo "Using xft-config..."
xft_cflags=`xft-config --cflags` xft_cflags=`xft-config --cflags`

14
src/mzscheme/configure.ac
View File

@ -201,6 +201,9 @@ PREFLAGS="$CPPFLAGS"
ar_libtool_no_undefined="" ar_libtool_no_undefined=""
LIBMZSCHEME_DEP="" LIBMZSCHEME_DEP=""
XFT_EXTRA_FLAGS=
XFT_EXTRA_LIBS=
###### OSKit stuff ####### ###### OSKit stuff #######
if test "${enable_oskit}" = "yes" ; then if test "${enable_oskit}" = "yes" ; then
@ -497,6 +500,10 @@ case $OS in
else else
PREFLAGS="$PREFLAGS -DXONX " PREFLAGS="$PREFLAGS -DXONX "
X_EXTRA_LIBS="$X_EXTRA_LIBS -lz" X_EXTRA_LIBS="$X_EXTRA_LIBS -lz"
# need help finding fontconfig and freetype headers:
XFT_EXTRA_FLAGS="-I/usr/X11R6/include -I/usr/X11R6/include/freetype2"
XFT_EXTRA_LIBS="-lfontconfig"
fi fi
;; ;;
*) *)
@ -796,18 +803,21 @@ fi
if test "${enable_xft}" = "yes" ; then if test "${enable_xft}" = "yes" ; then
xft_config_ok=`xft-config --cflags 2> /dev/null` xft_config_ok=`xft-config --cflags 2> /dev/null`
if test "$xft_config_ok" = "" ; then if test "$xft_config_ok" = "" ; 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) AC_CHECK_HEADER(X11/Xft/Xft.h, enable_xft=yes, enable_xft=no)
if test "${enable_xft}" = "yes" ; then if test "${enable_xft}" = "yes" ; then
AC_CHECK_LIB(Xft, XftTextExtents8, enable_xft="yes", enable_xft="no", $X_LIBS -lX11 -lXext -Xrender -lXft) AC_CHECK_LIB(Xft, XftTextExtents8, enable_xft="yes", enable_xft="no", $X_LIBS -lX11 -lXext -Xrender -lXft)
if test "${enable_xft}" = "yes" ; then if test "${enable_xft}" = "yes" ; then
MROPTIONS="$MROPTIONS -DWX_USE_XFT" MROPTIONS="$MROPTIONS $XFT_EXTRA_FLAGS -DWX_USE_XFT"
X_EXTRA_LIBS="$X_EXTRA_LIBS -lXft" X_EXTRA_LIBS="$X_EXTRA_LIBS $XFT_EXTRA_LIBS -lXft"
else else
echo "no Xft libs; Xft support disabled" echo "no Xft libs; Xft support disabled"
fi fi
else else
echo "no Xft headers; Xft support disabled" echo "no Xft headers; Xft support disabled"
fi fi
CPPFLAGS="$save_cpp_flags"
else else
echo "Using xft-config..." echo "Using xft-config..."
xft_cflags=`xft-config --cflags` xft_cflags=`xft-config --cflags`