diff options
| -rwxr-xr-x | Build/source/configure | 4 | ||||
| -rw-r--r-- | Build/source/libs/graphite2/ChangeLog | 8 | ||||
| -rw-r--r-- | Build/source/libs/graphite2/Makefile.am | 14 | ||||
| -rw-r--r-- | Build/source/libs/graphite2/Makefile.in | 12 | ||||
| -rw-r--r-- | Build/source/libs/graphite2/ac/graphite2.ac | 4 |
5 files changed, 30 insertions, 12 deletions
diff --git a/Build/source/configure b/Build/source/configure index 1ae91cdcf19..83313857831 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -1742,7 +1742,7 @@ Optional Packages: --with-system-harfbuzz use installed harfbuzz headers and library (requires pkg-config) --with-system-icu use installed ICU headers and libraries (requires - icu-config, not for XeTeX) + icu-config) --with-system-teckit use installed teckit headers and library --with-teckit-includes=DIR teckit headers installed in DIR @@ -20961,7 +20961,7 @@ $as_echo_n "checking requested system \`graphite2' library... " >&6; } int main () { -int *nMajor, int *nMinor, int *nBugFix; +int *nMajor, *nMinor, *nBugFix; gr_engine_version(nMajor, nMinor, nBugFix); ; return 0; diff --git a/Build/source/libs/graphite2/ChangeLog b/Build/source/libs/graphite2/ChangeLog index 6a8165f10da..9968bcc6591 100644 --- a/Build/source/libs/graphite2/ChangeLog +++ b/Build/source/libs/graphite2/ChangeLog @@ -1,3 +1,11 @@ +2013-01-03 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (AM_CPPFLAGS): Add -DGRAPHITE2_NSEGCACHE, + -DGRAPHITE2_NFILEFACE, and -DGRAPHITE2_NTRACING respectively + when building without segment caching, file face, or logging. + + * ac/graphite2.ac [KPSE_TRY_LIB]: Correct a syntax bug. + 2012-12-15 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Use KPSE_BASIC to enable silent rules. diff --git a/Build/source/libs/graphite2/Makefile.am b/Build/source/libs/graphite2/Makefile.am index 6b40b804112..507a1e61580 100644 --- a/Build/source/libs/graphite2/Makefile.am +++ b/Build/source/libs/graphite2/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build graphite2 for TeX Live. ## -## Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -108,15 +108,21 @@ libgraphite2_a_SOURCES += \ $(GRAPHITE2_SRC)/SegCache.cpp \ $(GRAPHITE2_SRC)/SegCacheEntry.cpp \ $(GRAPHITE2_SRC)/SegCacheStore.cpp -endif WITH_SEGCACHE +else !WITH_SEGCACHE +AM_CPPFLAGS += -DGRAPHITE2_NSEGCACHE +endif !WITH_SEGCACHE if WITH_FILEFACE libgraphite2_a_SOURCES += $(GRAPHITE2_SRC)/FileFace.cpp -endif WITH_FILEFACE +else !WITH_FILEFACE +AM_CPPFLAGS += -DGRAPHITE2_NFILEFACE +endif !WITH_FILEFACE if WITH_TRACING libgraphite2_a_SOURCES += $(GRAPHITE2_SRC)/json.cpp -endif WITH_TRACING +else !WITH_TRACING +AM_CPPFLAGS += -DGRAPHITE2_NTRACING +endif !WITH_TRACING $(libgraphite2_a_OBJECTS): config.force diff --git a/Build/source/libs/graphite2/Makefile.in b/Build/source/libs/graphite2/Makefile.in index 4effce8040f..93eb67eb2bc 100644 --- a/Build/source/libs/graphite2/Makefile.in +++ b/Build/source/libs/graphite2/Makefile.in @@ -57,8 +57,11 @@ host_triplet = @host@ @WITH_SEGCACHE_TRUE@ $(GRAPHITE2_SRC)/SegCacheEntry.cpp \ @WITH_SEGCACHE_TRUE@ $(GRAPHITE2_SRC)/SegCacheStore.cpp -@WITH_FILEFACE_TRUE@am__append_4 = $(GRAPHITE2_SRC)/FileFace.cpp -@WITH_TRACING_TRUE@am__append_5 = $(GRAPHITE2_SRC)/json.cpp +@WITH_SEGCACHE_FALSE@am__append_4 = -DGRAPHITE2_NSEGCACHE +@WITH_FILEFACE_TRUE@am__append_5 = $(GRAPHITE2_SRC)/FileFace.cpp +@WITH_FILEFACE_FALSE@am__append_6 = -DGRAPHITE2_NFILEFACE +@WITH_TRACING_TRUE@am__append_7 = $(GRAPHITE2_SRC)/json.cpp +@WITH_TRACING_FALSE@am__append_8 = -DGRAPHITE2_NTRACING subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ @@ -434,7 +437,8 @@ SUBDIRS = . include/graphite2 noinst_LIBRARIES = libgraphite2.a AM_CPPFLAGS = -I$(top_srcdir)/$(GRAPHITE2_SRC) \ -I$(top_srcdir)/$(GRAPHITE2_INC) -DGRAPHITE2_STATIC \ - -DGRAPHITE2_CUSTOM_HEADER='<config.h>' + -DGRAPHITE2_CUSTOM_HEADER='<config.h>' $(am__append_4) \ + $(am__append_6) $(am__append_8) libgraphite2_a_SOURCES = $(GRAPHITE2_SRC)/Bidi.cpp \ $(GRAPHITE2_SRC)/CachedFace.cpp $(GRAPHITE2_SRC)/CmapCache.cpp \ $(GRAPHITE2_SRC)/Code.cpp $(GRAPHITE2_SRC)/Face.cpp \ @@ -472,7 +476,7 @@ libgraphite2_a_SOURCES = $(GRAPHITE2_SRC)/Bidi.cpp \ $(GRAPHITE2_SRC)/inc/locale2lcid.h \ $(GRAPHITE2_SRC)/inc/opcode_table.h \ $(GRAPHITE2_SRC)/inc/opcodes.h $(am__append_1) $(am__append_2) \ - $(am__append_3) $(am__append_4) $(am__append_5) + $(am__append_3) $(am__append_5) $(am__append_7) DISTCLEANFILES = config.force LDADD = libgraphite2.a all: config.h diff --git a/Build/source/libs/graphite2/ac/graphite2.ac b/Build/source/libs/graphite2/ac/graphite2.ac index 712a81ad974..c48cdc1f5e2 100644 --- a/Build/source/libs/graphite2/ac/graphite2.ac +++ b/Build/source/libs/graphite2/ac/graphite2.ac @@ -1,10 +1,10 @@ ## libs/graphite2/ac/graphite2.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/ dnl -dnl Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## basic check of system graphite2 KPSE_TRY_LIB([graphite2], [#include <graphite2/Font.h>], - [int *nMajor, int *nMinor, int *nBugFix; + [int *nMajor, *nMinor, *nBugFix; gr_engine_version(nMajor, nMinor, nBugFix);]) |