diff options
26 files changed, 660 insertions, 318 deletions
diff --git a/Build/source/configure b/Build/source/configure index 3761a0bd9b6..c7f9151e231 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -5388,6 +5388,20 @@ $as_echo "$as_me: Using \`poppler' headers and library from TL tree" >&6;} ac_configure_args="$ac_configure_args '--without-system-poppler'" fi fi +if test "x$with_system_poppler" = xyes; then + if test "x$with_system_zlib" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`zlib' headers and library" >&5 +$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;} + with_system_zlib=yes + ac_configure_args="$ac_configure_args '--with-system-zlib'" + elif test "x$with_system_zlib" != xyes; then + as_fn_error $? "Sorry, \`--with-system-poppler' requires \`--with-system-zlib'" "$LINENO" 5 + fi +fi + +test "x$need_poppler" = xyes && { + need_zlib=yes +} ## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ @@ -20184,7 +20198,7 @@ fi ## libs/poppler/ac/poppler.ac: configure.ac fragment for the TeX Live subdirectory libs/poppler/ -## basic check of system poppler (poppler) +## basic check of system poppler ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 50f5e195abc..5e0b15d13cc 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -4661,6 +4661,20 @@ $as_echo "$as_me: Assuming installed \`poppler' headers and library" >&6;} fi ac_configure_args="$ac_configure_args '--with-system-poppler=$with_system_poppler'" fi +if test "x$with_system_poppler" = xyes; then + if test "x$with_system_zlib" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`zlib' headers and library" >&5 +$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;} + with_system_zlib=yes + ac_configure_args="$ac_configure_args '--with-system-zlib'" + elif test "x$with_system_zlib" != xyes; then + as_fn_error $? "Sorry, \`--with-system-poppler' requires \`--with-system-zlib'" "$LINENO" 5 + fi +fi + +test "x$need_poppler" = xyes && { + need_zlib=yes +} ## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog new file mode 100644 index 00000000000..38f011fd39f --- /dev/null +++ b/Build/source/libs/poppler/ChangeLog @@ -0,0 +1,10 @@ +2011-04-14 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am, ac/poppler.ac, ac/withenable.ac, configure.ac: + Better integration into the TeX Live build system. + +2011-04-12 Taco Hoekwater <taco@luatex.org> + + Imported poppler-0.12.4 source tree from: + http://poppler.freedesktop.org/ + diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am index 86a3f311427..9d443e43dee 100644 --- a/Build/source/libs/poppler/Makefile.am +++ b/Build/source/libs/poppler/Makefile.am @@ -6,17 +6,6 @@ ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. ## -#======================================================================== -## -## Main poppler Makefile. -## Goo library Makefile -## FoFi library Makefile -## poppler Makefile -## -## Copyright 1996-2003 Glyph & Cog, LLC -## -#======================================================================== -## ACLOCAL_AMFLAGS = -I ../../m4 # Rebuild @@ -41,8 +30,9 @@ GOO_SRC = $(top_srcdir)/$(POPPLER_TREE)/goo FOFI_SRC = $(top_srcdir)/$(POPPLER_TREE)/fofi POPPLER_SRC = $(top_srcdir)/$(POPPLER_TREE)/poppler -INCLUDES = -Igoo -Ifofi -Ipoppler -I$(GOO_SRC) -I$(FOFI_SRC) -I$(POPPLER_SRC) +INCLUDES = -Igoo -Ifofi -Ipoppler -I$(GOO_SRC) -I$(FOFI_SRC) -I$(POPPLER_SRC) $(ZLIB_INCLUDES) AM_CPPFLAGS = -DPDF_PARSER_ONLY -DPOPPLER_DATADIR='"."' +AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES = libpoppler.a @@ -84,6 +74,7 @@ poppler_libpoppler_a_sources = \ $(POPPLER_SRC)/Dict.cc \ $(POPPLER_SRC)/Error.cc \ $(POPPLER_SRC)/FileSpec.cc \ + $(POPPLER_SRC)/FlateStream.cc \ $(POPPLER_SRC)/FontEncodingTables.cc \ $(POPPLER_SRC)/FontInfo.cc \ $(POPPLER_SRC)/Form.cc \ @@ -122,3 +113,14 @@ poppler_libpoppler_a_sources = \ $(POPPLER_SRC)/XRef.cc \ $(POPPLER_SRC)/XpdfPluginAPI.cc +$(libpoppler_a_OBJECTS): config.force + +config.force: $(ZLIB_DEPEND) + echo timestamp >config.force + $(SHELL) ./config.status --recheck + +DISTCLEANFILES = config.force + +## Rebuild zlib +@ZLIB_RULE@ + diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in index 1b5cec5007f..6b61a22dafb 100644 --- a/Build/source/libs/poppler/Makefile.in +++ b/Build/source/libs/poppler/Makefile.in @@ -36,21 +36,23 @@ subdir = . DIST_COMMON = $(am__configure_deps) $(srcdir)/../../build-aux/depcomp \ $(srcdir)/../../build-aux/install-sh \ $(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/aconf.h.in \ - $(top_srcdir)/configure \ - $(top_srcdir)/poppler-0.12.4/config.h.in \ - ../../build-aux/config.guess ../../build-aux/config.sub \ - ../../build-aux/depcomp ../../build-aux/install-sh \ - ../../build-aux/ltmain.sh ../../build-aux/missing \ - ../../build-aux/texinfo.tex ../../build-aux/ylwrap + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/configure ../../build-aux/config.guess \ + ../../build-aux/config.sub ../../build-aux/depcomp \ + ../../build-aux/install-sh ../../build-aux/ltmain.sh \ + ../../build-aux/missing ../../build-aux/texinfo.tex \ + ../../build-aux/ylwrap ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ + $(top_srcdir)/../../m4/kpse-warnings.m4 \ + $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = aconf.h config.h +CONFIG_HEADER = config.h $(top_builddir)/poppler/poppler-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) @@ -69,13 +71,14 @@ am__objects_3 = Annot.$(OBJEXT) Array.$(OBJEXT) BuiltinFont.$(OBJEXT) \ BuiltinFontTables.$(OBJEXT) CMap.$(OBJEXT) Catalog.$(OBJEXT) \ CharCodeToUnicode.$(OBJEXT) DateInfo.$(OBJEXT) \ Decrypt.$(OBJEXT) Dict.$(OBJEXT) Error.$(OBJEXT) \ - FileSpec.$(OBJEXT) FontEncodingTables.$(OBJEXT) \ - FontInfo.$(OBJEXT) Form.$(OBJEXT) Function.$(OBJEXT) \ - Gfx.$(OBJEXT) GfxFont.$(OBJEXT) GfxState.$(OBJEXT) \ - GlobalParams.$(OBJEXT) JArithmeticDecoder.$(OBJEXT) \ - JBIG2Stream.$(OBJEXT) JPXStream.$(OBJEXT) Lexer.$(OBJEXT) \ - Link.$(OBJEXT) Movie.$(OBJEXT) NameToCharCode.$(OBJEXT) \ - Object.$(OBJEXT) OptionalContent.$(OBJEXT) Outline.$(OBJEXT) \ + FileSpec.$(OBJEXT) FlateStream.$(OBJEXT) \ + FontEncodingTables.$(OBJEXT) FontInfo.$(OBJEXT) Form.$(OBJEXT) \ + Function.$(OBJEXT) Gfx.$(OBJEXT) GfxFont.$(OBJEXT) \ + GfxState.$(OBJEXT) GlobalParams.$(OBJEXT) \ + JArithmeticDecoder.$(OBJEXT) JBIG2Stream.$(OBJEXT) \ + JPXStream.$(OBJEXT) Lexer.$(OBJEXT) Link.$(OBJEXT) \ + Movie.$(OBJEXT) NameToCharCode.$(OBJEXT) Object.$(OBJEXT) \ + OptionalContent.$(OBJEXT) Outline.$(OBJEXT) \ OutputDev.$(OBJEXT) PDFDoc.$(OBJEXT) PDFDocEncoding.$(OBJEXT) \ PSOutputDev.$(OBJEXT) PSTokenizer.$(OBJEXT) Page.$(OBJEXT) \ PageLabelInfo.$(OBJEXT) PageTransition.$(OBJEXT) \ @@ -87,7 +90,7 @@ am__objects_3 = Annot.$(OBJEXT) Array.$(OBJEXT) BuiltinFont.$(OBJEXT) \ nodist_libpoppler_a_OBJECTS = $(am__objects_1) $(am__objects_2) \ $(am__objects_3) libpoppler_a_OBJECTS = $(nodist_libpoppler_a_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/poppler depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -200,6 +203,11 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +WARNING_CFLAGS = @WARNING_CFLAGS@ +WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ +ZLIB_DEPEND = @ZLIB_DEPEND@ +ZLIB_INCLUDES = @ZLIB_INCLUDES@ +ZLIB_LIBS = @ZLIB_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -243,17 +251,15 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - -#======================================================================== -#======================================================================== ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(POPPLER_TREE) $(POPPLER_TREE)-PATCHES SUBDIRS = goo fofi poppler GOO_SRC = $(top_srcdir)/$(POPPLER_TREE)/goo FOFI_SRC = $(top_srcdir)/$(POPPLER_TREE)/fofi POPPLER_SRC = $(top_srcdir)/$(POPPLER_TREE)/poppler -INCLUDES = -Igoo -Ifofi -Ipoppler -I$(GOO_SRC) -I$(FOFI_SRC) -I$(POPPLER_SRC) +INCLUDES = -Igoo -Ifofi -Ipoppler -I$(GOO_SRC) -I$(FOFI_SRC) -I$(POPPLER_SRC) $(ZLIB_INCLUDES) AM_CPPFLAGS = -DPDF_PARSER_ONLY -DPOPPLER_DATADIR='"."' +AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES = libpoppler.a nodist_libpoppler_a_SOURCES = \ $(goo_libGoo_a_sources) \ @@ -292,6 +298,7 @@ poppler_libpoppler_a_sources = \ $(POPPLER_SRC)/Dict.cc \ $(POPPLER_SRC)/Error.cc \ $(POPPLER_SRC)/FileSpec.cc \ + $(POPPLER_SRC)/FlateStream.cc \ $(POPPLER_SRC)/FontEncodingTables.cc \ $(POPPLER_SRC)/FontInfo.cc \ $(POPPLER_SRC)/Form.cc \ @@ -330,7 +337,8 @@ poppler_libpoppler_a_sources = \ $(POPPLER_SRC)/XRef.cc \ $(POPPLER_SRC)/XpdfPluginAPI.cc -all: aconf.h config.h +DISTCLEANFILES = config.force +all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: @@ -370,32 +378,22 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): -aconf.h: stamp-h1 +config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ else :; fi -stamp-h1: $(srcdir)/aconf.h.in $(top_builddir)/config.status +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status aconf.h -$(srcdir)/aconf.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ -config.h: stamp-h2 - @if test ! -f $@; then \ - rm -f stamp-h2; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h2; \ - else :; fi - -stamp-h2: $(top_srcdir)/poppler-0.12.4/config.h.in $(top_builddir)/config.status - @rm -f stamp-h2 - cd $(top_builddir) && $(SHELL) ./config.status config.h - distclean-hdr: - -rm -f aconf.h stamp-h1 config.h stamp-h2 + -rm -f config.h stamp-h1 clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -423,6 +421,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Error.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileSpec.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FixedPoint.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FlateStream.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FoFiBase.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FoFiEncodings.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FoFiTrueType.Po@am__quote@ @@ -867,6 +866,20 @@ FileSpec.obj: $(POPPLER_SRC)/FileSpec.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileSpec.obj `if test -f '$(POPPLER_SRC)/FileSpec.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/FileSpec.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/FileSpec.cc'; fi` +FlateStream.o: $(POPPLER_SRC)/FlateStream.cc +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FlateStream.o -MD -MP -MF $(DEPDIR)/FlateStream.Tpo -c -o FlateStream.o `test -f '$(POPPLER_SRC)/FlateStream.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/FlateStream.cc +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/FlateStream.Tpo $(DEPDIR)/FlateStream.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(POPPLER_SRC)/FlateStream.cc' object='FlateStream.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FlateStream.o `test -f '$(POPPLER_SRC)/FlateStream.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/FlateStream.cc + +FlateStream.obj: $(POPPLER_SRC)/FlateStream.cc +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FlateStream.obj -MD -MP -MF $(DEPDIR)/FlateStream.Tpo -c -o FlateStream.obj `if test -f '$(POPPLER_SRC)/FlateStream.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/FlateStream.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/FlateStream.cc'; fi` +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/FlateStream.Tpo $(DEPDIR)/FlateStream.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(POPPLER_SRC)/FlateStream.cc' object='FlateStream.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FlateStream.obj `if test -f '$(POPPLER_SRC)/FlateStream.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/FlateStream.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/FlateStream.cc'; fi` + FontEncodingTables.o: $(POPPLER_SRC)/FontEncodingTables.cc @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FontEncodingTables.o -MD -MP -MF $(DEPDIR)/FontEncodingTables.Tpo -c -o FontEncodingTables.o `test -f '$(POPPLER_SRC)/FontEncodingTables.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/FontEncodingTables.cc @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/FontEncodingTables.Tpo $(DEPDIR)/FontEncodingTables.Po @@ -1465,7 +1478,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: tags-recursive $(HEADERS) $(SOURCES) aconf.h.in $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) set x; \ here=`pwd`; \ @@ -1482,7 +1495,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) aconf.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) aconf.h.in $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -1500,9 +1513,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) aconf.h.in $(TAGS_DEPENDENCIES) \ fi; \ fi ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) aconf.h.in $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) aconf.h.in $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -1700,7 +1713,7 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-recursive -all-am: Makefile $(LIBRARIES) aconf.h config.h +all-am: Makefile $(LIBRARIES) config.h installdirs: installdirs-recursive installdirs-am: install: install-recursive @@ -1724,6 +1737,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -1829,6 +1843,14 @@ rebuild: all dist-hook: rm -rf `find $(distdir) -name .svn` +$(libpoppler_a_OBJECTS): config.force + +config.force: $(ZLIB_DEPEND) + echo timestamp >config.force + $(SHELL) ./config.status --recheck + +@ZLIB_RULE@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/Build/source/libs/poppler/ac/poppler.ac b/Build/source/libs/poppler/ac/poppler.ac index 197e4d12dad..f0b0ef93fd5 100644 --- a/Build/source/libs/poppler/ac/poppler.ac +++ b/Build/source/libs/poppler/ac/poppler.ac @@ -1,9 +1,9 @@ ## libs/poppler/ac/poppler.ac: configure.ac fragment for the TeX Live subdirectory libs/poppler/ dnl -dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl -## basic check of system poppler (poppler) +## basic check of system poppler KPSE_TRY_LIBXX([poppler], [#include <GfxFont.h>], [GfxFont *gfxFont; gfxFont->decRefCnt();]) diff --git a/Build/source/libs/poppler/ac/withenable.ac b/Build/source/libs/poppler/ac/withenable.ac index 1e5b3a42c5e..46dfa070b8a 100644 --- a/Build/source/libs/poppler/ac/withenable.ac +++ b/Build/source/libs/poppler/ac/withenable.ac @@ -1,7 +1,7 @@ ## libs/poppler/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/poppler/ dnl -dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for poppler -KPSE_WITH_LIB([poppler]) +KPSE_WITH_LIB([poppler], [zlib]) diff --git a/Build/source/libs/poppler/aclocal.m4 b/Build/source/libs/poppler/aclocal.m4 index 76a153698ad..7205d4c8866 100644 --- a/Build/source/libs/poppler/aclocal.m4 +++ b/Build/source/libs/poppler/aclocal.m4 @@ -989,3 +989,6 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([../../m4/kpse-common.m4]) +m4_include([../../m4/kpse-warnings.m4]) +m4_include([../../m4/kpse-zlib-flags.m4]) diff --git a/Build/source/libs/poppler/aconf.h.in b/Build/source/libs/poppler/config.h.in index 572d940b20e..8e857a8c00e 100644 --- a/Build/source/libs/poppler/aconf.h.in +++ b/Build/source/libs/poppler/config.h.in @@ -1,21 +1,7 @@ -/* aconf.h.in. Generated from configure.ac by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ -/* - * aconf.h - * - * Copyright 2002-2003 Glyph & Cog, LLC - */ - -#ifndef ACONF_H -#define ACONF_H - -/* - * Enable C++ exceptions. - */ -#undef USE_EXCEPTIONS - -/* Use A4 paper size instead of Letter for PostScript output */ -#undef A4_PAPER +/* Use zlib instead of builtin zlib decoder. */ +#undef ENABLE_ZLIB /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. */ @@ -27,6 +13,9 @@ /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY +/* Define to 1 if you have the `gmtime_r' function. */ +#undef HAVE_GMTIME_R + /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H @@ -36,9 +25,6 @@ /* Define to 1 if you have the `mkstemp' function. */ #undef HAVE_MKSTEMP -/* Define to 1 if you have the `mkstemps' function. */ -#undef HAVE_MKSTEMPS - /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ #undef HAVE_NDIR_H @@ -65,28 +51,22 @@ */ #undef HAVE_SYS_NDIR_H -/* Define to 1 if you have the <sys/select.h> header file. */ -#undef HAVE_SYS_SELECT_H - /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H -/* Define to 1 if you have the <sys/time.h> header file. */ -#undef HAVE_SYS_TIME_H - /* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H -/* Define to 1 if you have the <time.h> header file. */ -#undef HAVE_TIME_H - /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Enable multithreading support */ +/* Define to 1 if you have the <zlib.h> header file. */ +#undef HAVE_ZLIB_H + +/* Enable multithreading support. */ #undef MULTITHREADED -/* Include support for OPI comments */ +/* Generate OPI comments in PS output. */ #undef OPI_SUPPORT /* Define to the address where bug reports for this package should be sent. */ @@ -110,6 +90,12 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Throw exceptions to deal with not enough memory and similar problems */ +#undef USE_EXCEPTIONS + +/* Use fixed point arithmetic */ +#undef USE_FIXEDPOINT + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS @@ -118,5 +104,3 @@ /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES - -#endif diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure index c8498a85b47..4a634bb3564 100755 --- a/Build/source/libs/poppler/configure +++ b/Build/source/libs/poppler/configure @@ -607,9 +607,17 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS POPPLER_TREE +build_FALSE +build_TRUE +ZLIB_RULE +ZLIB_DEPEND +ZLIB_LIBS +ZLIB_INCLUDES EGREP GREP CPP +WARNING_CXXFLAGS +WARNING_CFLAGS LN_S RANLIB am__fastdepCXX_FALSE @@ -702,11 +710,16 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_maintainer_mode -enable_a4_paper +enable_dependency_tracking +enable_compiler_warnings enable_opi enable_multithreaded -enable_dependency_tracking +enable_exceptions +enable_fixedpoint enable_largefile +with_system_zlib +with_zlib_includes +with_zlib_libdir ' ac_precious_vars='build_alias host_alias @@ -1339,14 +1352,26 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-a4-paper use A4 paper size instead of Letter for PostScript - output - --enable-opi include support for OPI comments - --enable-multithreaded include support for multithreading --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors + --enable-compiler-warnings=[no|min|yes|max|all] + Turn on compiler warnings [default: yes if + maintainer-mode, min otherwise] + --enable-opi include support for OPI comments + --enable-multithreaded include support for multithreading + --enable-exceptions use C++ exceptions + --enable-fixedpoint use fixed point (instead of floating point) + arithmetic --disable-largefile omit support for large files +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-system-zlib use installed zlib headers and library + --with-zlib-includes=DIR + zlib headers installed in DIR + --with-zlib-libdir=DIR zlib library installed in DIR + Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@ -2706,40 +2731,6 @@ fi -# Check whether --enable-a4-paper was given. -if test "${enable_a4_paper+set}" = set; then : - enableval=$enable_a4_paper; if test "x$enableval" = xyes; then - -$as_echo "#define A4_PAPER 1" >>confdefs.h - -fi - -fi - - -# Check whether --enable-opi was given. -if test "${enable_opi+set}" = set; then : - enableval=$enable_opi; if test "x$enableval" = xyes; then - -$as_echo "#define OPI_SUPPORT 1" >>confdefs.h - -fi - -fi - - -# Check whether --enable-multithreaded was given. -if test "${enable_multithreaded+set}" = set; then : - enableval=$enable_multithreaded; if test "x$enableval" = xyes; then - -$as_echo "#define MULTITHREADED 1" >>confdefs.h - -fi - -fi - - - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4207,6 +4198,150 @@ $as_echo "no, using $LN_S" >&6; } fi +# Check whether --enable-compiler-warnings was given. +if test "${enable_compiler_warnings+set}" = set; then : + enableval=$enable_compiler_warnings; +fi +case $enable_compiler_warnings in #( + no | min | yes | max | all) : + ;; #( + *) : + if test "x$enable_maintainer_mode" = xyes; then : + enable_compiler_warnings=yes +else + enable_compiler_warnings=min +fi ;; +esac + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 +$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } +if ${kpse_cv_warning_cflags+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$enable_compiler_warnings" = xno; then + kpse_cv_warning_cflags= +elif test "x$GCC" = xyes; then + kpse_cv_warning_cflags="-Wimplicit -Wreturn-type" +case `$CC -dumpversion` in #( + 3.4.* | 4.*) : + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #( + *) : + ;; +esac +case `$CC -dumpversion` in #( + 3.[234].* | 4.*) : + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #( + *) : + ;; +esac +if test "x$enable_compiler_warnings" != xmin; then + kpse_cv_warning_cflags="-Wall -Wunused $kpse_cv_warning_cflags" + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations" + if test "x$enable_compiler_warnings" != xyes; then + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith" + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings" + case `$CC -dumpversion` in #( + 3.4.* | 4.*) : + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #( + *) : + ;; +esac + if test "x$enable_compiler_warnings" != xmax; then + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wshadow" + fi + fi +fi +else + kpse_cv_warning_cflags= # FIXME: warning flags for non-GNU C compilers +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_warning_cflags" >&5 +$as_echo "$kpse_cv_warning_cflags" >&6; } +WARNING_CFLAGS=$kpse_cv_warning_cflags + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C++ compiler" >&5 +$as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; } +if ${kpse_cv_warning_cxxflags+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$enable_compiler_warnings" = xno; then + kpse_cv_warning_cxxflags= +elif test "x$GXX" = xyes; then + kpse_cv_warning_cxxflags="-Wimplicit -Wreturn-type" +case `$CXX -dumpversion` in #( + 3.[234].* | 4.*) : + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #( + *) : + ;; +esac +if test "x$enable_compiler_warnings" != xmin; then + kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags" + if test "x$enable_compiler_warnings" != xyes; then + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith" + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align -Wwrite-strings" + fi + if test "x$enable_compiler_warnings" != xmax; then + kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow" + fi +fi +else + kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_warning_cxxflags" >&5 +$as_echo "$kpse_cv_warning_cxxflags" >&6; } +WARNING_CXXFLAGS=$kpse_cv_warning_cxxflags + + + + + + +# Check whether --enable-opi was given. +if test "${enable_opi+set}" = set; then : + enableval=$enable_opi; if test "x$enableval" = xyes; then + +$as_echo "#define OPI_SUPPORT 1" >>confdefs.h + +fi + +fi + + +# Check whether --enable-multithreaded was given. +if test "${enable_multithreaded+set}" = set; then : + enableval=$enable_multithreaded; if test "x$enableval" = xyes; then + +$as_echo "#define MULTITHREADED 1" >>confdefs.h + +fi + +fi + + +# Check whether --enable-exceptions was given. +if test "${enable_exceptions+set}" = set; then : + enableval=$enable_exceptions; if test "x$enableval" = xyes; then + +$as_echo "#define USE_EXCEPTIONS 1" >>confdefs.h + +fi + +fi + + +# Check whether --enable-fixedpoint was given. +if test "${enable_fixedpoint+set}" = set; then : + enableval=$enable_fixedpoint; if test "x$enableval" = xyes; then + +$as_echo "#define USE_FIXEDPOINT 1" >>confdefs.h + +fi + +fi + + ac_ext=c @@ -4606,13 +4741,12 @@ fi done -for ac_header in strings.h sys/select.h time.h sys/time.h +for ac_header in strings.h do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + ac_fn_c_check_header_mongrel "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default" +if test "x$ac_cv_header_strings_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_STRINGS_H 1 _ACEOF fi @@ -4779,7 +4913,7 @@ fi -for ac_func in popen mkstemp mkstemps gettimeofday +for ac_func in gettimeofday gmtime_r popen mkstemp do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -5058,14 +5192,104 @@ $as_echo "#define HAVE_FSEEKO 1" >>confdefs.h fi -ac_config_headers="$ac_config_headers aconf.h" +ac_config_headers="$ac_config_headers config.h" +ac_config_headers="$ac_config_headers poppler/poppler-config.h:poppler-0.12.4/poppler/poppler-config.h.in" +## _KPSE_INIT: Initialize TL infrastructure +kpse_BLD=`(cd "./../../." && pwd)` +kpse_SRC=`(cd "$srcdir/../../." && pwd)` -ac_config_headers="$ac_config_headers config.h:poppler-0.12.4/config.h.in" +## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags +# Check whether --with-system-zlib was given. +if test "${with_system_zlib+set}" = set; then : + withval=$with_system_zlib; +fi + +# Check whether --with-zlib-includes was given. +if test "${with_zlib_includes+set}" = set; then : + withval=$with_zlib_includes; +fi + +# Check whether --with-zlib-libdir was given. +if test "${with_zlib_libdir+set}" = set; then : + withval=$with_zlib_libdir; +fi +if test "x$with_system_zlib" = xyes; then + if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then + ZLIB_INCLUDES="-I$with_zlib_includes" +fi +ZLIB_LIBS="-lz" +if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then + ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" +fi +else + ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ + -e "s,SRC/,$kpse_SRC/,g" \ + -e "s,BLD/,$kpse_BLD/,g"` + ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ + -e "s,BLD/,$kpse_BLD/,g"` + + ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ + -e 's,BLD/,${top_builddir}/../../,g'` + ZLIB_RULE='# Rebuild libz +$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h + cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild +${top_builddir}/../../libs/zlib/include/zconf.h: + cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild' +fi + + + if test "x$enable_build" != xno; then + build_TRUE= + build_FALSE='#' +else + build_TRUE='#' + build_FALSE= +fi + + +if test "x$enable_build" != xno || test -f config.force; then + +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + +eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$ZLIB_LIBS \$LIBS\" + +ac_fn_c_check_func "$LINENO" "inflate" "ac_cv_func_inflate" +if test "x$ac_cv_func_inflate" = xyes; then : + +else + as_fn_error $? "zlib not found" "$LINENO" 5 +fi + +for ac_header in zlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" +if test "x$ac_cv_header_zlib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ZLIB_H 1 +_ACEOF + +else + as_fn_error $? "zlib not found" "$LINENO" 5 +fi + +done + + +$as_echo "#define ENABLE_ZLIB 1" >>confdefs.h + +CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + + +echo timestamp >config.force +fi POPPLER_TREE=poppler-0.12.4 @@ -5206,6 +5430,10 @@ 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 "${build_TRUE}" && test -z "${build_FALSE}"; then + as_fn_error $? "conditional \"build\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -5811,8 +6039,8 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "aconf.h") CONFIG_HEADERS="$CONFIG_HEADERS aconf.h" ;; - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:poppler-0.12.4/config.h.in" ;; + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "poppler/poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler/poppler-config.h:poppler-0.12.4/poppler/poppler-config.h.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "poppler/Makefile") CONFIG_FILES="$CONFIG_FILES poppler/Makefile" ;; "goo/Makefile") CONFIG_FILES="$CONFIG_FILES goo/Makefile" ;; @@ -6507,8 +6735,8 @@ $as_echo X"$file" | done } ;; - "aconf.h":H) sed -e 's/^#define PACKAGE/#define POPPLER_PACKAGE/' \ - -e 's/^#define VERSION/#define POPPLER_VERSION/' aconf.h >aconf.tmp && mv -f aconf.tmp aconf.h ;; + "poppler/poppler-config.h":H) sed -e 's/^#define PACKAGE_/#define POPPLER_/' poppler/poppler-config.h >config.tmp \ + && mv -f config.tmp poppler/poppler-config.h ;; esac done # for ac_tag diff --git a/Build/source/libs/poppler/configure.ac b/Build/source/libs/poppler/configure.ac index 63bacfbfb23..97ca571d36b 100644 --- a/Build/source/libs/poppler/configure.ac +++ b/Build/source/libs/poppler/configure.ac @@ -1,12 +1,12 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -m4_define([poppler_version], [0.12.4])[]dnl using unmodified poppler-0.12.4 source tree +m4_define([poppler_version], [0.12.4])[]dnl using unmodified poppler source tree AC_INIT([poppler for TeX Live], poppler_version, [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([poppler-]poppler_version[/poppler/Array.cc]) @@ -16,20 +16,19 @@ AC_CONFIG_MACRO_DIR([../../m4]) AM_INIT_AUTOMAKE([foreign no-define]) AM_MAINTAINER_MODE -dnl ##### Optional features. -AC_ARG_ENABLE([a4-paper], - AS_HELP_STRING([--enable-a4-paper], - [use A4 paper size instead of Letter for PostScript output]), - [if test "x$enableval" = xyes; then -AC_DEFINE([A4_PAPER], 1, [Use A4 paper size instead of Letter for PostScript output]) -fi -]) +AC_PROG_CC +AC_PROG_CXX +AC_PROG_RANLIB +AC_PROG_LN_S + +KPSE_COMPILER_WARNINGS +dnl ##### Optional features. AC_ARG_ENABLE([opi], AS_HELP_STRING([--enable-opi], [include support for OPI comments]), [if test "x$enableval" = xyes; then -AC_DEFINE([OPI_SUPPORT], 1, [Include support for OPI comments]) + AC_DEFINE([OPI_SUPPORT], 1, [Generate OPI comments in PS output.]) fi ]) @@ -37,48 +36,57 @@ AC_ARG_ENABLE([multithreaded], AS_HELP_STRING([--enable-multithreaded], [include support for multithreading]), [if test "x$enableval" = xyes; then -AC_DEFINE([MULTITHREADED], 1, [Enable multithreading support]) + AC_DEFINE([MULTITHREADED], 1, [Enable multithreading support.]) fi ]) -dnl **** Check for some programs and libraries **** +AC_ARG_ENABLE([exceptions], + AS_HELP_STRING([--enable-exceptions], + [use C++ exceptions]), + [if test "x$enableval" = xyes; then + AC_DEFINE([USE_EXCEPTIONS], 1, [Throw exceptions to deal with not enough memory and similar problems]) +fi +]) -AC_PROG_CC -AC_PROG_CXX -AC_PROG_RANLIB -AC_PROG_LN_S +AC_ARG_ENABLE([fixedpoint], + AS_HELP_STRING([--enable-fixedpoint], + [use fixed point (instead of floating point) arithmetic]), + [if test "x$enableval" = xyes; then + AC_DEFINE([USE_FIXEDPOINT], 1, [Use fixed point arithmetic]) +fi +]) dnl **** Checks for header files **** -AC_CHECK_HEADERS([strings.h sys/select.h time.h sys/time.h]) +AC_CHECK_HEADERS([strings.h]) AC_HEADER_DIRENT dnl **** Checks for library functions **** -AC_CHECK_FUNCS([popen mkstemp mkstemps gettimeofday]) +AC_CHECK_FUNCS([gettimeofday gmtime_r popen mkstemp]) AC_SYS_LARGEFILE AC_FUNC_FSEEKO -AC_CONFIG_HEADERS([aconf.h], - [sed -e 's/^#define PACKAGE/#define POPPLER_PACKAGE/' \ - -e 's/^#define VERSION/#define POPPLER_VERSION/' aconf.h >aconf.tmp && mv -f aconf.tmp aconf.h]) +AC_CONFIG_HEADERS([config.h]) + +AC_CONFIG_HEADERS([poppler/poppler-config.h:poppler-]poppler_version[/poppler/poppler-config.h.in], + [sed -e 's/^#define PACKAGE_/#define POPPLER_/' poppler/poppler-config.h >config.tmp \ + && mv -f config.tmp poppler/poppler-config.h]) -AH_TOP([/* - * aconf.h - * - * Copyright 2002-2003 Glyph & Cog, LLC - */ +KPSE_ZLIB_FLAGS -#ifndef ACONF_H -#define ACONF_H +AM_CONDITIONAL([build], [test "x$enable_build" != xno]) -/* - * Enable C++ exceptions. - */ -#undef USE_EXCEPTIONS]) -AH_BOTTOM([#endif]) +if test "x$enable_build" != xno || test -f config.force; then -AC_CONFIG_HEADERS([config.h:poppler-]poppler_version[/config.h.in]) +KPSE_ADD_FLAGS([zlib]) +AC_CHECK_FUNC([inflate], , [AC_ERROR([zlib not found])]) +AC_CHECK_HEADERS([zlib.h], , [AC_ERROR([zlib not found])]) +AC_DEFINE([ENABLE_ZLIB], 1, [Use zlib instead of builtin zlib decoder.]) +KPSE_RESTORE_FLAGS + +echo timestamp >config.force +fi AC_SUBST([POPPLER_TREE], [poppler-]poppler_version) diff --git a/Build/source/libs/poppler/fofi/Makefile.in b/Build/source/libs/poppler/fofi/Makefile.in index 2f32ad12d38..e754eeeb9aa 100644 --- a/Build/source/libs/poppler/fofi/Makefile.in +++ b/Build/source/libs/poppler/fofi/Makefile.in @@ -35,11 +35,15 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/hdrs.am subdir = fofi ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ + $(top_srcdir)/../../m4/kpse-warnings.m4 \ + $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/aconf.h $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/poppler/poppler-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = @@ -96,6 +100,11 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +WARNING_CFLAGS = @WARNING_CFLAGS@ +WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ +ZLIB_DEPEND = @ZLIB_DEPEND@ +ZLIB_INCLUDES = @ZLIB_INCLUDES@ +ZLIB_LIBS = @ZLIB_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/Build/source/libs/poppler/goo/Makefile.in b/Build/source/libs/poppler/goo/Makefile.in index c396de1d694..aa0f1acaec6 100644 --- a/Build/source/libs/poppler/goo/Makefile.in +++ b/Build/source/libs/poppler/goo/Makefile.in @@ -35,11 +35,15 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/hdrs.am subdir = goo ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ + $(top_srcdir)/../../m4/kpse-warnings.m4 \ + $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/aconf.h $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/poppler/poppler-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = @@ -96,6 +100,11 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +WARNING_CFLAGS = @WARNING_CFLAGS@ +WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ +ZLIB_DEPEND = @ZLIB_DEPEND@ +ZLIB_INCLUDES = @ZLIB_INCLUDES@ +ZLIB_LIBS = @ZLIB_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.12.4-PATCHES/ChangeLog index 97f88a8559c..09d998768e7 100644 --- a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/ChangeLog +++ b/Build/source/libs/poppler/poppler-0.12.4-PATCHES/ChangeLog @@ -1,14 +1,19 @@ +2011-04-14 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-01-PDF_PARSER_ONLY: Fix PDF_PARSER_ONLY for WIN32. + + * patch-03-POPPLER_VERSION (new): #define POPPLER_VERSION. + 2011-04-12 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-02-warnings (new): poppler/Movie.cc: Cast -1 to Gulong. goo/PNGWriter.h: Add newline at end of file. - 2011-04-12 Taco Hoekwater <taco@luatex.org> Imported poppler-0.12.4 source tree from: http://poppler.freedesktop.org/ - * patch-01-PDF_PARSER_ONLY (new): FIXME. + * patch-01-PDF_PARSER_ONLY (new): Implement PDF_PARSER_ONLY. diff --git a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.12.4-PATCHES/TL-Changes index dca891b8aef..4529b6b79fd 100644 --- a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/TL-Changes +++ b/Build/source/libs/poppler/poppler-0.12.4-PATCHES/TL-Changes @@ -8,6 +8,7 @@ Removed: install-sh ltmain.sh missing + poppler/poppler-config.h Removed unused dirs: cmake diff --git a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-01-PDF_PARSER_ONLY b/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-01-PDF_PARSER_ONLY index 162a72225eb..d321a6561a8 100644 --- a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-01-PDF_PARSER_ONLY +++ b/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-01-PDF_PARSER_ONLY @@ -1,6 +1,6 @@ diff -ur poppler-0.12.4.orig/poppler/GlobalParams.cc poppler-0.12.4/poppler/GlobalParams.cc --- poppler-0.12.4.orig/poppler/GlobalParams.cc 2010-01-17 01:06:58.000000000 +0100 -+++ poppler-0.12.4/poppler/GlobalParams.cc 2011-04-12 16:17:47.000000000 +0200 ++++ poppler-0.12.4/poppler/GlobalParams.cc 2011-04-14 10:34:35.000000000 +0200 @@ -140,6 +140,7 @@ } } @@ -26,7 +26,32 @@ diff -ur poppler-0.12.4.orig/poppler/GlobalParams.cc poppler-0.12.4/poppler/Glob FcInit(); FCcfg = FcConfigGetCurrent(); #endif -@@ -944,6 +946,7 @@ +@@ -641,10 +643,12 @@ + unicodeMapCache = new UnicodeMapCache(); + cMapCache = new CMapCache(); + ++#ifndef PDF_PARSER_ONLY + #ifdef _WIN32 + baseFontsInitialized = gFalse; + winFontList = NULL; + #endif ++#endif + + #ifdef ENABLE_PLUGINS + plugins = new GooList(); +@@ -806,9 +810,11 @@ + deleteGooHash(unicodeMaps, GooString); + deleteGooList(toUnicodeDirs, GooString); + deleteGooHash(displayFonts, DisplayFontParam); ++#ifndef PDF_PARSER_ONLY + #ifdef _WIN32 + delete winFontList; + #endif ++#endif + deleteGooHash(psFonts, PSFontParam); + deleteGooList(psNamedFonts16, PSFontParam); + deleteGooList(psFonts16, PSFontParam); +@@ -944,6 +950,7 @@ return NULL; } @@ -34,7 +59,7 @@ diff -ur poppler-0.12.4.orig/poppler/GlobalParams.cc poppler-0.12.4/poppler/Glob static GBool findModifier(const char *name, const char *modifier, const char **start) { const char *match; -@@ -962,7 +965,6 @@ +@@ -962,7 +969,6 @@ } } @@ -42,29 +67,22 @@ diff -ur poppler-0.12.4.orig/poppler/GlobalParams.cc poppler-0.12.4/poppler/Glob static FcPattern *buildFcPattern(GfxFont *font) { int weight = -1, -@@ -1110,6 +1112,11 @@ +@@ -1110,7 +1116,11 @@ /* if you can't or don't want to use Fontconfig, you need to implement this function for your platform. For Windows, it's in GlobalParamsWin.cc */ +-#ifndef _MSC_VER +#ifdef PDF_PARSER_ONLY +DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) { -+ return (DisplayFontParam * )NULL; ++ return NULL; +} -+#else - #ifndef _MSC_VER ++#elif !defined(_MSC_VER) DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) { DisplayFontParam *dfp; -@@ -1170,6 +1177,7 @@ - return dfp; - } - #endif -+#endif - - GBool GlobalParams::getPSExpandSmaller() { - GBool f; + FcPattern *p=0; diff -ur poppler-0.12.4.orig/poppler/GlobalParams.h poppler-0.12.4/poppler/GlobalParams.h --- poppler-0.12.4.orig/poppler/GlobalParams.h 2010-01-17 01:06:58.000000000 +0100 -+++ poppler-0.12.4/poppler/GlobalParams.h 2011-04-12 16:17:47.000000000 +0200 ++++ poppler-0.12.4/poppler/GlobalParams.h 2011-04-14 10:32:41.000000000 +0200 @@ -37,7 +37,7 @@ #include <assert.h> #include "poppler-config.h" @@ -74,7 +92,19 @@ diff -ur poppler-0.12.4.orig/poppler/GlobalParams.h poppler-0.12.4/poppler/Globa #include <fontconfig/fontconfig.h> #endif #include "goo/gtypes.h" -@@ -169,7 +169,7 @@ +@@ -61,9 +61,11 @@ + class GlobalParams; + class GfxFont; + class Stream; ++#ifndef PDF_PARSER_ONLY + #ifdef _WIN32 + class WinFontList; + #endif ++#endif + + //------------------------------------------------------------------------ + +@@ -169,7 +171,7 @@ void setBaseDir(char *dir); @@ -83,7 +113,20 @@ diff -ur poppler-0.12.4.orig/poppler/GlobalParams.h poppler-0.12.4/poppler/Globa void setupBaseFonts(char *dir); #endif -@@ -352,7 +352,7 @@ +@@ -303,10 +305,12 @@ + GooList *toUnicodeDirs; // list of ToUnicode CMap dirs [GooString] + GooHash *displayFonts; // display font info, indexed by font name + // [DisplayFontParam] ++#ifndef PDF_PARSER_ONLY + #ifdef _WIN32 + GBool baseFontsInitialized; + WinFontList *winFontList; // system TrueType fonts + #endif ++#endif + GBool psExpandSmaller; // expand smaller pages to fill paper + GBool psShrinkLarger; // shrink larger pages to fit paper + GBool psCenter; // center pages on the paper +@@ -352,7 +356,7 @@ UnicodeMapCache *unicodeMapCache; CMapCache *cMapCache; diff --git a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-03-POPPLER_VERSION b/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-03-POPPLER_VERSION new file mode 100644 index 00000000000..759b8340198 --- /dev/null +++ b/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-03-POPPLER_VERSION @@ -0,0 +1,13 @@ +diff -ur poppler-0.12.4.orig/poppler/poppler-config.h.in poppler-0.12.4/poppler/poppler-config.h.in +--- poppler-0.12.4.orig/poppler/poppler-config.h.in 2010-02-17 23:08:16.000000000 +0100 ++++ poppler-0.12.4/poppler/poppler-config.h.in 2011-04-14 11:17:43.000000000 +0200 +@@ -50,6 +50,9 @@ + #define popplerCopyright "Copyright 2005-2009 The Poppler Developers - http://poppler.freedesktop.org" + #define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC" + ++/* Define to the version of this package. */ ++#undef PACKAGE_VERSION ++ + //------------------------------------------------------------------------ + // popen + //------------------------------------------------------------------------ diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParams.cc index 1a903c50bdb..b3329a3589f 100644 --- a/Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParams.cc +++ b/Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParams.cc @@ -643,10 +643,12 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir) unicodeMapCache = new UnicodeMapCache(); cMapCache = new CMapCache(); +#ifndef PDF_PARSER_ONLY #ifdef _WIN32 baseFontsInitialized = gFalse; winFontList = NULL; #endif +#endif #ifdef ENABLE_PLUGINS plugins = new GooList(); @@ -808,9 +810,11 @@ GlobalParams::~GlobalParams() { deleteGooHash(unicodeMaps, GooString); deleteGooList(toUnicodeDirs, GooString); deleteGooHash(displayFonts, DisplayFontParam); +#ifndef PDF_PARSER_ONLY #ifdef _WIN32 delete winFontList; #endif +#endif deleteGooHash(psFonts, PSFontParam); deleteGooList(psNamedFonts16, PSFontParam); deleteGooList(psFonts16, PSFontParam); @@ -1114,10 +1118,9 @@ static FcPattern *buildFcPattern(GfxFont *font) */ #ifdef PDF_PARSER_ONLY DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) { - return (DisplayFontParam * )NULL; + return NULL; } -#else -#ifndef _MSC_VER +#elif !defined(_MSC_VER) DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) { DisplayFontParam *dfp; FcPattern *p=0; @@ -1177,7 +1180,6 @@ fin: return dfp; } #endif -#endif GBool GlobalParams::getPSExpandSmaller() { GBool f; diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParams.h index 514fc46682d..feec7125375 100644 --- a/Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParams.h +++ b/Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParams.h @@ -61,9 +61,11 @@ struct XpdfSecurityHandler; class GlobalParams; class GfxFont; class Stream; +#ifndef PDF_PARSER_ONLY #ifdef _WIN32 class WinFontList; #endif +#endif //------------------------------------------------------------------------ @@ -303,10 +305,12 @@ private: GooList *toUnicodeDirs; // list of ToUnicode CMap dirs [GooString] GooHash *displayFonts; // display font info, indexed by font name // [DisplayFontParam] +#ifndef PDF_PARSER_ONLY #ifdef _WIN32 GBool baseFontsInitialized; WinFontList *winFontList; // system TrueType fonts #endif +#endif GBool psExpandSmaller; // expand smaller pages to fill paper GBool psShrinkLarger; // shrink larger pages to fit paper GBool psCenter; // center pages on the paper diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/poppler-config.h b/Build/source/libs/poppler/poppler-0.12.4/poppler/poppler-config.h deleted file mode 100644 index 5dc6ea109c8..00000000000 --- a/Build/source/libs/poppler/poppler-0.12.4/poppler/poppler-config.h +++ /dev/null @@ -1,91 +0,0 @@ -/* poppler/poppler-config.h. Generated from poppler-config.h.in by configure. */ -//================================================= -*- mode: c++ -*- ==== -// -// poppler-config.h -// -// Copyright 1996-2004 Glyph & Cog, LLC -// -//======================================================================== - -#ifndef POPPLER_CONFIG_H -#define POPPLER_CONFIG_H - -// We duplicate some of the config.h #define's here since they are -// used in some of the header files we install. The #ifndef/#endif -// around #undef look odd, but it's to silence warnings about -// redefining those symbols. - -/* Enable multithreading support. */ -#ifndef MULTITHREADED -#define MULTITHREADED 1 -#endif - -/* Enable exceptions. */ -#ifndef USE_EXCEPTIONS -/* #undef USE_EXCEPTIONS */ -#endif - -/* Use fixedpoint. */ -#ifndef USE_FIXEDPOINT -/* #undef USE_FIXEDPOINT */ -#endif - -/* Include support for OPI comments. */ -#ifndef OPI_SUPPORT -#define OPI_SUPPORT 1 -#endif - -/* Enable word list support. */ -#ifndef TEXTOUT_WORD_LIST -#define TEXTOUT_WORD_LIST 1 -#endif - -// Also, there's a couple of preprocessor symbols in the header files -// that are used but never defined: DISABLE_OUTLINE, DEBUG_MEM and - -//------------------------------------------------------------------------ -// version -//------------------------------------------------------------------------ - -// copyright notice -#define popplerCopyright "Copyright 2005-2009 The Poppler Developers - http://poppler.freedesktop.org" -#define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC" - -//------------------------------------------------------------------------ -// popen -//------------------------------------------------------------------------ - -#if defined(_MSC_VER) || defined(__BORLANDC__) -#define popen _popen -#define pclose _pclose -#endif - -#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__) || defined(MACOS) -#define POPEN_READ_MODE "rb" -#else -#define POPEN_READ_MODE "r" -#endif - -//------------------------------------------------------------------------ -// Win32 stuff -//------------------------------------------------------------------------ - -#if defined(_WIN32) && !defined(_MSC_VER) -#include <windef.h> -#else -#define CDECL -#endif - -//------------------------------------------------------------------------ -// Compiler -//------------------------------------------------------------------------ - -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) -#define GCC_PRINTF_FORMAT(fmt_index, va_index) \ - __attribute__((__format__(__printf__, fmt_index, va_index))) -#else -#define GCC_PRINTF_FORMAT(fmt_index, va_index) -#endif - - -#endif /* POPPLER_CONFIG_H */ diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.12.4/poppler/poppler-config.h.in index 016a081505f..147c8b0a1aa 100644 --- a/Build/source/libs/poppler/poppler-0.12.4/poppler/poppler-config.h.in +++ b/Build/source/libs/poppler/poppler-0.12.4/poppler/poppler-config.h.in @@ -50,6 +50,9 @@ #define popplerCopyright "Copyright 2005-2009 The Poppler Developers - http://poppler.freedesktop.org" #define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC" +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + //------------------------------------------------------------------------ // popen //------------------------------------------------------------------------ diff --git a/Build/source/libs/poppler/poppler/Makefile.in b/Build/source/libs/poppler/poppler/Makefile.in index 1e54ed24332..79b25790077 100644 --- a/Build/source/libs/poppler/poppler/Makefile.in +++ b/Build/source/libs/poppler/poppler/Makefile.in @@ -32,14 +32,18 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/hdrs.am + $(top_srcdir)/hdrs.am \ + $(top_srcdir)/poppler-0.12.4/poppler/poppler-config.h.in subdir = poppler ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ + $(top_srcdir)/../../m4/kpse-warnings.m4 \ + $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/aconf.h $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/config.h poppler-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = @@ -96,6 +100,11 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +WARNING_CFLAGS = @WARNING_CFLAGS@ +WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ +ZLIB_DEPEND = @ZLIB_DEPEND@ +ZLIB_INCLUDES = @ZLIB_INCLUDES@ +ZLIB_LIBS = @ZLIB_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -140,7 +149,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SRCDIR = $(top_srcdir)/$(POPPLER_TREE)/poppler -all: all-am +all: poppler-config.h + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/hdrs.am $(am__configure_deps) @@ -173,6 +183,23 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + +poppler-config.h: stamp-h2 + @if test ! -f $@; then \ + rm -f stamp-h2; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h2; \ + else :; fi + +stamp-h2: $(top_srcdir)/poppler-0.12.4/poppler/poppler-config.h.in $(top_builddir)/config.status + @rm -f stamp-h2 + cd $(top_builddir) && $(SHELL) ./config.status poppler/poppler-config.h +$(top_srcdir)/poppler-0.12.4/poppler/poppler-config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f stamp-h2 + touch $@ + +distclean-hdr: + -rm -f poppler-config.h stamp-h2 tags: TAGS TAGS: @@ -212,7 +239,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile all-local +all-am: Makefile poppler-config.h all-local installdirs: install: install-am install-exec: install-exec-am @@ -245,7 +272,7 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-local +distclean-am: clean-am distclean-generic distclean-hdr distclean-local dvi: dvi-am @@ -305,18 +332,18 @@ ps-am: uninstall-am: -.MAKE: install-am install-strip +.MAKE: all install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - distclean distclean-generic distclean-local distdir dvi dvi-am \ - html html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am + distclean distclean-generic distclean-hdr distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am all-local: @for file in $(SRCDIR)/*.h; do \ diff --git a/Build/source/texk/configure b/Build/source/texk/configure index de6208b6f8f..af1e275bb0c 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -4681,6 +4681,20 @@ $as_echo "$as_me: Assuming installed \`poppler' headers and library" >&6;} fi ac_configure_args="$ac_configure_args '--with-system-poppler=$with_system_poppler'" fi +if test "x$with_system_poppler" = xyes; then + if test "x$with_system_zlib" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`zlib' headers and library" >&5 +$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;} + with_system_zlib=yes + ac_configure_args="$ac_configure_args '--with-system-zlib'" + elif test "x$with_system_zlib" != xyes; then + as_fn_error $? "Sorry, \`--with-system-poppler' requires \`--with-system-zlib'" "$LINENO" 5 + fi +fi + +test "x$need_poppler" = xyes && { + need_zlib=yes +} ## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index a34e1d3ed9b..0fdd9ed366c 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,5 +1,11 @@ 2011-04-13 Peter Breitenlohner <peb@mppmu.mpg.de> + * utils/utils.w (POPPLER_VERSION): Now defined in + poppler-config.h for poppler from the TeX Live tree, or in the + Makefile for an installed version. + +2011-04-13 Peter Breitenlohner <peb@mppmu.mpg.de> + * am/libluatex.am, am/txt2zlib.am: When cross compiling skip txt2zlib and use installed luascripts/pdflua.c. diff --git a/Build/source/texk/web2c/luatexdir/utils/utils.w b/Build/source/texk/web2c/luatexdir/utils/utils.w index e3dc26bc6bf..4acb9f2d9dd 100644 --- a/Build/source/texk/web2c/luatexdir/utils/utils.w +++ b/Build/source/texk/web2c/luatexdir/utils/utils.w @@ -50,11 +50,9 @@ static const char _svn_version[] = #include "png.h" +/* POPPLER_VERSION is defined in poppler-config.h for poppler from + * the TeX Live tree, or in the Makefile for an installed version. */ #include "poppler-config.h" -#ifndef POPPLER_VERSION -# include "aconf.h" -# define POPPLER_VERSION POPPLER_PACKAGE_VERSION -#endif @ @c #define check_nprintf(size_get, size_want) \ diff --git a/Build/source/utils/configure b/Build/source/utils/configure index a11ec744a90..1c47bc8674b 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -4658,6 +4658,20 @@ $as_echo "$as_me: Assuming installed \`poppler' headers and library" >&6;} fi ac_configure_args="$ac_configure_args '--with-system-poppler=$with_system_poppler'" fi +if test "x$with_system_poppler" = xyes; then + if test "x$with_system_zlib" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`zlib' headers and library" >&5 +$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;} + with_system_zlib=yes + ac_configure_args="$ac_configure_args '--with-system-zlib'" + elif test "x$with_system_zlib" != xyes; then + as_fn_error $? "Sorry, \`--with-system-poppler' requires \`--with-system-zlib'" "$LINENO" 5 + fi +fi + +test "x$need_poppler" = xyes && { + need_zlib=yes +} ## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ |