4 files changed, 56 insertions, 4 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 95b02c04a49..decbb863a13 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Add libs/graphite2 for future XeTeX.
+	* kpse-graphite2-flags.m4: New file.
+	* kpse-harfbuzz-flags.m4, kpse-pkgs.m4: Add the new library.
+
 2012-11-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Add libs/harfbuzz for future XeTeX.
diff --git a/Build/source/m4/kpse-graphite2-flags.m4 b/Build/source/m4/kpse-graphite2-flags.m4
new file mode 100644
index 00000000000..d408dfd4d6c
--- /dev/null
+++ b/Build/source/m4/kpse-graphite2-flags.m4
@@ -0,0 +1,43 @@
+# Public macros for the TeX Live (TL) tree.
+# Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# KPSE_GRAPHITE2_FLAGS
+# --------------------
+# Provide the configure options '--with-system-graphite2' (if in the TL tree).
+#
+# Set the make variables GRAPHITE2_INCLUDES and GRAPHITE2_LIBS to the CPPFLAGS and
+# LIBS required for the `-lgraphite2' library in libs/graphite2/ of the TL tree.
+AC_DEFUN([KPSE_GRAPHITE2_FLAGS],
+[AC_REQUIRE([KPSE_FREETYPE2_FLAGS])[]dnl
+AC_REQUIRE([KPSE_ICU_FLAGS])[]dnl
+_KPSE_LIB_FLAGS([graphite2], [graphite2], [],
+                [-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC],
+                [BLD/libs/graphite2/libgraphite2.a], [],
+                [], [${top_builddir}/../../libs/graphite2/include/graphite2/Font.h])[]dnl
+]) # KPSE_GRAPHITE2_FLAGS
+
+# KPSE_GRAPHITE2_OPTIONS([WITH-SYSTEM])
+# -------------------------------------
+AC_DEFUN([KPSE_GRAPHITE2_OPTIONS],
+[m4_ifval([$1],
+          [AC_ARG_WITH([system-graphite2],
+                       AS_HELP_STRING([--with-system-graphite2],
+                                      [use installed graphite2 headers and library
+                                       (requires pkg-config)]))])[]dnl
+]) # KPSE_GRAPHITE2_OPTIONS
+
+# KPSE_GRAPHITE2_SYSTEM_FLAGS
+# ---------------------------
+AC_DEFUN([KPSE_GRAPHITE2_SYSTEM_FLAGS],
+[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
+if $PKG_CONFIG graphite2; then
+  GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags`
+  GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs`
+elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then
+  AC_MSG_ERROR([did not find graphite2])
+fi
+]) # KPSE_GRAPHITE2_SYSTEM_FLAGS
diff --git a/Build/source/m4/kpse-harfbuzz-flags.m4 b/Build/source/m4/kpse-harfbuzz-flags.m4
index e8fb50d0b1e..a6026fec163 100644
--- a/Build/source/m4/kpse-harfbuzz-flags.m4
+++ b/Build/source/m4/kpse-harfbuzz-flags.m4
@@ -6,13 +6,14 @@
 # with or without modifications, as long as this notice is preserved.
 
 # KPSE_HARFBUZZ_FLAGS
-# -----------------
+# -------------------
 # Provide the configure options '--with-system-harfbuzz' (if in the TL tree).
 #
 # Set the make variables HARFBUZZ_INCLUDES and HARFBUZZ_LIBS to the CPPFLAGS and
-# LIBS required for the `-lpng' library in libs/harfbuzz/ of the TL tree.
+# LIBS required for the `-lharfbuzz' library in libs/harfbuzz/ of the TL tree.
 AC_DEFUN([KPSE_HARFBUZZ_FLAGS],
 [AC_REQUIRE([KPSE_FREETYPE2_FLAGS])[]dnl
+AC_REQUIRE([KPSE_GRAPHITE2_FLAGS])[]dnl
 AC_REQUIRE([KPSE_ICU_FLAGS])[]dnl
 _KPSE_LIB_FLAGS([harfbuzz], [harfbuzz], [],
                 [-IBLD/libs/harfbuzz/include], [BLD/libs/harfbuzz/libharfbuzz.a], [],
@@ -20,7 +21,7 @@ _KPSE_LIB_FLAGS([harfbuzz], [harfbuzz], [],
 ]) # KPSE_HARFBUZZ_FLAGS
 
 # KPSE_HARFBUZZ_OPTIONS([WITH-SYSTEM])
-# ----------------------------------
+# ------------------------------------
 AC_DEFUN([KPSE_HARFBUZZ_OPTIONS],
 [m4_ifval([$1],
           [AC_ARG_WITH([system-harfbuzz],
@@ -30,7 +31,7 @@ AC_DEFUN([KPSE_HARFBUZZ_OPTIONS],
 ]) # KPSE_HARFBUZZ_OPTIONS
 
 # KPSE_HARFBUZZ_SYSTEM_FLAGS
-# ------------------------
+# --------------------------
 AC_DEFUN([KPSE_HARFBUZZ_SYSTEM_FLAGS],
 [AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
 if $PKG_CONFIG harfbuzz; then
diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4
index fb82346f5ad..bbea923cc33 100644
--- a/Build/source/m4/kpse-pkgs.m4
+++ b/Build/source/m4/kpse-pkgs.m4
@@ -27,6 +27,7 @@ m4_define([kpse_libs_pkgs], [
 harfbuzz
 icu
 teckit
+graphite2
 graphite
 zziplib
 xpdf
@@ -66,6 +67,7 @@ AC_REQUIRE([KPSE_XPDF_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_POPPLER_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_ZZIPLIB_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_GRAPHITE_SYSTEM_FLAGS])[]dnl
+AC_REQUIRE([KPSE_GRAPHITE2_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_TECKIT_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_ICU_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_HARFBUZZ_SYSTEM_FLAGS])[]dnl