gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-02-22 19:31:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* configure.ac: Fix wrong assumption about Xft's .pc file that

Browse source 
leads to build failure with -Wl,--no-undefined.
        Patch by Yavor Doganov  <yavor@gnu.org>


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@38007 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2014-07-24 21:36:17 +00:00
parent 8feb7e4701
commit 0267440258
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2014-05-24 Fred Kiefer <FredKiefer@gmx.de>
* configure.ac: Fix wrong assumption about Xft's .pc file that
leads to build failure with -Wl,--no-undefined.
Patch by Yavor Doganov <yavor@gnu.org>
2014-05-07 Fred Kiefer <FredKiefer@gmx.de>
* Tools/gpbs.m: Revert last change and correct the implementation

6
configure vendored
View file

@ -5311,11 +5311,7 @@ fi
if test "$have_fc" = yes -a "$ac_cv_header_fontconfig_fontconfig_h" = yes; then
# fontconfig is likely to be included if we found xft via pkg-config, so
# don't include it twice
if test $PKG_XFT = no; then
XFT_LIBS="${XFT_LIBS} -lfontconfig"
fi
XFT_LIBS="${XFT_LIBS} -lfontconfig"
$as_echo "#define HAVE_FC 1" >>confdefs.h

6
configure.ac
View file

@ -273,11 +273,7 @@ if test $WITH_XFT = yes; then
AC_CHECK_LIB(fontconfig, FcPatternCreate, have_fc=yes, have_fc=no)
AC_CHECK_HEADER(fontconfig/fontconfig.h)
if test "$have_fc" = yes -a "$ac_cv_header_fontconfig_fontconfig_h" = yes; then
# fontconfig is likely to be included if we found xft via pkg-config, so
# don't include it twice
if test $PKG_XFT = no; then
XFT_LIBS="${XFT_LIBS} -lfontconfig"
fi
XFT_LIBS="${XFT_LIBS} -lfontconfig"
AC_DEFINE(HAVE_FC,1,[Define if you have FcPatternCreate])
fi
CPPFLAGS=${save_CPPFLAGS}