fltk/fltk-1.1.10-pkgconfig_xft.patch

33 lines
1.0 KiB
Diff

diff -up fltk-1.1.10/configure.pkgconfig_xft fltk-1.1.10/configure
--- fltk-1.1.10/configure.pkgconfig_xft 2010-02-14 14:03:17.730616944 -0600
+++ fltk-1.1.10/configure 2010-02-14 14:05:05.369368026 -0600
@@ -11945,8 +11945,8 @@ fi
if test "x$FTCONFIG" != x; then
- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
+ CPPFLAGS="`pkg-config --cflags xft fontconfig` $CPPFLAGS"
+ CXXFLAGS="`pkg-config --cflags xft fontconfig` $CXXFLAGS"
if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
@@ -12080,7 +12080,7 @@ if test "${ac_cv_lib_Xft_XftDrawCreate+s
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXft $LIBS"
+LIBS="`pkg-config --libs xft fontconfig` $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -12140,7 +12140,7 @@ if test $ac_cv_lib_Xft_XftDrawCreate = y
#define USE_XFT 1
_ACEOF
- LIBS="-lXft $LIBS"
+ LIBS="`pkg-config xft --libs` $LIBS"
fi
fi