summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/Makefile.in4
-rw-r--r--Build/source/texk/web2c/aclocal.m41
-rwxr-xr-xBuild/source/texk/web2c/configure31
-rw-r--r--Build/source/texk/web2c/doc/Makefile.in4
-rw-r--r--Build/source/texk/web2c/lib/Makefile.in4
-rw-r--r--Build/source/texk/web2c/man/Makefile.in4
-rw-r--r--Build/source/texk/web2c/omegafonts/Makefile.in4
-rw-r--r--Build/source/texk/web2c/otps/Makefile.in4
-rw-r--r--Build/source/texk/web2c/otps/win32/Makefile.in4
-rw-r--r--Build/source/texk/web2c/window/Makefile.in4
10 files changed, 64 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index d8f0cfb5d22..0a4e6da8327 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -324,6 +324,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-graphite-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \
$(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
@@ -1232,6 +1233,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@
GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
GRAPHITE_LIBS = @GRAPHITE_LIBS@
diff --git a/Build/source/texk/web2c/aclocal.m4 b/Build/source/texk/web2c/aclocal.m4
index 0c6042bd976..3f9bb7caf94 100644
--- a/Build/source/texk/web2c/aclocal.m4
+++ b/Build/source/texk/web2c/aclocal.m4
@@ -1096,6 +1096,7 @@ m4_include([../../m4/kpse-cxx-hack.m4])
m4_include([../../m4/kpse-fontconfig-flags.m4])
m4_include([../../m4/kpse-freetype2-flags.m4])
m4_include([../../m4/kpse-graphite-flags.m4])
+m4_include([../../m4/kpse-graphite2-flags.m4])
m4_include([../../m4/kpse-harfbuzz-flags.m4])
m4_include([../../m4/kpse-icu-flags.m4])
m4_include([../../m4/kpse-kpathsea-flags.m4])
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index e8939cc912c..79e6373e7e4 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -648,6 +648,10 @@ HARFBUZZ_RULE
HARFBUZZ_DEPEND
HARFBUZZ_LIBS
HARFBUZZ_INCLUDES
+GRAPHITE2_RULE
+GRAPHITE2_DEPEND
+GRAPHITE2_LIBS
+GRAPHITE2_INCLUDES
ICU_RULE
ICU_DEPEND
ICU_LIBS
@@ -994,6 +998,7 @@ with_system_teckit
with_teckit_includes
with_teckit_libdir
with_system_icu
+with_system_graphite2
with_system_harfbuzz
'
ac_precious_vars='build_alias
@@ -1747,6 +1752,8 @@ Optional Packages:
teckit library installed in DIR
--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)
--with-system-harfbuzz use installed harfbuzz headers and library (requires
pkg-config)
@@ -23132,6 +23139,30 @@ $(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h
${top_builddir}/../../libs/icu/include/unicode/uversion.h:
cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+## _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 harfbuzz (-lharfbuzz) flags
# Check whether --with-system-harfbuzz was given.
diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in
index e209f7e0b08..82aff792cfe 100644
--- a/Build/source/texk/web2c/doc/Makefile.in
+++ b/Build/source/texk/web2c/doc/Makefile.in
@@ -62,6 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-graphite-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \
$(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
@@ -184,6 +185,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@
GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
GRAPHITE_LIBS = @GRAPHITE_LIBS@
diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in
index 3fe857499a5..ccbc79ab71a 100644
--- a/Build/source/texk/web2c/lib/Makefile.in
+++ b/Build/source/texk/web2c/lib/Makefile.in
@@ -64,6 +64,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-graphite-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \
$(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
@@ -176,6 +177,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@
GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
GRAPHITE_LIBS = @GRAPHITE_LIBS@
diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in
index a68954b7b08..36b598c430d 100644
--- a/Build/source/texk/web2c/man/Makefile.in
+++ b/Build/source/texk/web2c/man/Makefile.in
@@ -78,6 +78,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-graphite-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \
$(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
@@ -190,6 +191,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@
GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
GRAPHITE_LIBS = @GRAPHITE_LIBS@
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in
index b940e055655..9b86b0ab52f 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.in
+++ b/Build/source/texk/web2c/omegafonts/Makefile.in
@@ -71,6 +71,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-graphite-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \
$(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
@@ -199,6 +200,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@
GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
GRAPHITE_LIBS = @GRAPHITE_LIBS@
diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in
index 5f1a54fbb1e..04f12bfd9ce 100644
--- a/Build/source/texk/web2c/otps/Makefile.in
+++ b/Build/source/texk/web2c/otps/Makefile.in
@@ -70,6 +70,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-graphite-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \
$(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
@@ -263,6 +264,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@
GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
GRAPHITE_LIBS = @GRAPHITE_LIBS@
diff --git a/Build/source/texk/web2c/otps/win32/Makefile.in b/Build/source/texk/web2c/otps/win32/Makefile.in
index fc799955936..3dfde7de0c5 100644
--- a/Build/source/texk/web2c/otps/win32/Makefile.in
+++ b/Build/source/texk/web2c/otps/win32/Makefile.in
@@ -64,6 +64,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-graphite-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \
$(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
@@ -168,6 +169,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@
GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
GRAPHITE_LIBS = @GRAPHITE_LIBS@
diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in
index 172b3a22414..693c9dbdbe2 100644
--- a/Build/source/texk/web2c/window/Makefile.in
+++ b/Build/source/texk/web2c/window/Makefile.in
@@ -64,6 +64,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../../m4/kpse-graphite-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \
$(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
@@ -174,6 +175,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@
GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
GRAPHITE_LIBS = @GRAPHITE_LIBS@