diff options
Diffstat (limited to 'japanese/tex-ptex/files/patch-configure')
| -rw-r--r-- | japanese/tex-ptex/files/patch-configure | 500 |
1 files changed, 390 insertions, 110 deletions
diff --git a/japanese/tex-ptex/files/patch-configure b/japanese/tex-ptex/files/patch-configure index 8192585fae21..54e5e0b43ec3 100644 --- a/japanese/tex-ptex/files/patch-configure +++ b/japanese/tex-ptex/files/patch-configure @@ -1,10 +1,24 @@ ---- configure.orig 2015-07-26 08:05:58.971291000 +0900 -+++ configure 2015-07-26 08:07:31.209478000 +0900 -@@ -23712,575 +23712,6 @@ +--- configure.orig 2022-01-30 17:17:22 UTC ++++ configure +@@ -25025,855 +25025,6 @@ $as_echo "#define z_const /**/" >>confdefs.h ;; esac --## _KPSE_LIB_FLAGS: Setup lua52 (-ltexlua52) flags +-##tldbg _KPSE_LIB_FLAGS: Setup lua53 (-ltexlua53) flags. +-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=lua53, libname=texlua53, options=lt tree, tlincl=-IBLD/libs/lua53/include, tllib=BLD/libs/lua53/libtexlua53.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/lua53/include/lua.h.' >&5 +-##tldbg _KPSE_LIB_FLAGS_TL: lua53 (texlua53) lt tree. +- LUA53_INCLUDES="-I$kpse_BLD/libs/lua53/include" +- LUA53_LIBS="$kpse_BLD/libs/lua53/libtexlua53.la" +- LUA53_DEPEND='${top_builddir}/../../libs/lua53/libtexlua53.la' +- LUA53_RULE='# Rebuild libtexlua53 +-$(LUA53_DEPEND): ${top_builddir}/../../libs/lua53/include/lua.h +- cd ${top_builddir}/../../libs/lua53 && $(MAKE) $(AM_MAKEFLAGS) rebuild +-${top_builddir}/../../libs/lua53/include/lua.h: +- cd ${top_builddir}/../../libs/lua53 && $(MAKE) $(AM_MAKEFLAGS) rebuild' +- +-##tldbg _KPSE_LIB_FLAGS: Setup lua52 (-ltexlua52) flags. +-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=lua52, libname=texlua52, options=lt tree, tlincl=-IBLD/libs/lua52/include, tllib=BLD/libs/lua52/libtexlua52.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/lua52/include/lua.h.' >&5 +-##tldbg _KPSE_LIB_FLAGS_TL: lua52 (texlua52) lt tree. - LUA52_INCLUDES="-I$kpse_BLD/libs/lua52/include" - LUA52_LIBS="$kpse_BLD/libs/lua52/libtexlua52.la" - LUA52_DEPEND='${top_builddir}/../../libs/lua52/libtexlua52.la' @@ -14,7 +28,10 @@ -${top_builddir}/../../libs/lua52/include/lua.h: - cd ${top_builddir}/../../libs/lua52 && $(MAKE) $(AM_MAKEFLAGS) rebuild' - --## _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags +-echo 'tldbg:KPSE_LUAJIT_FLAGS called.' >&5 +-##tldbg _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags. +-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=luajit, libname=texluajit, options=lt tree, tlincl=-IBLD/libs/luajit/include, tllib=BLD/libs/luajit/libtexluajit.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/luajit/include/luajit.h.' >&5 +-##tldbg _KPSE_LIB_FLAGS_TL: luajit (texluajit) lt tree. - LUAJIT_INCLUDES="-I$kpse_BLD/libs/luajit/include" - LUAJIT_LIBS="$kpse_BLD/libs/luajit/libtexluajit.la" - LUAJIT_DEPEND='${top_builddir}/../../libs/luajit/libtexluajit.la' @@ -23,8 +40,80 @@ - cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/luajit/include/luajit.h: - cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild' +-# +-# checking for openbsd for additional jit libraries needed, which is the +-# case for clang; no point in going to the trouble elsewhere since no +-# other system needs it. +-case $build_os in +-openbsd*) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking on openbsd if additional jit libraries are needed" >&5 +-$as_echo_n "checking on openbsd if additional jit libraries are needed... " >&6; } +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include "stdint.h" +- typedef struct _Unwind_Context _Unwind_Context; +- extern uintptr_t _Unwind_GetCFA(_Unwind_Context *); +-int +-main () +-{ +-_Unwind_Context *ctx; +- _Unwind_GetCFA(ctx); +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-else +- +- jitlibs="-lc++abi -lpthread" +- save_LIBS=$LIBS +- LIBS="$LIBS $jitlibs" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include "stdint.h" +- typedef struct _Unwind_Context _Unwind_Context; +- extern uintptr_t _Unwind_GetCFA(_Unwind_Context *); +-int +-main () +-{ +-_Unwind_Context *ctx; +- _Unwind_GetCFA(ctx); +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$jitlibs\"" >&5 +-$as_echo "\"$jitlibs\"" >&6; } +- LIBLUAJIT_LDEXTRA="$LIBLUAJIT_LDEXTRA $jitlibs" +- +-else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "luajit could not be linked +-See \`config.log' for more details" "$LINENO" 5; } +- +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- LIBS=$save_LIBS - --## _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags +- +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- ;; +-esac +-echo 'tldbg:KPSE_LUAJIT_FLAGS done.' >&5 +- +-##tldbg _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags. +-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=libpng, libname=png, options=, tlincl=-IBLD/libs/libpng/include, tllib=BLD/libs/libpng/libpng.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/libpng/include/png.h.' >&5 +-##tldbg _KPSE_LIB_FLAGS_TL: libpng (png) . - -# Check whether --with-system-libpng was given. -if test "${with_system_libpng+set}" = set; then : @@ -48,7 +137,9 @@ - cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - --## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags +-##tldbg _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags. +-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=freetype2, libname=freetype, options=, tlincl=-IBLD/libs/freetype2/freetype2, tllib=BLD/libs/freetype2/libfreetype.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/freetype2/freetype2/ft2build.h.' >&5 +-##tldbg _KPSE_LIB_FLAGS_TL: freetype2 (freetype) . - -# Check whether --with-system-freetype2 was given. -if test "${with_system_freetype2+set}" = set; then : @@ -146,9 +237,103 @@ -else - FT2_CONFIG="$ac_cv_prog_FT2_CONFIG" -fi +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_PKG_CONFIG+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$PKG_CONFIG"; then +- ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG +-if test -n "$PKG_CONFIG"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +-$as_echo "$PKG_CONFIG" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_PKG_CONFIG"; then +- ac_ct_PKG_CONFIG=$PKG_CONFIG +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_PKG_CONFIG"; then +- ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG +-if test -n "$ac_ct_PKG_CONFIG"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5 +-$as_echo "$ac_ct_PKG_CONFIG" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_PKG_CONFIG" = x; then +- PKG_CONFIG="false" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- PKG_CONFIG=$ac_ct_PKG_CONFIG +- fi +-else +- PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" +-fi -if $FT2_CONFIG --ftversion >/dev/null 2>&1; then - FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` - FREETYPE2_LIBS=`$FT2_CONFIG --libs` +-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` +- FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` -elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then - as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5 -fi @@ -163,7 +348,9 @@ - cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - --## _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags +-##tldbg _KPSE_LIB_FLAGS: Setup pixman (-lpixman) flags. +-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=pixman, libname=pixman, options=, tlincl=-IBLD/libs/pixman/include, tllib=BLD/libs/pixman/libpixman.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/pixman/include/pixman.h.' >&5 +-##tldbg _KPSE_LIB_FLAGS_TL: pixman (pixman) . - -# Check whether --with-system-pixman was given. -if test "${with_system_pixman+set}" = set; then : @@ -187,7 +374,9 @@ - cd ${top_builddir}/../../libs/pixman && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - --## _KPSE_LIB_FLAGS: Setup cairo (-lcairo) flags +-##tldbg _KPSE_LIB_FLAGS: Setup cairo (-lcairo) flags. +-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=cairo, libname=cairo, options=, tlincl=-IBLD/libs/cairo/cairo, tllib=BLD/libs/cairo/libcairo.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/cairo/cairo/cairo.h.' >&5 +-##tldbg _KPSE_LIB_FLAGS_TL: cairo (cairo) . - -# Check whether --with-system-cairo was given. -if test "${with_system_cairo+set}" = set; then : @@ -211,7 +400,9 @@ - cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - --## _KPSE_LIB_FLAGS: Setup gmp (-lgmp) flags +-##tldbg _KPSE_LIB_FLAGS: Setup gmp (-lgmp) flags. +-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=gmp, libname=gmp, options=, tlincl=-IBLD/libs/gmp/include, tllib=BLD/libs/gmp/libgmp.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/gmp/include/gmp.h.' >&5 +-##tldbg _KPSE_LIB_FLAGS_TL: gmp (gmp) . - -# Check whether --with-system-gmp was given. -if test "${with_system_gmp+set}" = set; then : @@ -228,7 +419,8 @@ - withval=$with_gmp_libdir; -fi -if test "x$with_system_gmp" = xyes; then -- if test "x$with_gmp_includes" != x && test "x$with_gmp_includes" != xyes; then +- ##tldbg _KPSE_LIB_FLAGS_SYSTEM: gmp (gmp). +-if test "x$with_gmp_includes" != x && test "x$with_gmp_includes" != xyes; then - GMP_INCLUDES="-I$with_gmp_includes" -fi -GMP_LIBS="-lgmp" @@ -246,7 +438,9 @@ - cd ${top_builddir}/../../libs/gmp && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - --## _KPSE_LIB_FLAGS: Setup mpfr (-lmpfr) flags +-##tldbg _KPSE_LIB_FLAGS: Setup mpfr (-lmpfr) flags. +-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=mpfr, libname=mpfr, options=, tlincl=-IBLD/libs/mpfr/include, tllib=BLD/libs/mpfr/libmpfr.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/mpfr/include/mpfr.h.' >&5 +-##tldbg _KPSE_LIB_FLAGS_TL: mpfr (mpfr) . - -# Check whether --with-system-mpfr was given. -if test "${with_system_mpfr+set}" = set; then : @@ -263,7 +457,8 @@ - withval=$with_mpfr_libdir; -fi -if test "x$with_system_mpfr" = xyes; then -- if test "x$with_mpfr_includes" != x && test "x$with_mpfr_includes" != xyes; then +- ##tldbg _KPSE_LIB_FLAGS_SYSTEM: mpfr (mpfr). +-if test "x$with_mpfr_includes" != x && test "x$with_mpfr_includes" != xyes; then - MPFR_INCLUDES="-I$with_mpfr_includes" -fi -MPFR_LIBS="-lmpfr" @@ -281,50 +476,12 @@ - cd ${top_builddir}/../../libs/mpfr && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - --## _KPSE_LIB_FLAGS: Setup poppler (-lpoppler) flags -- --# Check whether --with-system-poppler was given. --if test "${with_system_poppler+set}" = set; then : -- withval=$with_system_poppler; --fi --if test "x$with_system_poppler" = xyes; then -- if $PKG_CONFIG poppler --atleast-version=0.18; then -- POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags` -- POPPLER_LIBS=`$PKG_CONFIG poppler --libs` --elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then -- as_fn_error $? "did not find poppler 0.18 or better" "$LINENO" 5 --fi -- --POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' --POPPLER_INCLUDES="$POPPLER_VERSION $POPPLER_INCLUDES" --else -- POPPLER_INCLUDES="-I$kpse_BLD/libs/poppler/include" -- POPPLER_LIBS="$kpse_BLD/libs/poppler/libpoppler.a" -- POPPLER_DEPEND='${top_builddir}/../../libs/poppler/libpoppler.a' -- POPPLER_RULE='# Rebuild libpoppler --$(POPPLER_DEPEND): ${top_builddir}/../../libs/poppler/include/Stream.h -- cd ${top_builddir}/../../libs/poppler && $(MAKE) $(AM_MAKEFLAGS) rebuild --${top_builddir}/../../libs/poppler/include/Stream.h: -- cd ${top_builddir}/../../libs/poppler && $(MAKE) $(AM_MAKEFLAGS) rebuild' --fi --test "x$kpse_cv_have_win32" = xno || POPPLER_LIBS="$POPPLER_LIBS -lgdi32" -- --## _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags -- --# Check whether --with-system-xpdf was given. --if test "${with_system_xpdf+set}" = set; then : -- withval=$with_system_xpdf; --fi +-##tldbg _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags. +-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=xpdf, libname=xpdf, options=, tlincl=-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/xpdf, tllib=BLD/libs/xpdf/libxpdf.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/xpdf/xpdf/Stream.h.' >&5 +-##tldbg _KPSE_LIB_FLAGS_TL: xpdf (xpdf) . +-: "kpse_xpdf_options - no-op" -if test "x$with_system_xpdf" = xyes; then -- if $PKG_CONFIG poppler --atleast-version=0.12; then -- XPDF_INCLUDES=`$PKG_CONFIG poppler --cflags` -- XPDF_LIBS=`$PKG_CONFIG poppler --libs` --elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then -- as_fn_error $? "did not find poppler 0.12 or better" "$LINENO" 5 --fi -- --POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' --XPDF_INCLUDES="$POPPLER_VERSION $XPDF_INCLUDES" +- : "kpse_xpdf_system_flags - no-op" -else - XPDF_INCLUDES="-DPDF_PARSER_ONLY -I$kpse_BLD/libs/xpdf -I$kpse_BLD/libs/xpdf/goo -I$kpse_BLD/libs/xpdf/xpdf" - XPDF_LIBS="$kpse_BLD/libs/xpdf/libxpdf.a" @@ -337,7 +494,9 @@ -fi -test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32" - --## _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags +-##tldbg _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags. +-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=zziplib, libname=zzip, options=, tlincl=-IBLD/libs/zziplib/include, tllib=BLD/libs/zziplib/libzzip.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/zziplib/include/zzip/zzip.h.' >&5 +-##tldbg _KPSE_LIB_FLAGS_TL: zziplib (zzip) . - -# Check whether --with-system-zziplib was given. -if test "${with_system_zziplib+set}" = set; then : @@ -361,7 +520,9 @@ - cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - --## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags +-##tldbg _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags. +-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=teckit, libname=TECkit, options=, tlincl=-IBLD/libs/teckit/include, tllib=BLD/libs/teckit/libTECkit.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h.' >&5 +-##tldbg _KPSE_LIB_FLAGS_TL: teckit (TECkit) . - -# Check whether --with-system-teckit was given. -if test "${with_system_teckit+set}" = set; then : @@ -385,14 +546,78 @@ - cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - --## _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags +- +-# LuaTeX and XeTeX need harfbuzz. +-if test "x$enable_xetex" = xyes \ +- || test "x$enable_luatex" = xyes || test "x$enable_luatex53" = xyes; then +- ##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags. +-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5 +-##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (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" = 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 +- +-##tldbg _KPSE_LIB_FLAGS: Setup harfbuzz (-lharfbuzz) flags. +-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=harfbuzz, libname=harfbuzz, options=, tlincl=-IBLD/libs/harfbuzz/include, tllib=BLD/libs/harfbuzz/libharfbuzz.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/harfbuzz/include/hb.h.' >&5 +-##tldbg _KPSE_LIB_FLAGS_TL: harfbuzz (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" = xyes; then +- if $PKG_CONFIG harfbuzz; then +- HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz --cflags` +- HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz --libs` +-elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then +- as_fn_error $? "did not find harfbuzz" "$LINENO" 5 +-fi +-else +- HARFBUZZ_INCLUDES="-I$kpse_BLD/libs/harfbuzz/include" +- HARFBUZZ_LIBS="$kpse_BLD/libs/harfbuzz/libharfbuzz.a" +- HARFBUZZ_DEPEND='${top_builddir}/../../libs/harfbuzz/libharfbuzz.a' +- HARFBUZZ_RULE='# Rebuild libharfbuzz +-$(HARFBUZZ_DEPEND): ${top_builddir}/../../libs/harfbuzz/include/hb.h +- cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild +-${top_builddir}/../../libs/harfbuzz/include/hb.h: +- cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild' +-fi +- +-fi # end xetex/luatex for harfbuzz +- +-# XeTeX, but not LuaTeX, needs icu and graphite. +-if test "x$enable_xetex" = xyes; then +- echo 'tldbg:KPSE_ICU_FLAGS called: more-icu-libs=, icu-config-args=.' >&5 +-##tldbg _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags. +-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=icu, libname=icuxxx, options=, tlincl=-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include, tllib= BLD/libs/icu/icu-build/lib/libicuuc.a BLD/libs/icu/icu-build/lib/libicudata.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/icu/include/unicode/uversion.h.' >&5 +-##tldbg _KPSE_LIB_FLAGS_TL: icu (icuxxx) . - -# Check whether --with-system-icu was given. -if test "${with_system_icu+set}" = set; then : - withval=$with_system_icu; -fi -if test "x$with_system_icu" = xyes; then -- if test -n "$ac_tool_prefix"; then +- echo 'tldbg:KPSE_ICU_SYSTEM_FLAGS called.' >&5 +-if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}icu-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -483,11 +708,105 @@ -else - ICU_CONFIG="$ac_cv_prog_ICU_CONFIG" -fi +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_PKG_CONFIG+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$PKG_CONFIG"; then +- ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG +-if test -n "$PKG_CONFIG"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +-$as_echo "$PKG_CONFIG" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_PKG_CONFIG"; then +- ac_ct_PKG_CONFIG=$PKG_CONFIG +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_PKG_CONFIG"; then +- ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG +-if test -n "$ac_ct_PKG_CONFIG"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5 +-$as_echo "$ac_ct_PKG_CONFIG" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_PKG_CONFIG" = x; then +- PKG_CONFIG="false" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- PKG_CONFIG=$ac_ct_PKG_CONFIG +- fi +-else +- PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" +-fi -if $ICU_CONFIG --version >/dev/null 2>&1; then - ICU_INCLUDES=`$ICU_CONFIG --cppflags` - ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system` +-elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then +- ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io` +- ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io` -elif test "x$need_icu:$with_system_icu" = xyes:yes; then -- as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5 +- as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5 -fi -else - ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include" @@ -499,56 +818,16 @@ -${top_builddir}/../../libs/icu/include/unicode/uversion.h: - cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi +-# checking for openbsd to add -lpthread for icu. +-case $build_os in +-openbsd*) +- eval ICUXXX_LIBS=\"$ICUXXX_LIBS -lpthread\" +- ;; +-esac - --## _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. --if test "${with_system_harfbuzz+set}" = set; then : -- withval=$with_system_harfbuzz; --fi --if test "x$with_system_harfbuzz" = xyes; then -- if $PKG_CONFIG harfbuzz-icu; then -- HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz-icu --cflags` -- HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz-icu --libs` --elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then -- as_fn_error $? "did not find harfbuzz-icu" "$LINENO" 5 --fi --else -- HARFBUZZ_INCLUDES="-I$kpse_BLD/libs/harfbuzz/include" -- HARFBUZZ_LIBS="$kpse_BLD/libs/harfbuzz/libharfbuzz.a" -- HARFBUZZ_DEPEND='${top_builddir}/../../libs/harfbuzz/libharfbuzz.a' -- HARFBUZZ_RULE='# Rebuild libharfbuzz --$(HARFBUZZ_DEPEND): ${top_builddir}/../../libs/harfbuzz/include/hb.h -- cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild --${top_builddir}/../../libs/harfbuzz/include/hb.h: -- cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild' --fi -- --## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags +- ##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags. +-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5 +-##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) . - -# Check whether --with-system-graphite2 was given. -if test "${with_system_graphite2+set}" = set; then : @@ -572,6 +851,7 @@ - cd ${top_builddir}/../../libs/graphite2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - +-fi # end xetex for icu/graphite - # Check size of off_t (using <kpathsea/config.h>) eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" |