diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-04-14 06:45:02 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-04-14 06:45:02 +0000 |
commit | 7c3f181e032655af0a5e3dd571f5bf6b76722e80 (patch) | |
tree | 3bf9ad86b71107a71ae2b1a8de78785562feadb8 /Build/source/configure | |
parent | 210ecd46c941591f22752d21bd7c01609e9cd1df (diff) |
luaTeX build: require poppler at least 0.12,
distribute pdflua.c and skip txt2zlib when cross compiling
git-svn-id: svn://tug.org/texlive/trunk@22084 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/configure')
-rwxr-xr-x | Build/source/configure | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Build/source/configure b/Build/source/configure index 83cced40032..3761a0bd9b6 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -617,8 +617,8 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -cross_compiling_FALSE -cross_compiling_TRUE +cross_FALSE +cross_TRUE ICU_CONFIG FT2_CONFIG PKG_CONFIG @@ -19800,7 +19800,7 @@ elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then as_fn_error $? "did not find poppler-0.10 or better" "$LINENO" 5 fi -if $PKG_CONFIG poppler --atleast-version=0.10; then +if $PKG_CONFIG poppler --atleast-version=0.12; then POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' POPPLER_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`" POPPLER_LIBS=`$PKG_CONFIG poppler --libs` @@ -20425,13 +20425,12 @@ CPPFLAGS=$kpse_save_CPPFLAGS LIBS=$kpse_save_LIBS - if test "x$cross_compiling" = xyes; then - cross_compiling_TRUE= - cross_compiling_FALSE='#' + cross_TRUE= + cross_FALSE='#' else - cross_compiling_TRUE='#' - cross_compiling_FALSE= + cross_TRUE='#' + cross_FALSE= fi @@ -20610,8 +20609,8 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${cross_compiling_TRUE}" && test -z "${cross_compiling_FALSE}"; then - as_fn_error $? "conditional \"cross_compiling\" was never defined. +if test -z "${cross_TRUE}" && test -z "${cross_FALSE}"; then + as_fn_error $? "conditional \"cross\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi |