From 0af56a69384564cd03264928f7c602319a12128d Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 23 Nov 2012 13:32:28 +0000 Subject: require poppler 0.18 or better git-svn-id: svn://tug.org/texlive/trunk@28338 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/m4/ChangeLog | 4 ++ Build/source/m4/kpse-poppler-flags.m4 | 7 ++- Build/source/texk/web2c/c-auto.in | 3 -- Build/source/texk/web2c/configure | 58 ++--------------------- Build/source/texk/web2c/configure.ac | 16 ------- Build/source/texk/web2c/luatexdir/ChangeLog | 5 ++ Build/source/texk/web2c/luatexdir/lua/lepdflib.cc | 4 -- 7 files changed, 15 insertions(+), 82 deletions(-) diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index 90a04b9eacf..d617e2f6fbc 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,7 @@ +2012-11-20 Peter Breitenlohner + + * kpse-poppler-flags.m4: Require poppler-0.18 or better. + 2012-10-19 Peter Breitenlohner * kpse-poppler-flags.m4 [WIN32]: Add '-lgdi32' to POPPLER_LIBS. diff --git a/Build/source/m4/kpse-poppler-flags.m4 b/Build/source/m4/kpse-poppler-flags.m4 index 029e495d64c..4e3823f0036 100644 --- a/Build/source/m4/kpse-poppler-flags.m4 +++ b/Build/source/m4/kpse-poppler-flags.m4 @@ -33,11 +33,10 @@ AC_DEFUN([KPSE_POPPLER_OPTIONS], # ---------------------- AC_DEFUN([KPSE_POPPLER_SYSTEM_FLAGS], [AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl -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`" +if $PKG_CONFIG poppler --atleast-version=0.18; then + POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags` POPPLER_LIBS=`$PKG_CONFIG poppler --libs` elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then - AC_MSG_ERROR([did not find poppler-0.12 or better]) + AC_MSG_ERROR([did not find poppler-0.18 or better]) fi ]) # KPSE_POPPLER_SYSTEM_FLAGS diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in index 24e504793d8..d8ee4e1053a 100644 --- a/Build/source/texk/web2c/c-auto.in +++ b/Build/source/texk/web2c/c-auto.in @@ -46,9 +46,6 @@ /* Define to 1 if you have the `access' function. */ #undef HAVE_ACCESS -/* Define to 1 if class `Annot' has the `decRefCnt' member. */ -#undef HAVE_ANNOTDECREFCNT - /* Define to 1 if you have the header file. */ #undef HAVE_ASSERT_H diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index e2c9edcc9e6..3a1ca87248c 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -22688,12 +22688,11 @@ 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.12; then - POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' - POPPLER_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`" + if $PKG_CONFIG poppler --atleast-version=0.18; then + POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags` POPPLER_LIBS=`$PKG_CONFIG poppler --libs` elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then - as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5 + as_fn_error $? "did not find poppler-0.18 or better" "$LINENO" 5 fi else POPPLER_INCLUDES="-I$kpse_BLD/libs/poppler -I$kpse_BLD/libs/poppler/goo -I$kpse_BLD/libs/poppler/poppler" @@ -22959,57 +22958,6 @@ _ACEOF -# Checks for xpdf poppler 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 Annot::decRefCnt" >&5 -$as_echo_n "checking for Annot::decRefCnt... " >&6; } -if ${kpse_cv_have_Annot_decRefCnt+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -int -main () -{ -Annot *an; an->decRefCnt(); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - kpse_cv_have_Annot_decRefCnt=yes -else - kpse_cv_have_Annot_decRefCnt=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_Annot_decRefCnt" >&5 -$as_echo "$kpse_cv_have_Annot_decRefCnt" >&6; } -if test "x$kpse_cv_have_Annot_decRefCnt" = xyes; then : - -$as_echo "#define HAVE_ANNOTDECREFCNT 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 diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index c9e62a8c2b5..7e900972dde 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -278,22 +278,6 @@ KPSE_ADD_FLAGS([kpathsea]) AC_CHECK_SIZEOF([off_t], , AC_INCLUDES_DEFAULT [#include ]) -# Checks for xpdf poppler features. -KPSE_ADD_FLAGS([poppler]) -AC_LANG_PUSH([C++]) -AC_CACHE_CHECK([for Annot::decRefCnt], - [kpse_cv_have_Annot_decRefCnt], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -#include -#include -#include ]], - [[Annot *an; an->decRefCnt();]])], - [kpse_cv_have_Annot_decRefCnt=yes], - [kpse_cv_have_Annot_decRefCnt=no])]) -AS_IF([test "x$kpse_cv_have_Annot_decRefCnt" = xyes], - [AC_DEFINE([HAVE_ANNOTDECREFCNT], 1, - [Define to 1 if class `Annot' has the `decRefCnt' member.])]) -AC_LANG_POP([C++]) KPSE_RESTORE_FLAGS dnl Write output here, instead of putting a zillion -D's on the command line. diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 328adb851e3..979392e7942 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,8 @@ +2012-11-20 Peter Breitenlohner + + * lua/lepdflib.cc: No need to test for Annot::decRefCnt with + poppler 0.18 or better. + 2012-11-06 Akira Kakuto * pdf/pdflistout.w: sync with r4471 (a bug fix by H. Henkel). diff --git a/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc b/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc index 358931e6081..b003b6b1931 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc +++ b/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc @@ -350,11 +350,7 @@ static int m_Annot__gc(lua_State * L) printf("\n===== Annot GC ===== uin=<%p>\n", uin); #endif if (uin->atype == ALLOC_LEPDF) -#ifdef HAVE_ANNOTDECREFCNT ((Annot *) uin->d)->decRefCnt(); -#else - delete(Annot *) uin->d; -#endif return 0; } -- cgit v1.2.3