texlive[51471] Build/source: reautoconf
commits+karl at tug.org
commits+karl at tug.org
Wed Jun 26 18:15:59 CEST 2019
Revision: 51471
http://tug.org/svn/texlive?view=revision&revision=51471
Author: karl
Date: 2019-06-26 18:15:59 +0200 (Wed, 26 Jun 2019)
Log Message:
-----------
reautoconf
Modified Paths:
--------------
trunk/Build/source/configure
trunk/Build/source/texk/web2c/configure
Modified: trunk/Build/source/configure
===================================================================
--- trunk/Build/source/configure 2019-06-26 16:09:52 UTC (rev 51470)
+++ trunk/Build/source/configure 2019-06-26 16:15:59 UTC (rev 51471)
@@ -21683,11 +21683,11 @@
as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5
fi
-if $PKG_CONFIG harfbuzz-icu; then
- HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz-icu --cflags`
- HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz-icu --libs`
+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-icu" "$LINENO" 5
+ as_fn_error $? "did not find harfbuzz" "$LINENO" 5
fi
Modified: trunk/Build/source/texk/web2c/configure
===================================================================
--- trunk/Build/source/texk/web2c/configure 2019-06-26 16:09:52 UTC (rev 51470)
+++ trunk/Build/source/texk/web2c/configure 2019-06-26 16:15:59 UTC (rev 51471)
@@ -651,6 +651,11 @@
TANGLE
TANGLEBOOT
KPATHSEA_PATHS_H
+ICU_RULE
+ICU_DEPEND
+ICU_LIBS
+ICU_INCLUDES
+ICU_CONFIG
HARFBUZZ_RULE
HARFBUZZ_DEPEND
HARFBUZZ_LIBS
@@ -659,11 +664,6 @@
GRAPHITE2_DEPEND
GRAPHITE2_LIBS
GRAPHITE2_INCLUDES
-ICU_RULE
-ICU_DEPEND
-ICU_LIBS
-ICU_INCLUDES
-ICU_CONFIG
TECKIT_RULE
TECKIT_DEPEND
TECKIT_LIBS
@@ -1051,9 +1051,9 @@
with_system_xpdf
with_system_zziplib
with_system_teckit
-with_system_icu
with_system_graphite2
with_system_harfbuzz
+with_system_icu
'
ac_precious_vars='build_alias
host_alias
@@ -1812,12 +1812,12 @@
pkg-config)
--with-system-teckit use installed teckit headers and library (requires
pkg-config)
- --with-system-icu use installed ICU headers and libraries (requires
- pkg-config or icu-config)
--with-system-graphite2 use installed graphite2 headers and library
(requires pkg-config)
--with-system-harfbuzz use installed harfbuzz headers and library (requires
pkg-config)
+ --with-system-icu use installed ICU headers and libraries (requires
+ pkg-config or icu-config)
Some influential environment variables:
CC C compiler command
@@ -20335,7 +20335,7 @@
fi
-# We may need additional libraries for luaTeX.
+# We may need additional libraries for LuaTeX.
# On Solaris -lnsl for gethostbyname(), -lrt for nanosleep(),
# and maybe -lresolv for inet_aton().
lua_socketlibs=$socketlibs
@@ -25541,7 +25541,67 @@
cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
-echo 'tldbg:KPSE_ICU_FLAGS called: more-icu-libs=, icu-config-args=.' >&5
+
+# 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) .
@@ -25760,7 +25820,7 @@
;;
esac
-##tldbg _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) .
@@ -25786,59 +25846,8 @@
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) .
+fi # end xetex for icu/graphite
-# 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
-
-##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
-
-
# Check size of off_t (using <kpathsea/config.h>)
eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\"
eval LIBS=\"$KPATHSEA_LIBS \$LIBS\"
More information about the tex-live-commits
mailing list