diff options
| -rwxr-xr-x | Build/source/configure | 2 | ||||
| -rw-r--r-- | Build/source/m4/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/m4/kpse-cairo-flags.m4 | 2 | ||||
| -rw-r--r-- | Build/source/texk/web2c/ChangeLog | 4 | ||||
| -rwxr-xr-x | Build/source/texk/web2c/configure | 42 | ||||
| -rw-r--r-- | Build/source/texk/web2c/configure.ac | 1 |
6 files changed, 18 insertions, 37 deletions
diff --git a/Build/source/configure b/Build/source/configure index 24f1bb466e2..76585ead896 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -20375,7 +20375,7 @@ if $PKG_CONFIG cairo --atleast-version=1.12; then CAIRO_INCLUDES=`$PKG_CONFIG cairo --cflags` CAIRO_LIBS=`$PKG_CONFIG cairo --libs` elif test "x$need_cairo:$with_system_cairo" = xyes:yes; then - as_fn_error $? "did not find cairo-1.10 or better" "$LINENO" 5 + as_fn_error $? "did not find cairo-1.12 or better" "$LINENO" 5 fi if $PKG_CONFIG poppler --atleast-version=0.12; then diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index 9c0a34b3c19..eb964951b2a 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,7 @@ +2013-03-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * kpse-cairo-flags.m4: Require cairo-1.12 or better (message). + 2013-03-19 Peter Breitenlohner <peb@mppmu.mpg.de> * kpse-pkgs.m4 (KPSE_TEXK_PKGS): bibtex8+bibtexu -> bibtex-x. diff --git a/Build/source/m4/kpse-cairo-flags.m4 b/Build/source/m4/kpse-cairo-flags.m4 index 86404e9e5dd..c7a6c9bf65b 100644 --- a/Build/source/m4/kpse-cairo-flags.m4 +++ b/Build/source/m4/kpse-cairo-flags.m4 @@ -34,6 +34,6 @@ if $PKG_CONFIG cairo --atleast-version=1.12; then CAIRO_INCLUDES=`$PKG_CONFIG cairo --cflags` CAIRO_LIBS=`$PKG_CONFIG cairo --libs` elif test "x$need_cairo:$with_system_cairo" = xyes:yes; then - AC_MSG_ERROR([did not find cairo-1.10 or better]) + AC_MSG_ERROR([did not find cairo-1.12 or better]) fi ]) # KPSE_CAIRO_SYSTEM_FLAGS diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 0337424f44a..9ab30bf29d3 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2013-03-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Drop duplicate KPSE_XPDF_FLAGS. + 2013-03-21 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Reorder included Makefile fragments and drop the diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 703dff897a9..ed5205c9ea4 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -665,14 +665,14 @@ ZZIPLIB_RULE ZZIPLIB_DEPEND ZZIPLIB_LIBS ZZIPLIB_INCLUDES -POPPLER_RULE -POPPLER_DEPEND -POPPLER_LIBS -POPPLER_INCLUDES XPDF_RULE XPDF_DEPEND XPDF_LIBS XPDF_INCLUDES +POPPLER_RULE +POPPLER_DEPEND +POPPLER_LIBS +POPPLER_INCLUDES CAIRO_RULE CAIRO_DEPEND CAIRO_LIBS @@ -993,8 +993,8 @@ with_system_libpng with_system_freetype2 with_system_pixman with_system_cairo -with_system_xpdf with_system_poppler +with_system_xpdf with_system_zziplib with_system_teckit with_teckit_includes @@ -1741,10 +1741,10 @@ Optional Packages: pkg-config) --with-system-cairo use installed cairo headers and library (requires pkg-config) - --with-system-xpdf use installed poppler headers and library instead of - xpdf library from TL (requires pkg-config) --with-system-poppler use installed poppler headers and library (requires pkg-config) + --with-system-xpdf use installed poppler headers and library instead of + xpdf library from TL (requires pkg-config) --with-system-zziplib use installed zziplib headers and library (requires pkg-config) --with-system-teckit use installed teckit headers and library @@ -23076,7 +23076,7 @@ if test "x$with_system_cairo" = xyes; then CAIRO_INCLUDES=`$PKG_CONFIG cairo --cflags` CAIRO_LIBS=`$PKG_CONFIG cairo --libs` elif test "x$need_cairo:$with_system_cairo" = xyes:yes; then - as_fn_error $? "did not find cairo-1.10 or better" "$LINENO" 5 + as_fn_error $? "did not find cairo-1.12 or better" "$LINENO" 5 fi else CAIRO_INCLUDES="-I$kpse_BLD/libs/cairo/cairo" @@ -23089,32 +23089,6 @@ ${top_builddir}/../../libs/cairo/cairo/cairo.h: cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi -## _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags - -# Check whether --with-system-xpdf was given. -if test "${with_system_xpdf+set}" = set; then : - withval=$with_system_xpdf; -fi -if test "x$with_system_xpdf" = xyes; then - if $PKG_CONFIG poppler --atleast-version=0.12; then - POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' - XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`" - XPDF_LIBS=`$PKG_CONFIG poppler --libs` -elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then - as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5 -fi -else - XPDF_INCLUDES="-DPDF_PARSER_ONLY -I$kpse_BLD/libs/xpdf -I$kpse_BLD/libs/xpdf/goo -I$kpse_BLD/libs/xpdf/xpdf" - XPDF_LIBS="$kpse_BLD/libs/xpdf/libxpdf.a" - XPDF_DEPEND='${top_builddir}/../../libs/xpdf/libxpdf.a' - XPDF_RULE='# Rebuild libxpdf -$(XPDF_DEPEND): ${top_builddir}/../../libs/xpdf/xpdf/Stream.h - cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/xpdf/xpdf/Stream.h: - cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi -test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32" - ## _KPSE_LIB_FLAGS: Setup poppler (-lpoppler) flags # Check whether --with-system-poppler was given. diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index d21973e9ec7..f6d2763c8c3 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -276,7 +276,6 @@ KPSE_LIBPNG_FLAGS KPSE_FREETYPE2_FLAGS KPSE_PIXMAN_FLAGS KPSE_CAIRO_FLAGS -KPSE_XPDF_FLAGS KPSE_POPPLER_FLAGS KPSE_XPDF_FLAGS KPSE_ZZIPLIB_FLAGS |