From ce108d3fea94e3b9cce73edd5dca42aec928dfc2 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Thu, 3 Jan 2013 09:48:54 +0000 Subject: Merge in new XeTeX stuff git-svn-id: svn://tug.org/texlive/trunk@28710 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/configure.ac | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Build/source/texk/web2c/configure.ac') diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 8ef40604b7d..34cb9fd26a5 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -135,7 +135,6 @@ KPSE_FONTCONFIG_FLAGS AS_IF([test "x$kpse_cv_have_Carbon:$kpse_cv_have_fontconfig" = xno:no], [WEB2C_DISABLE([xetex], [neither Carbon framework nor fontconfig library])]) AM_CONDITIONAL([XETEX_MACOSX], [test "x$kpse_cv_have_Carbon" = xyes]) -AM_CONDITIONAL([XETEX_GRAPHITE], [test "x$with_graphite" != xno]) dnl Generate *TEX and ALEPH conditionals. m4_foreach([Kpse_Prog], [kpse_tex_progs], @@ -274,9 +273,9 @@ KPSE_XPDF_FLAGS KPSE_ZZIPLIB_FLAGS KPSE_GRAPHITE_FLAGS KPSE_TECKIT_FLAGS -KPSE_ICU_FLAGS([icule])[]dnl required by KPSE_HARFBUZZ_FLAGS -KPSE_ICU_XETEX_FLAGS([icule]) +KPSE_ICU_FLAGS KPSE_HARFBUZZ_FLAGS +KPSE_GRAPHITE2_FLAGS # Check size of off_t (using ) KPSE_ADD_FLAGS([kpathsea]) -- cgit v1.2.3