diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-12-04 13:11:31 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-12-04 13:11:31 +0000 |
commit | e820095ca870b45b0ce42d073f9eae53739b359c (patch) | |
tree | c1d334acc7439188c47976decd9788f38e11f98b /Build/source/libs/harfbuzz | |
parent | e42ad852910fa40560d1ee5b20dac7de0583a076 (diff) |
libs/graphite2: Added for future XeTeX
git-svn-id: svn://tug.org/texlive/trunk@28442 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz')
-rw-r--r-- | Build/source/libs/harfbuzz/Makefile.am | 8 | ||||
-rw-r--r-- | Build/source/libs/harfbuzz/Makefile.in | 31 | ||||
-rw-r--r-- | Build/source/libs/harfbuzz/ac/withenable.ac | 2 | ||||
-rw-r--r-- | Build/source/libs/harfbuzz/aclocal.m4 | 1 | ||||
-rwxr-xr-x | Build/source/libs/harfbuzz/configure | 156 | ||||
-rw-r--r-- | Build/source/libs/harfbuzz/configure.ac | 5 | ||||
-rw-r--r-- | Build/source/libs/harfbuzz/include/Makefile.in | 5 |
7 files changed, 193 insertions, 15 deletions
diff --git a/Build/source/libs/harfbuzz/Makefile.am b/Build/source/libs/harfbuzz/Makefile.am index f2a6173732c..1e6bda6f792 100644 --- a/Build/source/libs/harfbuzz/Makefile.am +++ b/Build/source/libs/harfbuzz/Makefile.am @@ -104,9 +104,9 @@ libharfbuzz_dependencies += $(ICU_DEPEND) libharfbuzz_a_SOURCES += $(HARFBUZZ_SRC)/hb-icu.cc ## Graphite library -## not yet AM_CPPFLAGS += $(GRAPHITE2_INCLUDES) -## not yet libharfbuzz_dependencies += $(GRAPHITE2_DEPEND) -## not yet libharfbuzz_a_SOURCES += $(HARFBUZZ_SRC)/hb-graphite2.cc +AM_CPPFLAGS += $(GRAPHITE2_INCLUDES) +libharfbuzz_dependencies += $(GRAPHITE2_DEPEND) +libharfbuzz_a_SOURCES += $(HARFBUZZ_SRC)/hb-graphite2.cc ## FreeType 2 library AM_CPPFLAGS += $(FREETYPE2_INCLUDES) @@ -124,7 +124,7 @@ DISTCLEANFILES = config.force ## Rebuild libsicuxxx @ICU_RULE@ ## Rebuild libgraphite2 -## not yet @GRAPHITE2_RULE@ +@GRAPHITE2_RULE@ ## Rebuild libfreetype @FREETYPE2_RULE@ diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in index b445c8429bf..eee42928b2f 100644 --- a/Build/source/libs/harfbuzz/Makefile.in +++ b/Build/source/libs/harfbuzz/Makefile.in @@ -67,6 +67,7 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ + $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ $(top_srcdir)/../../m4/kpse-lib-version.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ @@ -100,7 +101,7 @@ am_libharfbuzz_a_OBJECTS = hb-blob.$(OBJEXT) hb-buffer.$(OBJEXT) \ hb-ot-shape-complex-indic.$(OBJEXT) \ hb-ot-shape-complex-thai.$(OBJEXT) \ hb-ot-shape-normalize.$(OBJEXT) hb-ot-shape-fallback.$(OBJEXT) \ - hb-icu.$(OBJEXT) hb-ft.$(OBJEXT) + hb-icu.$(OBJEXT) hb-graphite2.$(OBJEXT) hb-ft.$(OBJEXT) libharfbuzz_a_OBJECTS = $(am_libharfbuzz_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp @@ -221,6 +222,9 @@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ FT2_CONFIG = @FT2_CONFIG@ +GRAPHITE2_DEPEND = @GRAPHITE2_DEPEND@ +GRAPHITE2_INCLUDES = @GRAPHITE2_INCLUDES@ +GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ GREP = @GREP@ HARFBUZZ_TREE = @HARFBUZZ_TREE@ HB_VERSION = @HB_VERSION@ @@ -262,6 +266,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -332,8 +337,9 @@ HARFBUZZ_SRC = $(HARFBUZZ_TREE)/src SUBDIRS = . include noinst_LIBRARIES = libharfbuzz.a AM_CPPFLAGS = -DHB_NO_MT -I$(top_srcdir)/$(HARFBUZZ_SRC) \ - $(ICU_INCLUDES) $(FREETYPE2_INCLUDES) -libharfbuzz_dependencies = $(ICU_DEPEND) $(FREETYPE2_DEPEND) + $(ICU_INCLUDES) $(GRAPHITE2_INCLUDES) $(FREETYPE2_INCLUDES) +libharfbuzz_dependencies = $(ICU_DEPEND) $(GRAPHITE2_DEPEND) \ + $(FREETYPE2_DEPEND) libharfbuzz_a_SOURCES = $(HARFBUZZ_SRC)/hb-atomic-private.hh \ $(HARFBUZZ_SRC)/hb-blob.cc \ $(HARFBUZZ_SRC)/hb-buffer-private.hh \ @@ -388,7 +394,8 @@ libharfbuzz_a_SOURCES = $(HARFBUZZ_SRC)/hb-atomic-private.hh \ $(HARFBUZZ_SRC)/hb-ot-shape-fallback-private.hh \ $(HARFBUZZ_SRC)/hb-ot-shape-fallback.cc \ $(HARFBUZZ_SRC)/hb-ot-shape-private.hh \ - $(HARFBUZZ_SRC)/hb-icu.cc $(HARFBUZZ_SRC)/hb-ft.cc + $(HARFBUZZ_SRC)/hb-icu.cc $(HARFBUZZ_SRC)/hb-graphite2.cc \ + $(HARFBUZZ_SRC)/hb-ft.cc DISTCLEANFILES = config.force LDADD = libharfbuzz.a all: config.h @@ -467,6 +474,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hb-fallback-shape.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hb-font.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hb-ft.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hb-graphite2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hb-icu.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hb-ot-layout.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hb-ot-map.Po@am__quote@ @@ -829,6 +837,20 @@ hb-icu.obj: $(HARFBUZZ_SRC)/hb-icu.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hb-icu.obj `if test -f '$(HARFBUZZ_SRC)/hb-icu.cc'; then $(CYGPATH_W) '$(HARFBUZZ_SRC)/hb-icu.cc'; else $(CYGPATH_W) '$(srcdir)/$(HARFBUZZ_SRC)/hb-icu.cc'; fi` +hb-graphite2.o: $(HARFBUZZ_SRC)/hb-graphite2.cc +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hb-graphite2.o -MD -MP -MF $(DEPDIR)/hb-graphite2.Tpo -c -o hb-graphite2.o `test -f '$(HARFBUZZ_SRC)/hb-graphite2.cc' || echo '$(srcdir)/'`$(HARFBUZZ_SRC)/hb-graphite2.cc +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/hb-graphite2.Tpo $(DEPDIR)/hb-graphite2.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(HARFBUZZ_SRC)/hb-graphite2.cc' object='hb-graphite2.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hb-graphite2.o `test -f '$(HARFBUZZ_SRC)/hb-graphite2.cc' || echo '$(srcdir)/'`$(HARFBUZZ_SRC)/hb-graphite2.cc + +hb-graphite2.obj: $(HARFBUZZ_SRC)/hb-graphite2.cc +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hb-graphite2.obj -MD -MP -MF $(DEPDIR)/hb-graphite2.Tpo -c -o hb-graphite2.obj `if test -f '$(HARFBUZZ_SRC)/hb-graphite2.cc'; then $(CYGPATH_W) '$(HARFBUZZ_SRC)/hb-graphite2.cc'; else $(CYGPATH_W) '$(srcdir)/$(HARFBUZZ_SRC)/hb-graphite2.cc'; fi` +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/hb-graphite2.Tpo $(DEPDIR)/hb-graphite2.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(HARFBUZZ_SRC)/hb-graphite2.cc' object='hb-graphite2.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hb-graphite2.obj `if test -f '$(HARFBUZZ_SRC)/hb-graphite2.cc'; then $(CYGPATH_W) '$(HARFBUZZ_SRC)/hb-graphite2.cc'; else $(CYGPATH_W) '$(srcdir)/$(HARFBUZZ_SRC)/hb-graphite2.cc'; fi` + hb-ft.o: $(HARFBUZZ_SRC)/hb-ft.cc @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hb-ft.o -MD -MP -MF $(DEPDIR)/hb-ft.Tpo -c -o hb-ft.o `test -f '$(HARFBUZZ_SRC)/hb-ft.cc' || echo '$(srcdir)/'`$(HARFBUZZ_SRC)/hb-ft.cc @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/hb-ft.Tpo $(DEPDIR)/hb-ft.Po @@ -1322,6 +1344,7 @@ config.force: $(libharfbuzz_dependencies) $(SHELL) ./config.status --recheck @ICU_RULE@ +@GRAPHITE2_RULE@ @FREETYPE2_RULE@ # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Build/source/libs/harfbuzz/ac/withenable.ac b/Build/source/libs/harfbuzz/ac/withenable.ac index 65c29274173..a1947932332 100644 --- a/Build/source/libs/harfbuzz/ac/withenable.ac +++ b/Build/source/libs/harfbuzz/ac/withenable.ac @@ -4,4 +4,4 @@ dnl Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for harfbuzz -KPSE_WITH_LIB([harfbuzz], [freetype2 icu]) +KPSE_WITH_LIB([harfbuzz], [freetype2 graphite2 icu]) diff --git a/Build/source/libs/harfbuzz/aclocal.m4 b/Build/source/libs/harfbuzz/aclocal.m4 index e1843aca7d7..bf019a0b867 100644 --- a/Build/source/libs/harfbuzz/aclocal.m4 +++ b/Build/source/libs/harfbuzz/aclocal.m4 @@ -982,6 +982,7 @@ AC_SUBST([am__untar]) m4_include([../../m4/kpse-common.m4]) m4_include([../../m4/kpse-freetype2-flags.m4]) +m4_include([../../m4/kpse-graphite2-flags.m4]) m4_include([../../m4/kpse-icu-flags.m4]) m4_include([../../m4/kpse-lib-version.m4]) m4_include([../../m4/kpse-warnings.m4]) diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure index 121ae5dc993..ac1e1cdd096 100755 --- a/Build/source/libs/harfbuzz/configure +++ b/Build/source/libs/harfbuzz/configure @@ -639,6 +639,11 @@ LIBOBJS HARFBUZZ_TREE build_FALSE build_TRUE +GRAPHITE2_RULE +GRAPHITE2_DEPEND +GRAPHITE2_LIBS +GRAPHITE2_INCLUDES +PKG_CONFIG ICU_RULE ICU_DEPEND ICU_LIBS @@ -795,6 +800,7 @@ with_zlib_includes with_zlib_libdir with_system_freetype2 with_system_icu +with_system_graphite2 ' ac_precious_vars='build_alias host_alias @@ -1460,6 +1466,8 @@ Optional Packages: (requires freetype-config) --with-system-icu use installed ICU headers and libraries (requires icu-config, not for XeTeX) + --with-system-graphite2 use installed graphite2 headers and library + (requires pkg-config) Some influential environment variables: CC C compiler command @@ -17202,6 +17210,148 @@ ${top_builddir}/../../libs/icu/include/unicode/uversion.h: cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PKG_CONFIG"; then + ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +PKG_CONFIG=$ac_cv_prog_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_PKG_CONFIG"; then + ac_ct_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_PKG_CONFIG"; then + ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG +if test -n "$ac_ct_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5 +$as_echo "$ac_ct_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_PKG_CONFIG" = x; then + PKG_CONFIG="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_ct_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" +fi + +## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags + +# Check whether --with-system-graphite2 was given. +if test "${with_system_graphite2+set}" = set; then : + withval=$with_system_graphite2; +fi +if test "x$with_system_graphite2" = xyes; then + 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 + as_fn_error $? "did not find graphite2" "$LINENO" 5 +fi +else + GRAPHITE2_INCLUDES="-I$kpse_BLD/libs/graphite2/include -DGRAPHITE2_STATIC" + GRAPHITE2_LIBS="$kpse_BLD/libs/graphite2/libgraphite2.a" + GRAPHITE2_DEPEND='${top_builddir}/../../libs/graphite2/libgraphite2.a' + GRAPHITE2_RULE='# Rebuild libgraphite2 +$(GRAPHITE2_DEPEND): ${top_builddir}/../../libs/graphite2/include/graphite2/Font.h + cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild +${top_builddir}/../../libs/graphite2/include/graphite2/Font.h: + cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' +fi + +## _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags + +# Check whether --with-system-icu was given. +if test "${with_system_icu+set}" = set; then : + withval=$with_system_icu; +fi +if test "x$with_system_icu" = xyes; then + if $ICU_CONFIG --version >/dev/null 2>&1; then + ICU_INCLUDES=`$ICU_CONFIG --cppflags` + # Work around bug in icu-config version 4.4 + ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath ` + ICU_LIBS="$ICU_LIBS `$ICU_CONFIG --ldflags-libsonly --ldflags-system`" +elif test "x$need_icu:$with_system_icu" = xyes:yes; then + as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5 +fi +else + ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include" + ICU_LIBS=" $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a" + ICU_DEPEND=' ${top_builddir}/../../libs/icu/icu-build/lib/libicuuc.a ${top_builddir}/../../libs/icu/icu-build/lib/libicudata.a' + ICU_RULE='# Rebuild libicuxxx +$(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h + cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild +${top_builddir}/../../libs/icu/include/unicode/uversion.h: + cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild' +fi + # Functions and headers for ac_func in atexit mprotect sysconf getpagesize sched_yield mmap _setmode isatty @@ -17272,6 +17422,9 @@ $as_echo "#define HAVE_OT 1" >>confdefs.h $as_echo "#define HAVE_ICU 1" >>confdefs.h +$as_echo "#define HAVE_GRAPHITE2 1" >>confdefs.h + + $as_echo "#define HAVE_FREETYPE 1" >>confdefs.h @@ -17306,9 +17459,6 @@ $as_echo "#define HAVE_CAIRO_FT 1" >>confdefs.h $as_echo "#define HAVE_ICU_LE 1" >>confdefs.h -$as_echo "#define HAVE_GRAPHITE2 1" >>confdefs.h - - $as_echo "#define HAVE_UNISCRIBE 1" >>confdefs.h diff --git a/Build/source/libs/harfbuzz/configure.ac b/Build/source/libs/harfbuzz/configure.ac index 62509da69ed..f700a67acca 100644 --- a/Build/source/libs/harfbuzz/configure.ac +++ b/Build/source/libs/harfbuzz/configure.ac @@ -32,7 +32,7 @@ KPSE_COMPILER_WARNINGS LT_INIT KPSE_FREETYPE2_FLAGS -dnl not yet KPSE_GRAPHITE2_FLAGS +KPSE_GRAPHITE2_FLAGS KPSE_ICU_FLAGS # Functions and headers @@ -55,7 +55,7 @@ fi if :; then AC_DEFINE([HAVE_OT], 1, [Use native OpenType Layout backend]) AC_DEFINE([HAVE_ICU], 1, [Use ICU library]) -dnl not yet AC_DEFINE([HAVE_GRAPHITE2], 1, [Use Graphite library]) + AC_DEFINE([HAVE_GRAPHITE2], 1, [Use Graphite library]) AC_DEFINE([HAVE_FREETYPE], 1, [Use FreeType 2 library]) AC_DEFINE([HAVE_FT_FACE_GETCHARVARIANTINDEX], 1, [Define to 1 if you have the `FT_Face_GetCharVariantIndex' function.]) @@ -70,7 +70,6 @@ dnl add all these to config.h.in but do not define them in config.h AC_DEFINE([HAVE_CAIRO], 1, [Use cairo graphics library]) AC_DEFINE([HAVE_CAIRO_FT], 1, [Use cairo-ft support in cairo graphics library]) AC_DEFINE([HAVE_ICU_LE], 1, [Use ICU Layout Engine library]) - AC_DEFINE([HAVE_GRAPHITE2], 1, [Use Graphite library]) AC_DEFINE([HAVE_UNISCRIBE], 1, [Use Uniscribe backend]) AC_DEFINE([HAVE_CORETEXT], 1, [Use Core Text backend]) AC_DEFINE([HAVE_INTEL_ATOMIC_PRIMITIVES], 1, [Use Intel __sync_* atomic primitives]) diff --git a/Build/source/libs/harfbuzz/include/Makefile.in b/Build/source/libs/harfbuzz/include/Makefile.in index 40244b2a3a7..7a79d94c8ce 100644 --- a/Build/source/libs/harfbuzz/include/Makefile.in +++ b/Build/source/libs/harfbuzz/include/Makefile.in @@ -55,6 +55,7 @@ subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ + $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ $(top_srcdir)/../../m4/kpse-lib-version.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ @@ -111,6 +112,9 @@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ FT2_CONFIG = @FT2_CONFIG@ +GRAPHITE2_DEPEND = @GRAPHITE2_DEPEND@ +GRAPHITE2_INCLUDES = @GRAPHITE2_INCLUDES@ +GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ GREP = @GREP@ HARFBUZZ_TREE = @HARFBUZZ_TREE@ HB_VERSION = @HB_VERSION@ @@ -152,6 +156,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ |