summaryrefslogtreecommitdiff
path: root/Build/source/utils
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-12-04 13:11:31 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-12-04 13:11:31 +0000
commite820095ca870b45b0ce42d073f9eae53739b359c (patch)
treec1d334acc7439188c47976decd9788f38e11f98b /Build/source/utils
parente42ad852910fa40560d1ee5b20dac7de0583a076 (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/utils')
-rw-r--r--Build/source/utils/Makefile.in2
-rw-r--r--Build/source/utils/aclocal.m41
-rwxr-xr-xBuild/source/utils/configure33
3 files changed, 36 insertions, 0 deletions
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index b84343c5c6f..963d63b0d10 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -67,6 +67,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../m4/kpse-gd-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 \
@@ -141,6 +142,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../libs/harfbuzz/ac/withenable.ac \
$(top_srcdir)/../libs/icu/ac/withenable.ac \
$(top_srcdir)/../libs/teckit/ac/withenable.ac \
+ $(top_srcdir)/../libs/graphite2/ac/withenable.ac \
$(top_srcdir)/../libs/graphite/ac/withenable.ac \
$(top_srcdir)/../libs/zziplib/ac/withenable.ac \
$(top_srcdir)/../libs/xpdf/ac/withenable.ac \
diff --git a/Build/source/utils/aclocal.m4 b/Build/source/utils/aclocal.m4
index ba6b5e7db3b..c61e839ee0a 100644
--- a/Build/source/utils/aclocal.m4
+++ b/Build/source/utils/aclocal.m4
@@ -987,6 +987,7 @@ m4_include([../m4/kpse-freetype-flags.m4])
m4_include([../m4/kpse-freetype2-flags.m4])
m4_include([../m4/kpse-gd-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/utils/configure b/Build/source/utils/configure
index 191c990c78f..91a47265f65 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -800,6 +800,7 @@ with_system_icu
with_system_teckit
with_teckit_includes
with_teckit_libdir
+with_system_graphite2
with_graphite
with_system_graphite
with_system_zziplib
@@ -1630,6 +1631,8 @@ Optional Packages:
teckit headers installed in DIR
--with-teckit-libdir=DIR
teckit library installed in DIR
+ --with-system-graphite2 use installed graphite2 headers and library
+ (requires pkg-config)
--without-graphite build XeTeX without graphite support
--with-system-graphite use installed silgraphite headers and library
(requires pkg-config)
@@ -4678,6 +4681,14 @@ $as_echo "$as_me: -> installed \`freetype2' headers and library" >&6;}
elif test "x$with_system_freetype2" != xyes; then
as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-freetype2'" "$LINENO" 5
fi
+ if test "x$with_system_graphite2" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`graphite2' headers and library" >&5
+$as_echo "$as_me: -> installed \`graphite2' headers and library" >&6;}
+ with_system_graphite2=yes
+ ac_configure_args="$ac_configure_args '--with-system-graphite2'"
+ elif test "x$with_system_graphite2" != xyes; then
+ as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-graphite2'" "$LINENO" 5
+ fi
if test "x$with_system_icu" = x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`icu' headers and library" >&5
$as_echo "$as_me: -> installed \`icu' headers and library" >&6;}
@@ -4690,6 +4701,7 @@ fi
test "x$need_harfbuzz" = xyes && {
need_freetype2=yes
+ need_graphite2=yes
need_icu=yes
}
@@ -4760,6 +4772,27 @@ test "x$need_teckit" = xyes && {
}
+## libs/graphite2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/
+## configure options and TL libraries required for graphite2
+
+# 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" = x; then
+ if test -f $srcdir/../libs/graphite2/configure; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`graphite2' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`graphite2' headers and library from TL tree" >&6;}
+ with_system_graphite2=no
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`graphite2' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`graphite2' headers and library" >&6;}
+ with_system_graphite2=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-graphite2=$with_system_graphite2'"
+fi
+
+
## libs/graphite/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite/
## XeTeX can be built without graphite support