[Fontconfig] fontconfig: Branch 'master'

Akira TAGOH tagoh at kemper.freedesktop.org
Thu Jan 31 18:43:27 PST 2013


 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c1d9588890798e389d0f0ba633b704dee1ea8bf5
Author: Colin Walters <walters at verbum.org>
Date:   Thu Jan 31 21:32:46 2013 -0500

    build: Only use PKG_INSTALLDIR if available
    
    It's only in pkg-config 0.27 or newer, but 0.25 at least is still
    fairly widespread.

diff --git a/configure.ac b/configure.ac
index d7e4ed1..4996b79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,7 @@ AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 AC_PROG_MAKE_SET
 PKG_PROG_PKG_CONFIG
-PKG_INSTALLDIR
+m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], AC_SUBST([pkgconfigdir], ${libdir}/pkgconfig))
 
 AC_MSG_CHECKING([for RM macro])
 _predefined_rm=`make -p -f /dev/null 2>/dev/null|grep '^RM ='|sed -e 's/^RM = //'`


More information about the Fontconfig mailing list