diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-11-30 10:42:45 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-11-30 10:42:45 +0000 |
| commit | cdae43322cc315a65b9bee9f62b2e28934fefa6a (patch) | |
| tree | 18a8ae660cb1dc7d1136962b4e8dcbccad5b873d /Build/source/m4 | |
| parent | 156b1ea47fd003feee19afbb34c0e85e596b54dc (diff) | |
libs/harfbuzz: Added for future XeTeX
git-svn-id: svn://tug.org/texlive/trunk@28390 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
| -rw-r--r-- | Build/source/m4/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/m4/kpse-harfbuzz-flags.m4 | 42 | ||||
| -rw-r--r-- | Build/source/m4/kpse-pkgs.m4 | 2 |
3 files changed, 50 insertions, 0 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index 17dd40b6761..95b02c04a49 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,9 @@ +2012-11-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + Add libs/harfbuzz for future XeTeX. + * kpse-harfbuzz-flags.m4: New file. + * kpse-pkgs.m4: Add the new library. + 2012-11-28 Peter Breitenlohner <peb@mppmu.mpg.de> Add libs/pixman and libs/cairo for future MetaPost. diff --git a/Build/source/m4/kpse-harfbuzz-flags.m4 b/Build/source/m4/kpse-harfbuzz-flags.m4 new file mode 100644 index 00000000000..e8fb50d0b1e --- /dev/null +++ b/Build/source/m4/kpse-harfbuzz-flags.m4 @@ -0,0 +1,42 @@ +# 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_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. +AC_DEFUN([KPSE_HARFBUZZ_FLAGS], +[AC_REQUIRE([KPSE_FREETYPE2_FLAGS])[]dnl +AC_REQUIRE([KPSE_ICU_FLAGS])[]dnl +_KPSE_LIB_FLAGS([harfbuzz], [harfbuzz], [], + [-IBLD/libs/harfbuzz/include], [BLD/libs/harfbuzz/libharfbuzz.a], [], + [], [${top_builddir}/../../libs/harfbuzz/include/hb.h])[]dnl +]) # KPSE_HARFBUZZ_FLAGS + +# KPSE_HARFBUZZ_OPTIONS([WITH-SYSTEM]) +# ---------------------------------- +AC_DEFUN([KPSE_HARFBUZZ_OPTIONS], +[m4_ifval([$1], + [AC_ARG_WITH([system-harfbuzz], + AS_HELP_STRING([--with-system-harfbuzz], + [use installed harfbuzz headers and library + (requires pkg-config)]))])[]dnl +]) # 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 + HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz --cflags` + HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz --libs` +elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then + AC_MSG_ERROR([did not find harfbuzz]) +fi +]) # KPSE_HARFBUZZ_SYSTEM_FLAGS diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4 index 292f4a10e5a..fb82346f5ad 100644 --- a/Build/source/m4/kpse-pkgs.m4 +++ b/Build/source/m4/kpse-pkgs.m4 @@ -24,6 +24,7 @@ AC_DEFUN([KPSE_LIBS_PKGS], [dnl generic libraries 'libs/*' m4_define([kpse_libs_pkgs], [ +harfbuzz icu teckit graphite @@ -67,6 +68,7 @@ AC_REQUIRE([KPSE_ZZIPLIB_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_GRAPHITE_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_TECKIT_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_ICU_SYSTEM_FLAGS])[]dnl +AC_REQUIRE([KPSE_HARFBUZZ_SYSTEM_FLAGS])[]dnl ]) # KPSE_ALL_SYSTEM_FLAGS # KPSE_UTILS_PKGS() |