walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct fontconfig.pc to add certain dependencies for build

This commit is contained in:
Akira TAGOH 2013-07-12 12:39:36 +09:00
parent 04bd904632
commit 7274f6e37a
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
configure.ac
View File

@ -54,6 +54,10 @@ AC_SUBST(LIBT_VERSION_INFO)
LIBT_CURRENT_MINUS_AGE=`expr $LIBT_CURRENT - $LIBT_AGE` LIBT_CURRENT_MINUS_AGE=`expr $LIBT_CURRENT - $LIBT_AGE`
AC_SUBST(LIBT_CURRENT_MINUS_AGE) AC_SUBST(LIBT_CURRENT_MINUS_AGE)
PKGCONFIG_REQUIRES=
PKGCONFIG_CFLAGS=
PKGCONFIG_LIBS=
dnl ========================================================================== dnl ==========================================================================
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)
@ -282,13 +286,16 @@ if test "x$enable_iconv" != "xno"; then
AC_TRY_LINK([#include <iconv.h>], AC_TRY_LINK([#include <iconv.h>],
[iconv_open ("from", "to");], [iconv_open ("from", "to");],
[iconv_type="libiconv" [iconv_type="libiconv"
use_iconv=1], use_iconv=1
ICONV_CFLAGS="$libiconv_cflags"
ICONV_LIBS="$libiconv_libs"
PKGCONFIG_CFLAGS="$PKGCONFIG_CFLAGS $ICONV_CFLAGS"
PKGCONFIG_LIBS="$PKGCONFIG_LIBS $ICONV_LIBS"
],
[use_iconv=0]) [use_iconv=0])
CFLAGS="$iconvsaved_CFLAGS" CFLAGS="$iconvsaved_CFLAGS"
LIBS="$iconvsaved_LIBS" LIBS="$iconvsaved_LIBS"
ICONV_CFLAGS="$libiconv_cflags"
ICONV_LIBS="$libiconv_libs"
fi fi
if test "x$use_iconv" = "x0"; then if test "x$use_iconv" = "x0"; then
AC_TRY_LINK([#include <iconv.h>], AC_TRY_LINK([#include <iconv.h>],
@ -308,6 +315,7 @@ AC_DEFINE_UNQUOTED(USE_ICONV,$use_iconv,[Use iconv.])
# Checks for FreeType # Checks for FreeType
# #
PKG_CHECK_MODULES(FREETYPE, freetype2) PKG_CHECK_MODULES(FREETYPE, freetype2)
PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES freetype2"
AC_SUBST(FREETYPE_LIBS) AC_SUBST(FREETYPE_LIBS)
AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_CFLAGS)
@ -367,6 +375,10 @@ if test "$enable_libxml2" != "yes"; then
else else
EXPAT_LIBS="-lexpat" EXPAT_LIBS="-lexpat"
fi fi
PKGCONFIG_CFLAGS="$PKGCONFIG_CFLAGS $EXPAT_CFLAGS"
PKGCONFIG_LIBS="$PKGCONFIG_LIBS $EXPAT_LIBS"
else
PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES expat"
fi fi
expatsaved_CPPFLAGS="$CPPFLAGS" expatsaved_CPPFLAGS="$CPPFLAGS"
@ -408,6 +420,7 @@ AC_ARG_ENABLE(libxml2,
if test "$enable_libxml2" = "yes"; then if test "$enable_libxml2" = "yes"; then
PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6]) PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6])
PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES libxml-2.0"
AC_DEFINE_UNQUOTED(ENABLE_LIBXML2,1,[Use libxml2 instead of Expat]) AC_DEFINE_UNQUOTED(ENABLE_LIBXML2,1,[Use libxml2 instead of Expat])
AC_SUBST(LIBXML2_CFLAGS) AC_SUBST(LIBXML2_CFLAGS)
@ -715,6 +728,13 @@ dnl include the header file for workaround of miscalculating size on autoconf
dnl particularly for fat binaries dnl particularly for fat binaries
AH_BOTTOM([#include "config-fixups.h"]) AH_BOTTOM([#include "config-fixups.h"])
dnl
dnl
AC_SUBST(PKGCONFIG_REQUIRES)
AC_SUBST(PKGCONFIG_CFLAGS)
AC_SUBST(PKGCONFIG_LIBS)
dnl
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
fontconfig/Makefile fontconfig/Makefile

7
fontconfig.pc.in
View File

@ -11,6 +11,7 @@ cachedir=@fc_cachedir@
Name: Fontconfig Name: Fontconfig
Description: Font configuration and customization library Description: Font configuration and customization library
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lfontconfig Requires: @PKGCONFIG_REQUIRES@
Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ Libs: -L${libdir} -lfontconfig @PKGCONFIG_LIBS@
Cflags: -I${includedir} Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@ @LIBXML2_LIBS@
Cflags: -I${includedir} @PKGCONFIG_CFLAGS@