shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Add configure support for HarfBuzz.

* builds/unix/pkg.m4: New file.
* builds/unix/configure.raw: Search for libharfbuzz using
`pkg-config'.
Add `--without-harfbuzz' option.
* builds/unix/freetype-config.in, builds/unix/freetype2.in,
builds/unix/unix-def.in (freetype-config, freetype2.pc): Handle
HarfBuzz.

* docs/INSTALL.UNIX: Document interdependency of Freetype with
HarfBuzz.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,18 @@

+2014-03-01  Werner Lemberg  <[email protected]>

+

+	Add configure support for HarfBuzz.

+

+	* builds/unix/pkg.m4: New file.

+	* builds/unix/configure.raw: Search for libharfbuzz using

+	`pkg-config'.

+	Add `--without-harfbuzz' option.

+	* builds/unix/freetype-config.in, builds/unix/freetype2.in,

+	builds/unix/unix-def.in (freetype-config, freetype2.pc): Handle

+	HarfBuzz.

+

+	* docs/INSTALL.UNIX: Document interdependency of Freetype with

+	HarfBuzz.

+

 2014-02-28  Alexei Podtelezhnikov  <[email protected]>

 	[cff] Math simplifications.

--- a/builds/unix/configure.raw

+++ b/builds/unix/configure.raw

@@ -34,7 +34,9 @@

 AC_PROG_CPP

 AC_SUBST(EXEEXT)

+PKG_PROG_PKG_CONFIG([0.24])

+

 # checks for native programs to generate building tool

 if test ${cross_compiling} = yes; then

@@ -325,6 +327,24 @@

 fi

+# check for system libharfbuzz

+

+HAVE_HARFBUZZ=no

+AC_ARG_WITH([harfbuzz],

+  AS_HELP_STRING([--without-harfbuzz],

+                 [do not use improved auto-hinting of OpenType fonts]))

+if test x$with_harfbuzz != xno; then

+  HARFBUZZ_PKG="harfbuzz >= 0.9.19"

+  # as a side effect, this call sets and creates output variables

+  # HARFBUZZ_CFLAGS and HARFBUZZ_LIBS

+  PKG_CHECK_MODULES([HARFBUZZ], [$HARFBUZZ_PKG])

+  # directly create and set output variable LIBHARFBUZZ

+  _PKG_CONFIG([LIBHARFBUZZ], [libs-only-l], [$HARFBUZZ_PKG])

+  HAVE_LIBHARFBUZZ=yes

+  AC_MSG_RESULT([$HARFBUZZ_LIBS])

+fi

+

+

 # Some options handling SDKs/archs in CFLAGS should be copied

 # to LDFLAGS. Apple TechNote 2137 recommends to include these

 # options in CFLAGS but not in LDFLAGS.

@@ -742,9 +762,12 @@

 AC_SUBST([LIBZ])

 AC_SUBST([LIBBZ2])

 AC_SUBST([LIBPNG])

+# LIBHARFBUZZ has already been substituted above

 AC_SUBST([FT2_EXTRA_LIBS])

 AC_SUBST([SYSTEM_ZLIB])

+AC_SUBST([HARFBUZZ_PKG])

+

 LT_INIT(win32-dll)

 AC_SUBST([hardcode_libdir_flag_spec])

@@ -765,6 +788,10 @@

 if test x$HAVE_LIBPNG = xyes; then

   CFLAGS="$CFLAGS $LIBPNG_CFLAGS -DFT_CONFIG_OPTION_USE_PNG"

   LDFLAGS="$LDFLAGS $LIBPNG_LDFLAGS"

+fi

+if test x$HAVE_LIBHARFBUZZ = xyes; then

+  CFLAGS="$CFLAGS $HARFBUZZ_CFLAGS -DFT_CONFIG_OPTION_USE_HARFBUZZ"

+  LDFLAGS="$LDFLAGS $HARFBUZZ_LIBS"

 fi

 AC_SUBST([CFLAGS])

--- a/builds/unix/freetype-config.in

+++ b/builds/unix/freetype-config.in

@@ -1,6 +1,6 @@

 #! /bin/sh

 #

-# Copyright 2000-2005, 2008, 2009, 2013 by

+# Copyright 2000-2005, 2008, 2009, 2013, 2014 by

 # David Turner, Robert Wilhelm, and Werner Lemberg.

 #

 # This file is part of the FreeType project, and may only be used, modified,

@@ -137,7 +137,7 @@

 fi

 if test "$echo_libs" = "yes" ; then

-  libs="-lfreetype %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%"

+  libs="-lfreetype %LIBZ% %LIBBZ2% %LIBPNG% %LIBHARFBUZZ% %FT2_EXTRA_LIBS%"

   if test "${SYSROOT}$libdir" != "/usr/lib"  &&

      test "${SYSROOT}$libdir" != "/usr/lib64"; then

     echo -L${SYSROOT}$libdir $libs

--- a/builds/unix/freetype2.in

+++ b/builds/unix/freetype2.in

@@ -7,6 +7,7 @@

 Description: A free, high-quality, and portable font engine.

 Version: %ft_version%

 Requires:

+Requires.private: %HARFBUZZ_PKG%

 Libs: -L${libdir} -lfreetype

 Libs.private: %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%

 Cflags: -I${includedir}

--- /dev/null

+++ b/builds/unix/pkg.m4

@@ -1,0 +1,199 @@

+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-

+# serial 1 (pkg-config-0.24)

+# 

+# Copyright © 2004 Scott James Remnant <[email protected]>.

+#

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful, but

+# WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+# General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program; if not, write to the Free Software

+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

+#

+# As a special exception to the GNU General Public License, if you

+# distribute this file as part of a program that contains a

+# configuration script generated by Autoconf, you may include it under

+# the same distribution terms that you use for the rest of that program.

+

+# PKG_PROG_PKG_CONFIG([MIN-VERSION])

+# ----------------------------------

+AC_DEFUN([PKG_PROG_PKG_CONFIG],

+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])

+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])

+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])

+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])

+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])

+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])

+

+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then

+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])

+fi

+if test -n "$PKG_CONFIG"; then

+	_pkg_min_version=m4_default([$1], [0.9.0])

+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])

+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then

+		AC_MSG_RESULT([yes])

+	else

+		AC_MSG_RESULT([no])

+		PKG_CONFIG=""

+	fi

+fi[]dnl

+])# PKG_PROG_PKG_CONFIG

+

+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])

+#

+# Check to see whether a particular set of modules exists.  Similar

+# to PKG_CHECK_MODULES(), but does not set variables or print errors.

+#

+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])

+# only at the first occurence in configure.ac, so if the first place

+# it's called might be skipped (such as if it is within an "if", you

+# have to call PKG_CHECK_EXISTS manually

+# --------------------------------------------------------------

+AC_DEFUN([PKG_CHECK_EXISTS],

+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl

+if test -n "$PKG_CONFIG" && \

+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then

+  m4_default([$2], [:])

+m4_ifvaln([$3], [else

+  $3])dnl

+fi])

+

+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])

+# ---------------------------------------------

