summaryrefslogtreecommitdiff
path: root/Build/source/utils
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-30 10:42:45 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-11-30 10:42:45 +0000
commitcdae43322cc315a65b9bee9f62b2e28934fefa6a (patch)
tree18a8ae660cb1dc7d1136962b4e8dcbccad5b873d /Build/source/utils
parent156b1ea47fd003feee19afbb34c0e85e596b54dc (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/utils')
-rw-r--r--Build/source/utils/Makefile.in2
-rw-r--r--Build/source/utils/aclocal.m41
-rwxr-xr-xBuild/source/utils/configure47
3 files changed, 50 insertions, 0 deletions
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index 072b9a9e12a..b84343c5c6f 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-harfbuzz-flags.m4 \
$(top_srcdir)/../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../m4/kpse-kpathsea-flags.m4 \
$(top_srcdir)/../m4/kpse-libpng-flags.m4 \
@@ -137,6 +138,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../texk/xdvipdfmx/ac/withenable.ac \
$(top_srcdir)/../texk/tetex/ac/withenable.ac \
$(top_srcdir)/../texk/texlive/ac/withenable.ac \
+ $(top_srcdir)/../libs/harfbuzz/ac/withenable.ac \
$(top_srcdir)/../libs/icu/ac/withenable.ac \
$(top_srcdir)/../libs/teckit/ac/withenable.ac \
$(top_srcdir)/../libs/graphite/ac/withenable.ac \
diff --git a/Build/source/utils/aclocal.m4 b/Build/source/utils/aclocal.m4
index 4bcf9b5f511..ba6b5e7db3b 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-harfbuzz-flags.m4])
m4_include([../m4/kpse-icu-flags.m4])
m4_include([../m4/kpse-kpathsea-flags.m4])
m4_include([../m4/kpse-libpng-flags.m4])
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 50f096bcdfa..2822ac6d023 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -795,6 +795,7 @@ with_xdvi_x_toolkit
enable_xdvipdfmx
enable_tetex
enable_texlive
+with_system_harfbuzz
with_system_icu
with_system_teckit
with_teckit_includes
@@ -1620,6 +1621,8 @@ Optional Packages:
--with-xdvi-x-toolkit=KIT
Use toolkit KIT (motif/xaw/xaw3d/neXtaw) for xdvi
[default: Motif if available, else Xaw]
+ --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)
--with-system-teckit use installed teckit headers and library
@@ -4647,6 +4650,50 @@ esac
+## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
+## configure options and TL libraries required for harfbuzz
+
+# Check whether --with-system-harfbuzz was given.
+if test "${with_system_harfbuzz+set}" = set; then :
+ withval=$with_system_harfbuzz;
+fi
+if test "x$with_system_harfbuzz" = x; then
+ if test -f $srcdir/../libs/harfbuzz/configure; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`harfbuzz' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`harfbuzz' headers and library from TL tree" >&6;}
+ with_system_harfbuzz=no
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`harfbuzz' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;}
+ with_system_harfbuzz=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'"
+fi
+if test "x$with_system_harfbuzz" = xyes; then
+ if test "x$with_system_freetyp2" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`freetyp2' headers and library" >&5
+$as_echo "$as_me: -> installed \`freetyp2' headers and library" >&6;}
+ with_system_freetyp2=yes
+ ac_configure_args="$ac_configure_args '--with-system-freetyp2'"
+ elif test "x$with_system_freetyp2" != xyes; then
+ as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-freetyp2'" "$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;}
+ with_system_icu=yes
+ ac_configure_args="$ac_configure_args '--with-system-icu'"
+ elif test "x$with_system_icu" != xyes; then
+ as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-icu'" "$LINENO" 5
+ fi
+fi
+
+test "x$need_harfbuzz" = xyes && {
+ need_freetyp2=yes
+ need_icu=yes
+}
+
+
## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/
## configure options and TL libraries required for icu (modified for XeTeX)