rpms/fltk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

undo changes, xft pkgconfig already requires fontconfig

Browse Source
This commit is contained in:
Rex Dieter 2010-12-07 12:56:51 -06:00
parent 10df5db516
commit 82bdac2cb4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fltk-1.1.10-pkgconfig_xft.patch
View File

@ -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