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/configure | |
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/configure')
-rwxr-xr-x | Build/source/libs/configure | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/Build/source/libs/configure b/Build/source/libs/configure index e012d158156..da57d86c6a6 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/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 @@ -848,6 +849,7 @@ CPPFLAGS' ac_subdirs_all='harfbuzz icu teckit +graphite2 graphite zziplib xpdf @@ -1635,6 +1637,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) @@ -4683,6 +4687,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;} @@ -4695,6 +4707,7 @@ fi test "x$need_harfbuzz" = xyes && { need_freetype2=yes + need_graphite2=yes need_icu=yes } @@ -4765,6 +4778,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 @@ -6027,6 +6061,19 @@ if test -x $srcdir/teckit/configure; then fi +if test -x $srcdir/graphite2/configure; then + if test "x$with_system_graphite2" != xyes && \ + test "x$need_graphite2" = xyes; then + SUBLIBS="graphite2 $SUBLIBS" + fi + DIST_SUBLIBS="graphite2 $DIST_SUBLIBS" + if false; then + subdirs="$subdirs graphite2" + + fi +fi + + if test -x $srcdir/graphite/configure; then if test "x$with_system_graphite" != xyes && \ test "x$need_graphite" = xyes; then |