summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/configure
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/configure')
-rwxr-xr-xBuild/source/texk/web2c/configure91
1 files changed, 31 insertions, 60 deletions
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 5a4ab1584c2..aea23a2a17a 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -661,10 +661,6 @@ TECKIT_RULE
TECKIT_DEPEND
TECKIT_LIBS
TECKIT_INCLUDES
-GRAPHITE_RULE
-GRAPHITE_DEPEND
-GRAPHITE_LIBS
-GRAPHITE_INCLUDES
ZZIPLIB_RULE
ZZIPLIB_DEPEND
ZZIPLIB_LIBS
@@ -774,8 +770,6 @@ TEX_SYNCTEX_FALSE
TEX_SYNCTEX_TRUE
TEX_FALSE
TEX_TRUE
-XETEX_GRAPHITE_FALSE
-XETEX_GRAPHITE_TRUE
XETEX_MACOSX_FALSE
XETEX_MACOSX_TRUE
FONTCONFIG_LIBS
@@ -998,7 +992,6 @@ with_system_cairo
with_system_xpdf
with_system_poppler
with_system_zziplib
-with_system_graphite
with_system_teckit
with_teckit_includes
with_teckit_libdir
@@ -1750,8 +1743,6 @@ Optional Packages:
pkg-config)
--with-system-zziplib use installed zziplib headers and library (requires
pkg-config)
- --with-system-graphite use installed silgraphite headers and library
- (requires pkg-config)
--with-system-teckit use installed teckit headers and library
--with-teckit-includes=DIR
teckit headers installed in DIR
@@ -17985,9 +17976,10 @@ test "x$enable_web2c:$enable_xetex" = xyes:yes && {
need_poppler=yes
need_libpng=yes
need_freetype2=yes
- need_icu_xetex=yes
+ need_icu=yes
need_teckit=yes
- need_graphite=yes
+ need_graphite2=yes
+ need_harfbuzz=yes
}
## configure options for MF
# Check whether --enable-mf was given.
@@ -18894,14 +18886,6 @@ else
XETEX_MACOSX_FALSE=
fi
- if test "x$with_graphite" != xno; then
- XETEX_GRAPHITE_TRUE=
- XETEX_GRAPHITE_FALSE='#'
-else
- XETEX_GRAPHITE_TRUE='#'
- XETEX_GRAPHITE_FALSE=
-fi
-
if test "x$enable_tex" = xyes; then
TEX_TRUE=
@@ -23001,30 +22985,6 @@ ${top_builddir}/../../libs/zziplib/include/zzip/zzip.h:
cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
-## _KPSE_LIB_FLAGS: Setup graphite (-lgraphite) flags
-
-# Check whether --with-system-graphite was given.
-if test "${with_system_graphite+set}" = set; then :
- withval=$with_system_graphite;
-fi
-if test "x$with_system_graphite" = xyes; then
- if $PKG_CONFIG silgraphite --atleast-version=2.3; then
- GRAPHITE_INCLUDES="`$PKG_CONFIG silgraphite --cflags`"
- GRAPHITE_LIBS=`$PKG_CONFIG silgraphite --libs`
-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
-else
- GRAPHITE_INCLUDES="-I$kpse_BLD/libs/graphite/include"
- GRAPHITE_LIBS="$kpse_BLD/libs/graphite/libgraphite.a"
- GRAPHITE_DEPEND='${top_builddir}/../../libs/graphite/libgraphite.a'
- GRAPHITE_RULE='# Rebuild libgraphite
-$(GRAPHITE_DEPEND): ${top_builddir}/../../libs/graphite/include/graphite/GrClient.h
- cd ${top_builddir}/../../libs/graphite && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/graphite/include/graphite/GrClient.h:
- cd ${top_builddir}/../../libs/graphite && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-fi
-
## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
# Check whether --with-system-teckit was given.
@@ -23168,23 +23128,14 @@ elif test "x$need_icu:$with_system_icu" = xyes:yes; then
fi
else
ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
- ICU_LIBS="$kpse_BLD/libs/icu/icu-build/lib/libicule.a $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a"
- ICU_DEPEND='${top_builddir}/../../libs/icu/icu-build/lib/libicule.a ${top_builddir}/../../libs/icu/icu-build/lib/libicuuc.a ${top_builddir}/../../libs/icu/icu-build/lib/libicudata.a'
+ ICU_LIBS=" $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a"
+ ICU_DEPEND=' ${top_builddir}/../../libs/icu/icu-build/lib/libicuuc.a ${top_builddir}/../../libs/icu/icu-build/lib/libicudata.a'
ICU_RULE='# Rebuild libicuxxx
$(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h
cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild
${top_builddir}/../../libs/icu/include/unicode/uversion.h:
cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
-## _KPSE_LIB_FLAGS: Setup icu (-lsicuxxx) flags
- ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
- ICU_LIBS="$kpse_BLD/libs/icu/icu-build/lib/libicule.a $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a"
- ICU_DEPEND='${top_builddir}/../../libs/icu/icu-build/lib/libicule.a ${top_builddir}/../../libs/icu/icu-build/lib/libicuuc.a ${top_builddir}/../../libs/icu/icu-build/lib/libicudata.a'
- ICU_RULE='# Rebuild libsicuxxx
-$(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h
- cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/icu/include/unicode/uversion.h:
- cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild'
## _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags
@@ -23217,11 +23168,11 @@ 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
+ if $PKG_CONFIG harfbuzz --atleast-version=0.9.10; 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
+ as_fn_error $? "did not find harfbuzz-0.9.10 or better" "$LINENO" 5
fi
else
HARFBUZZ_INCLUDES="-I$kpse_BLD/libs/harfbuzz/include"
@@ -23234,6 +23185,30 @@ ${top_builddir}/../../libs/harfbuzz/include/hb.h:
cd ${top_builddir}/../../libs/harfbuzz && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
+## _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
+
# Check size of off_t (using <kpathsea/config.h>)
eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\"
@@ -23806,10 +23781,6 @@ if test -z "${XETEX_MACOSX_TRUE}" && test -z "${XETEX_MACOSX_FALSE}"; then
as_fn_error $? "conditional \"XETEX_MACOSX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${XETEX_GRAPHITE_TRUE}" && test -z "${XETEX_GRAPHITE_FALSE}"; then
- as_fn_error $? "conditional \"XETEX_GRAPHITE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${TEX_TRUE}" && test -z "${TEX_FALSE}"; then
as_fn_error $? "conditional \"TEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5