From 82bdac2cb400d86ecbd352497653e176a4422c2e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 7 Dec 2010 12:56:51 -0600 Subject: [PATCH] undo changes, xft pkgconfig already requires fontconfig --- fltk-1.1.10-pkgconfig_xft.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fltk-1.1.10-pkgconfig_xft.patch b/fltk-1.1.10-pkgconfig_xft.patch index d348122..145a43a 100644 --- a/fltk-1.1.10-pkgconfig_xft.patch +++ b/fltk-1.1.10-pkgconfig_xft.patch @@ -7,8 +7,8 @@ diff -up fltk-1.1.10/configure.pkgconfig_xft fltk-1.1.10/configure 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" ++ CPPFLAGS="`pkg-config --cflags xft` $CPPFLAGS" ++ CXXFLAGS="`pkg-config --cflags xft` $CXXFLAGS" if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then { echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 @@ -17,7 +17,7 @@ diff -up fltk-1.1.10/configure.pkgconfig_xft fltk-1.1.10/configure else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXft $LIBS" -+LIBS="`pkg-config --libs xft fontconfig` $LIBS" ++LIBS="`pkg-config --libs xft` $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF