From 7c3f181e032655af0a5e3dd571f5bf6b76722e80 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 14 Apr 2011 06:45:02 +0000 Subject: 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 --- Build/source/texk/web2c/configure | 119 +++++--------------------------------- 1 file changed, 16 insertions(+), 103 deletions(-) (limited to 'Build/source/texk/web2c/configure') diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 0813e5dacfc..21451672e01 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -624,7 +624,6 @@ CTANGLE CTANGLEBOOT TANGLE TANGLEBOOT -TXTTOZLIB OBSDCOMPAT_RULE OBSDCOMPAT_DEPEND OBSDCOMPAT_LIBS @@ -761,6 +760,8 @@ CXXDEPMODE ac_ct_CXX CXXFLAGS CXX +cross_FALSE +cross_TRUE WARNING_CFLAGS CPP OTOOL64 @@ -13218,6 +13219,15 @@ fi eval kpse_build_alias=\${build_alias-$build} + if test "x$cross_compiling" = xyes; then + cross_TRUE= + cross_FALSE='#' +else + cross_TRUE='#' + cross_FALSE= +fi + + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -22009,7 +22019,7 @@ 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.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` @@ -22335,58 +22345,6 @@ CPPFLAGS=$kpse_save_CPPFLAGS LIBS=$kpse_save_LIBS -# Checks for xpdf (libpoppler) features. -eval CPPFLAGS=\"$POPPLER_INCLUDES \$CPPFLAGS\" -eval LIBS=\"$POPPLER_LIBS \$LIBS\" - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_link="./libtool --mode=link --tag=CXX $ac_link" - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDFDoc::getPDFMajorVersion" >&5 -$as_echo_n "checking for PDFDoc::getPDFMajorVersion... " >&6; } -if ${kpse_cv_have_getPDFMajorVersion+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -PDFDoc *pdfDoc; pdfDoc->getPDFMajorVersion(); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - kpse_cv_have_getPDFMajorVersion=yes -else - kpse_cv_have_getPDFMajorVersion=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_getPDFMajorVersion" >&5 -$as_echo "$kpse_cv_have_getPDFMajorVersion" >&6; } -if test "x$kpse_cv_have_getPDFMajorVersion" = xyes; then : - -$as_echo "#define HAVE_GETPDFMAJORVERSION 1" >>confdefs.h - -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_link="./libtool --mode=link --tag=CC $ac_link" - -CPPFLAGS=$kpse_save_CPPFLAGS -LIBS=$kpse_save_LIBS - - ac_config_headers="$ac_config_headers w2c/c-auto.h:c-auto.in" @@ -22395,55 +22353,6 @@ ac_config_headers="$ac_config_headers w2c/c-auto.h:c-auto.in" ac_config_headers="$ac_config_headers ff-config.h:luatexdir/luafontloader/ff-config.in" -if test "x$cross_compiling" = xyes; then -# Extract the first word of "txt2zlib", so it can be a program name with args. -set dummy txt2zlib; 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_path_TXTTOZLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $TXTTOZLIB in - [\\/]* | ?:[\\/]*) - ac_cv_path_TXTTOZLIB="$TXTTOZLIB" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_TXTTOZLIB="$as_dir/$ac_word$ac_exec_ext" - $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 - - ;; -esac -fi -TXTTOZLIB=$ac_cv_path_TXTTOZLIB -if test -n "$TXTTOZLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TXTTOZLIB" >&5 -$as_echo "$TXTTOZLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test -z "${TXTTOZLIB}"; then - as_fn_error $? "txt2zlib was not found but is required when cross-compiling. - Install txt2zlib or set \$TXTTOZLIB to the full pathname." "$LINENO" 5 -fi -else - TXTTOZLIB=./txt2zlib -fi - # For cross-compilation. Put at the end so there is a fair chance # these are still visible when the configure script has finished. @@ -22929,6 +22838,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +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 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 -- cgit v1.2.3