diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-09-28 08:30:51 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-09-28 08:30:51 +0000 |
commit | 5dda0181091688ae7ceac1836091eb72572325a6 (patch) | |
tree | 16bb4da7933f4c77c232e1a1f24e23dd5f10e3f2 /Build/source/libs/harfbuzz/harfbuzz-src/configure.ac | |
parent | 979d4357e205dcc00d676beccd40b25ccd226e3f (diff) |
harfbuzz 1.3.2
git-svn-id: svn://tug.org/texlive/trunk@42170 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/configure.ac')
-rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-src/configure.ac | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac index ea6fc27cb9c..57e9e6db67f 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac +++ b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.64]) AC_INIT([HarfBuzz], - [1.3.1], + [1.3.2], [https://github.com/behdad/harfbuzz/issues/new], [harfbuzz], [http://harfbuzz.org/]) @@ -307,6 +307,16 @@ GRAPHITE2_DEPS="graphite2" AC_SUBST(GRAPHITE2_DEPS) if test "x$with_graphite2" = "xyes" -o "x$with_graphite2" = "xauto"; then PKG_CHECK_MODULES(GRAPHITE2, $GRAPHITE2_DEPS, have_graphite2=true, :) + if test "x$have_graphite2" != "xtrue"; then + # If pkg-config is not available, graphite2 can still be there + ac_save_CFLAGS="$CFLAGS" + ac_save_CPPFLAGS="$CPPFLAGS" + CFLAGS="$CFLAGS $GRAPHITE2_CFLAGS" + CPPFLAGS="$CPPFLAGS $GRAPHITE2_CFLAGS" + AC_CHECK_HEADER(graphite2/Segment.h, have_graphite2=true, :) + CPPFLAGS="$ac_save_CPPFLAGS" + CFLAGS="$ac_save_CFLAGS" + fi fi if test "x$with_graphite2" = "xyes" -a "x$have_graphite2" != "xtrue"; then AC_MSG_ERROR([graphite2 support requested but libgraphite2 not found]) |