From e820095ca870b45b0ce42d073f9eae53739b359c Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 4 Dec 2012 13:11:31 +0000 Subject: libs/graphite2: Added for future XeTeX git-svn-id: svn://tug.org/texlive/trunk@28442 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/configure | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) (limited to 'Build/source/configure') diff --git a/Build/source/configure b/Build/source/configure index 24f74956332..67a44a109d1 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -889,6 +889,7 @@ with_system_icu with_system_teckit with_teckit_includes with_teckit_libdir +with_system_graphite2 with_graphite with_system_graphite with_system_zziplib @@ -1742,6 +1743,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) @@ -5496,6 +5499,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;} @@ -5508,6 +5519,7 @@ fi test "x$need_harfbuzz" = xyes && { need_freetype2=yes + need_graphite2=yes need_icu=yes } @@ -5598,6 +5610,37 @@ 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'" +elif test "x$with_system_graphite2" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`graphite2' headers and library" >&5 +$as_echo "$as_me: Using installed \`graphite2' headers and library" >&6;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`graphite2' headers and library from TL tree" >&5 +$as_echo "$as_me: Using \`graphite2' headers and library from TL tree" >&6;} + if test "x$with_system_graphite2" != xno; then + with_system_graphite2=no + ac_configure_args="$ac_configure_args '--without-system-graphite2'" + fi +fi + + ## libs/graphite/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite/ ## XeTeX can be built without graphite support @@ -20357,6 +20400,13 @@ elif test "x$need_graphite:$with_system_graphite" = xyes:yes; then as_fn_error $? "did not find silgraphite 2.3 or better" "$LINENO" 5 fi +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 + if test "x$with_teckit_includes" != x && test "x$with_teckit_includes" != xyes; then TECKIT_INCLUDES="-I$with_teckit_includes" fi @@ -20936,6 +20986,37 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu +## libs/graphite2/ac/graphite2.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/ +## basic check of system graphite2 +if test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`graphite2' library" >&5 +$as_echo_n "checking requested system \`graphite2' library... " >&6; } + CPPFLAGS="$GRAPHITE2_INCLUDES $CPPFLAGS" + LIBS="$GRAPHITE2_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +int *nMajor, int *nMinor, int *nBugFix; +gr_engine_version(nMajor, nMinor, nBugFix); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + syslib_used=yes kpse_res=ok +else + syslib_status=no kpse_res=failed +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5 +$as_echo "$kpse_res" >&6; } +fi + + ## libs/teckit/ac/teckit.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/ ## basic check of system teckit ac_ext=cpp -- cgit v1.2.3