Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Put -lfontconfig in XFT_LIBS, not XLIBSW flag |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
ef49212beb97498a38a660b278e7734f |
User & Date: | jan.nijtmans 2014-01-23 22:39:24 |
Context
2014-01-25
| ||
21:37 | Fix TK_SHLIB_LD_EXTRAS for FreeBSD (and Cygwin), reported by Pietro Cerutti check-in: c650249c user: jan.nijtmans tags: trunk | |
2014-01-23
| ||
22:39 | Put -lfontconfig in XFT_LIBS, not XLIBSW flag check-in: ef49212b user: jan.nijtmans tags: trunk | |
22:38 | Put -lfontconfig in XFT_LIBS, not XLIBSW flag check-in: 1cfbc4ba user: jan.nijtmans tags: core-8-5-branch | |
22:27 | Fix [3606644]: Static build misses fontconfig check-in: 320dbce6 user: jan.nijtmans tags: trunk | |
Changes
Changes to unix/configure.
︙ | ︙ | |||
10519 10520 10521 10522 10523 10524 10525 | conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_fontconfig_FcFontSort" >&5 echo "${ECHO_T}$ac_cv_lib_fontconfig_FcFontSort" >&6 if test $ac_cv_lib_fontconfig_FcFontSort = yes; then | | | 10519 10520 10521 10522 10523 10524 10525 10526 10527 10528 10529 10530 10531 10532 10533 | conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_fontconfig_FcFontSort" >&5 echo "${ECHO_T}$ac_cv_lib_fontconfig_FcFontSort" >&6 if test $ac_cv_lib_fontconfig_FcFontSort = yes; then XFT_LIBS="$XFT_LIBS -lfontconfig" fi CFLAGS=$tk_oldCFlags LIBS=$tk_oldLibs fi if test "$found_xft" = "no" ; then |
︙ | ︙ |
Changes to unix/configure.in.
︙ | ︙ | |||
516 517 518 519 520 521 522 | dnl make sure that linking against fontconfig libraries finds Fc* symbols if test "$found_xft" = "yes" ; then tk_oldCFlags=$CFLAGS CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS" tk_oldLibs=$LIBS LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW -lfontconfig" AC_CHECK_LIB(fontconfig, FcFontSort, [ | | | 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 | dnl make sure that linking against fontconfig libraries finds Fc* symbols if test "$found_xft" = "yes" ; then tk_oldCFlags=$CFLAGS CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS" tk_oldLibs=$LIBS LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW -lfontconfig" AC_CHECK_LIB(fontconfig, FcFontSort, [ XFT_LIBS="$XFT_LIBS -lfontconfig" ], []) CFLAGS=$tk_oldCFlags LIBS=$tk_oldLibs fi dnl print a warning if xft is unusable and was specifically requested if test "$found_xft" = "no" ; then if test "$enable_xft" = "yes" ; then |
︙ | ︙ |