+m4_define([_PKG_CONFIG],

+[if test -n "$$1"; then

+    pkg_cv_[]$1="$$1"

+ elif test -n "$PKG_CONFIG"; then

+    PKG_CHECK_EXISTS([$3],

+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`

+		      test "x$?" != "x0" && pkg_failed=yes ],

+		     [pkg_failed=yes])

+ else

+    pkg_failed=untried

+fi[]dnl

+])# _PKG_CONFIG

+

+# _PKG_SHORT_ERRORS_SUPPORTED

+# -----------------------------

+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],

+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])

+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

+        _pkg_short_errors_supported=yes

+else

+        _pkg_short_errors_supported=no

+fi[]dnl

+])# _PKG_SHORT_ERRORS_SUPPORTED

+

+

+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],

+# [ACTION-IF-NOT-FOUND])

+#

+#

+# Note that if there is a possibility the first call to

+# PKG_CHECK_MODULES might not happen, you should be sure to include an

+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac

+#

+#

+# --------------------------------------------------------------

+AC_DEFUN([PKG_CHECK_MODULES],

+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl

+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl

+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl

+

+pkg_failed=no

+AC_MSG_CHECKING([for $1])

+

+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])

+_PKG_CONFIG([$1][_LIBS], [libs], [$2])

+

+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS

+and $1[]_LIBS to avoid the need to call pkg-config.

+See the pkg-config man page for more details.])

+

+if test $pkg_failed = yes; then

+   	AC_MSG_RESULT([no])

+        _PKG_SHORT_ERRORS_SUPPORTED

+        if test $_pkg_short_errors_supported = yes; then

+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`

+        else 

+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`

+        fi

+	# Put the nasty error message in config.log where it belongs

+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD

+

+	m4_default([$4], [AC_MSG_ERROR(

+[Package requirements ($2) were not met:

+

+$$1_PKG_ERRORS

+

+Consider adjusting the PKG_CONFIG_PATH environment variable if you

+installed software in a non-standard prefix.

+

+_PKG_TEXT])[]dnl

+        ])

+elif test $pkg_failed = untried; then

+     	AC_MSG_RESULT([no])

+	m4_default([$4], [AC_MSG_FAILURE(

+[The pkg-config script could not be found or is too old.  Make sure it

+is in your PATH or set the PKG_CONFIG environment variable to the full

+path to pkg-config.

+

+_PKG_TEXT

+

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl

+        ])

+else

+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS

+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS

+        AC_MSG_RESULT([yes])

+	$3

+fi[]dnl

+])# PKG_CHECK_MODULES

+

+

+# PKG_INSTALLDIR(DIRECTORY)

+# -------------------------

+# Substitutes the variable pkgconfigdir as the location where a module

+# should install pkg-config .pc files. By default the directory is

+# $libdir/pkgconfig, but the default can be changed by passing

+# DIRECTORY. The user can override through the --with-pkgconfigdir

+# parameter.

+AC_DEFUN([PKG_INSTALLDIR],

+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])

+m4_pushdef([pkg_description],

+    [pkg-config installation directory @<:@]pkg_default[@:>@])

+AC_ARG_WITH([pkgconfigdir],

+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,

+    [with_pkgconfigdir=]pkg_default)

+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])

+m4_popdef([pkg_default])

+m4_popdef([pkg_description])

+]) dnl PKG_INSTALLDIR

+

+

+# PKG_NOARCH_INSTALLDIR(DIRECTORY)

+# -------------------------

+# Substitutes the variable noarch_pkgconfigdir as the location where a

+# module should install arch-independent pkg-config .pc files. By

+# default the directory is $datadir/pkgconfig, but the default can be

+# changed by passing DIRECTORY. The user can override through the

+# --with-noarch-pkgconfigdir parameter.

+AC_DEFUN([PKG_NOARCH_INSTALLDIR],

+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])

+m4_pushdef([pkg_description],

+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])

+AC_ARG_WITH([noarch-pkgconfigdir],

+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,

+    [with_noarch_pkgconfigdir=]pkg_default)

+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])

+m4_popdef([pkg_default])

+m4_popdef([pkg_description])

+]) dnl PKG_NOARCH_INSTALLDIR

--- a/builds/unix/unix-def.in

+++ b/builds/unix/unix-def.in

@@ -66,8 +66,10 @@

 LIBBZ2             := @LIBBZ2@

 LIBZ               := @LIBZ@

 LIBPNG             := @LIBPNG@

+LIBHARFBUZZ        := @LIBHARFBUZZ@

 build_libtool_libs := @build_libtool_libs@

 ft_version         := @ft_version@

+HARFBUZZ_PKG       := @HARFBUZZ_PKG@

 # The directory where all library files are placed.

 #

@@ -106,6 +108,7 @@

 	    -e 's|%LIBBZ2%|$(LIBBZ2)|' \

 	    -e 's|%LIBZ%|$(LIBZ)|' \

 	    -e 's|%LIBPNG%|$(LIBPNG)|' \

+	    -e 's|%LIBHARFBUZZ%|$(LIBHARFBUZZ)|' \

 	    -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \

 	    -e 's|%exec_prefix%|$(exec_prefix)|' \

 	    -e 's|%ft_version%|$(ft_version)|' \

@@ -124,6 +127,7 @@

 	    -e 's|%LIBBZ2%|$(LIBBZ2)|' \

 	    -e 's|%LIBZ%|$(LIBZ)|' \

 	    -e 's|%LIBPNG%|$(LIBPNG)|' \

+	    -e 's|%HARFBUZZ_PKG%|$(HARFBUZZ_PKG)|' \

 	    -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \

 	    -e 's|%exec_prefix%|$(exec_prefix)|' \

 	    -e 's|%ft_version%|$(ft_version)|' \

--- a/docs/INSTALL.UNIX

+++ b/docs/INSTALL.UNIX

@@ -81,9 +81,27 @@

       make

       make install

+

+  3.1 Interdependency with HarfBuzz

+  .................................

+

+    Note that there  is a chicken-and-egg problem  currently since the

+    HarfBuzz library  (used by the  auto-hinter to improve  support of

+    OpenType  fonts)  depends on  FreeType,  which  can be  solved  as

+    follows in case HarfBuzz is not yet installed on your system.

+

+    1. Call     FreeType's     configure    script     with     option

+       `--without-harfbuzz', then compile and install FreeType.

+

+    2. Compile and install HarfBuzz.

+

+    3. Call    FreeType's    configure     script    without    option

+       `--without-harfbuzz', then compile and install FreeType again.

+

+

 ----------------------------------------------------------------------

-Copyright 2003-2007, 2013 by

+Copyright 2003-2007, 2013, 2014 by

 David Turner, Robert Wilhelm, and Werner Lemberg.

 This  file is  part of  the FreeType  project, and  may only  be used,