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/configure | 19 ++- Build/source/m4/kpse-poppler-flags.m4 | 2 +- Build/source/texk/makeindexk/configure | 3 +- Build/source/texk/web2c/ChangeLog | 6 + Build/source/texk/web2c/Makefile.in | 128 +++++++++++---------- Build/source/texk/web2c/configure | 119 +++---------------- Build/source/texk/web2c/configure.ac | 21 +--- Build/source/texk/web2c/doc/Makefile.in | 1 - Build/source/texk/web2c/lib/Makefile.in | 1 - Build/source/texk/web2c/luatexdir/ChangeLog | 8 ++ Build/source/texk/web2c/luatexdir/am/libluatex.am | 47 +++++--- Build/source/texk/web2c/luatexdir/am/txt2zlib.am | 13 +-- .../source/texk/web2c/luatexdir/image/pdftoepdf.cc | 19 --- .../texk/web2c/luatexdir/luascripts/pdflua.c | 45 ++++++++ Build/source/texk/web2c/man/Makefile.in | 1 - Build/source/texk/web2c/omegafonts/Makefile.in | 1 - Build/source/texk/web2c/otps/Makefile.in | 1 - Build/source/texk/web2c/window/Makefile.in | 1 - 18 files changed, 188 insertions(+), 248 deletions(-) create mode 100644 Build/source/texk/web2c/luatexdir/luascripts/pdflua.c (limited to 'Build/source') 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 diff --git a/Build/source/m4/kpse-poppler-flags.m4 b/Build/source/m4/kpse-poppler-flags.m4 index bcbaa07e8d6..eee3c8b55cd 100644 --- a/Build/source/m4/kpse-poppler-flags.m4 +++ b/Build/source/m4/kpse-poppler-flags.m4 @@ -33,7 +33,7 @@ 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.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` diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure index 19f94d71021..751d5c54b46 100755 --- a/Build/source/texk/makeindexk/configure +++ b/Build/source/texk/makeindexk/configure @@ -760,8 +760,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index fa73d2c5290..cd32a87da6b 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,9 @@ +2011-03-28 Peter Breitenlohner + + * configure.ac: LuaTeX needs poppler at least 0.12, no reason + to test for PDFDoc::getPDF*Version(). HAVE_GETPDFMAJORVERSION + would yield a conflict for pdfTeX using xpdf or poppler 0.10. + 2011-04-04 Karl Berry * doc/ref.txi: add urls for TUGboat. diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index fe0763d7cb6..61fd87fb15b 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -38,7 +38,8 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \ mf-nowin$(EXEEXT) mpost$(EXEEXT) etex$(EXEEXT) ptex$(EXEEXT) \ $(am__EXEEXT_2) eptex$(EXEEXT) pdftex$(EXEEXT) \ ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) luatex$(EXEEXT) \ - xetex$(EXEEXT) $(am__EXEEXT_5) aleph$(EXEEXT) + txt2zlib$(EXEEXT) xetex$(EXEEXT) $(am__EXEEXT_5) \ + aleph$(EXEEXT) bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_6) \ ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_7) \ $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \ @@ -48,7 +49,7 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_6) \ $(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \ $(am__EXEEXT_23) synctex$(EXEEXT) noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \ - $(am__EXEEXT_31) txt2zlib$(EXEEXT) + $(am__EXEEXT_31) check_PROGRAMS = $(am__EXEEXT_24) $(am__EXEEXT_25) $(am__EXEEXT_26) \ $(am__EXEEXT_27) $(am__EXEEXT_28) $(am__EXEEXT_29) \ $(am__EXEEXT_30) md5main$(EXEEXT) @@ -386,8 +387,8 @@ nodist_libluatex_a_OBJECTS = libluatex_a-dvigen.$(OBJEXT) \ libluatex_a-luagen.$(OBJEXT) libluatex_a-luainit.$(OBJEXT) \ libluatex_a-luanode.$(OBJEXT) libluatex_a-luastuff.$(OBJEXT) \ libluatex_a-luatoken.$(OBJEXT) libluatex_a-texluac.$(OBJEXT) \ - libluatex_a-pdflua.$(OBJEXT) libluatex_a-pagetree.$(OBJEXT) \ - libluatex_a-pdfaction.$(OBJEXT) libluatex_a-pdfannot.$(OBJEXT) \ + libluatex_a-pagetree.$(OBJEXT) libluatex_a-pdfaction.$(OBJEXT) \ + libluatex_a-pdfannot.$(OBJEXT) \ libluatex_a-pdfcolorstack.$(OBJEXT) \ libluatex_a-pdfdest.$(OBJEXT) libluatex_a-pdffont.$(OBJEXT) \ libluatex_a-pdfgen.$(OBJEXT) libluatex_a-pdfglyph.$(OBJEXT) \ @@ -402,7 +403,8 @@ nodist_libluatex_a_OBJECTS = libluatex_a-dvigen.$(OBJEXT) \ libluatex_a-pdfshipout.$(OBJEXT) \ libluatex_a-pdftables.$(OBJEXT) \ libluatex_a-pdfthread.$(OBJEXT) libluatex_a-pdfxform.$(OBJEXT) \ - libluatex_a-align.$(OBJEXT) libluatex_a-arithmetic.$(OBJEXT) \ + libluatex_a-pdflua.$(OBJEXT) libluatex_a-align.$(OBJEXT) \ + libluatex_a-arithmetic.$(OBJEXT) \ libluatex_a-buildpage.$(OBJEXT) libluatex_a-commands.$(OBJEXT) \ libluatex_a-conditional.$(OBJEXT) \ libluatex_a-directions.$(OBJEXT) \ @@ -809,9 +811,6 @@ ttf2afm_OBJECTS = $(am_ttf2afm_OBJECTS) ttf2afm_LDADD = $(LDADD) nodist_txt2zlib_OBJECTS = txt2zlib-txt2zlib.$(OBJEXT) txt2zlib_OBJECTS = $(nodist_txt2zlib_OBJECTS) -txt2zlib_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(txt2zlib_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ nodist_vftovp_OBJECTS = vftovp.$(OBJEXT) vftovp_OBJECTS = $(nodist_vftovp_OBJECTS) vftovp_LDADD = $(LDADD) @@ -1123,7 +1122,6 @@ TECKIT_DEPEND = @TECKIT_DEPEND@ TECKIT_INCLUDES = @TECKIT_INCLUDES@ TECKIT_LIBS = @TECKIT_LIBS@ TIE = @TIE@ -TXTTOZLIB = @TXTTOZLIB@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ @@ -1389,9 +1387,8 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ luatexdir/luafontloader/fontforge/gutils/Makefile.in \ luatexdir/luafontloader/fontforge/inc/config.h.in \ luatexdir/luafontloader/fontforge/plugins/Makefile.in \ - luatexdir/luascripts/pdflua.lua $(libluatex_web) \ - luatexdir/ChangeLog luatexdir/NEWS luatexdir/font/subfont.txt \ - luatexdir/luascripts/txt2zlib.w $(xetex_web_srcs) \ + $(libluatex_web) luatexdir/ChangeLog luatexdir/NEWS \ + luatexdir/font/subfont.txt $(xetex_web_srcs) \ xetexdir/xetex.defines xetexdir/pool2c.pl \ xetexdir/unicode-char-prep.pl xetexdir/appleGlyphNames.c \ xetexdir/XeTeXFontMgr_Mac.mm xetexdir/ChangeLog $(xetex_tests) \ @@ -2133,7 +2130,9 @@ libluatex_web = luatexdir/dvi/dvigen.w luatexdir/font/dofont.w \ luatexdir/pdf/pdfrule.w luatexdir/pdf/pdfsaverestore.w \ luatexdir/pdf/pdfsetmatrix.w luatexdir/pdf/pdfshipout.w \ luatexdir/pdf/pdftables.w luatexdir/pdf/pdfthread.w \ - luatexdir/pdf/pdfxform.w luatexdir/tex/align.w \ + luatexdir/pdf/pdfxform.w luatexdir/luascripts/pdflua.c \ + luatexdir/luascripts/pdflua.lua \ + luatexdir/luascripts/txt2zlib.w luatexdir/tex/align.w \ luatexdir/tex/arithmetic.w luatexdir/tex/buildpage.w \ luatexdir/tex/commands.w luatexdir/tex/conditional.w \ luatexdir/tex/directions.w luatexdir/tex/dumpdata.w \ @@ -2157,19 +2156,19 @@ nodist_libluatex_a_SOURCES = dvigen.c dofont.c luafont.c mapfile.c \ writefont.c writet1.c writet3.c writettf.c writetype0.c \ writetype2.c writeimg.c writejbig2.c writejpg.c writejp2.c \ writepng.c texlang.c hyphen.c hnjalloc.c luagen.c luainit.c \ - luanode.c luastuff.c luatoken.c texluac.c pdflua.c pagetree.c \ + luanode.c luastuff.c luatoken.c texluac.c pagetree.c \ pdfaction.c pdfannot.c pdfcolorstack.c pdfdest.c pdffont.c \ pdfgen.c pdfglyph.c pdfimage.c pdflink.c pdflistout.c \ pdfliteral.c pdfluaapi.c pdfobj.c pdfoutline.c pdfpage.c \ pdfrule.c pdfsaverestore.c pdfsetmatrix.c pdfshipout.c \ - pdftables.c pdfthread.c pdfxform.c align.c arithmetic.c \ - buildpage.c commands.c conditional.c directions.c dumpdata.c \ - equivalents.c errors.c expand.c extensions.c filename.c \ - inputstack.c linebreak.c mainbody.c maincontrol.c mathcodes.c \ - memoryword.c mlist.c nesting.c packaging.c postlinebreak.c \ - primitive.c printing.c scanning.c stringpool.c texdeffont.c \ - texfileio.c texmath.c texnodes.c textcodes.c textoken.c \ - avlstuff.c managed-sa.c utils.c mplibdir/lmplib.c + pdftables.c pdfthread.c pdfxform.c pdflua.c align.c \ + arithmetic.c buildpage.c commands.c conditional.c directions.c \ + dumpdata.c equivalents.c errors.c expand.c extensions.c \ + filename.c inputstack.c linebreak.c mainbody.c maincontrol.c \ + mathcodes.c memoryword.c mlist.c nesting.c packaging.c \ + postlinebreak.c primitive.c printing.c scanning.c stringpool.c \ + texdeffont.c texfileio.c texmath.c texnodes.c textcodes.c \ + textoken.c avlstuff.c managed-sa.c utils.c mplibdir/lmplib.c libluatex_a_SOURCES = luatexdir/luatex.h luatexdir/dvi/dvigen.h \ luatexdir/font/luatexfont.h luatexdir/font/mapfile.h \ luatexdir/font/sfnt.h luatexdir/font/texfont.h \ @@ -2190,19 +2189,19 @@ libluatex_a_SOURCES = luatexdir/luatex.h luatexdir/dvi/dvigen.h \ luatexdir/lua/lstatslib.c luatexdir/lua/ltexiolib.c \ luatexdir/lua/ltexlib.c luatexdir/lua/ltokenlib.c \ luatexdir/lua/luagen.h luatexdir/lua/luatex-api.h \ - luatexdir/luascripts/pdflua.h luatexdir/pdf/pagetree.h \ - luatexdir/pdf/pdfaction.h luatexdir/pdf/pdfannot.h \ - luatexdir/pdf/pdfcolorstack.h luatexdir/pdf/pdfdest.h \ - luatexdir/pdf/pdffont.h luatexdir/pdf/pdfgen.h \ - luatexdir/pdf/pdfglyph.h luatexdir/pdf/pdfimage.h \ - luatexdir/pdf/pdflink.h luatexdir/pdf/pdflistout.h \ - luatexdir/pdf/pdfliteral.h luatexdir/pdf/pdfluaapi.h \ - luatexdir/pdf/pdfobj.h luatexdir/pdf/pdfoutline.h \ - luatexdir/pdf/pdfpage.h luatexdir/pdf/pdfrule.h \ - luatexdir/pdf/pdfsaverestore.h luatexdir/pdf/pdfsetmatrix.h \ - luatexdir/pdf/pdfshipout.h luatexdir/pdf/pdftables.h \ - luatexdir/pdf/pdfthread.h luatexdir/pdf/pdftypes.h \ - luatexdir/pdf/pdfxform.h luatexdir/tex/align.h \ + luatexdir/pdf/pagetree.h luatexdir/pdf/pdfaction.h \ + luatexdir/pdf/pdfannot.h luatexdir/pdf/pdfcolorstack.h \ + luatexdir/pdf/pdfdest.h luatexdir/pdf/pdffont.h \ + luatexdir/pdf/pdfgen.h luatexdir/pdf/pdfglyph.h \ + luatexdir/pdf/pdfimage.h luatexdir/pdf/pdflink.h \ + luatexdir/pdf/pdflistout.h luatexdir/pdf/pdfliteral.h \ + luatexdir/pdf/pdfluaapi.h luatexdir/pdf/pdfobj.h \ + luatexdir/pdf/pdfoutline.h luatexdir/pdf/pdfpage.h \ + luatexdir/pdf/pdfrule.h luatexdir/pdf/pdfsaverestore.h \ + luatexdir/pdf/pdfsetmatrix.h luatexdir/pdf/pdfshipout.h \ + luatexdir/pdf/pdftables.h luatexdir/pdf/pdfthread.h \ + luatexdir/pdf/pdftypes.h luatexdir/pdf/pdfxform.h \ + luatexdir/luascripts/pdflua.h luatexdir/tex/align.h \ luatexdir/tex/arithmetic.h luatexdir/tex/buildpage.h \ luatexdir/tex/commands.h luatexdir/tex/conditional.h \ luatexdir/tex/directions.h luatexdir/tex/dumpdata.h \ @@ -2228,16 +2227,14 @@ luatex_font_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/font $(ctangle) luatex_image_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/image $(ctangle) luatex_lang_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/lang $(ctangle) luatex_lua_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/lua $(ctangle) -luatex_luascripts_txt2zlib = $(TXTTOZLIB) luatex_pdf_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle) +luatex_luascripts_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/luascripts $(ctangle) luatex_tex_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/tex $(ctangle) luatex_utils_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/utils $(ctangle) nodist_txt2zlib_SOURCES = txt2zlib.c txt2zlib_CPPFLAGS = $(ZLIB_INCLUDES) txt2zlib_DEPENDENCIES = $(ZLIB_DEPEND) -txt2zlib_CFLAGS = $(WARNING_CFLAGS) txt2zlib_LDADD = $(ZLIB_LIBS) -luatex_luascripts_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/luascripts $(ctangle) # Force Automake to use CXXLD for linking nodist_EXTRA_xetex_SOURCES = dummy.cxx @@ -2776,7 +2773,7 @@ ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(LINK) $(ttf2afm_OBJECTS) $(ttf2afm_LDADD) $(LIBS) txt2zlib$(EXEEXT): $(txt2zlib_OBJECTS) $(txt2zlib_DEPENDENCIES) @rm -f txt2zlib$(EXEEXT) - $(txt2zlib_LINK) $(txt2zlib_OBJECTS) $(txt2zlib_LDADD) $(LIBS) + $(LINK) $(txt2zlib_OBJECTS) $(txt2zlib_LDADD) $(LIBS) vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) @rm -f vftovp$(EXEEXT) $(LINK) $(vftovp_OBJECTS) $(vftovp_LDADD) $(LIBS) @@ -5534,20 +5531,6 @@ libluatex_a-texluac.obj: texluac.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-texluac.obj `if test -f 'texluac.c'; then $(CYGPATH_W) 'texluac.c'; else $(CYGPATH_W) '$(srcdir)/texluac.c'; fi` -libluatex_a-pdflua.o: pdflua.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-pdflua.o -MD -MP -MF $(DEPDIR)/libluatex_a-pdflua.Tpo -c -o libluatex_a-pdflua.o `test -f 'pdflua.c' || echo '$(srcdir)/'`pdflua.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-pdflua.Tpo $(DEPDIR)/libluatex_a-pdflua.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdflua.c' object='libluatex_a-pdflua.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-pdflua.o `test -f 'pdflua.c' || echo '$(srcdir)/'`pdflua.c - -libluatex_a-pdflua.obj: pdflua.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-pdflua.obj -MD -MP -MF $(DEPDIR)/libluatex_a-pdflua.Tpo -c -o libluatex_a-pdflua.obj `if test -f 'pdflua.c'; then $(CYGPATH_W) 'pdflua.c'; else $(CYGPATH_W) '$(srcdir)/pdflua.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-pdflua.Tpo $(DEPDIR)/libluatex_a-pdflua.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdflua.c' object='libluatex_a-pdflua.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-pdflua.obj `if test -f 'pdflua.c'; then $(CYGPATH_W) 'pdflua.c'; else $(CYGPATH_W) '$(srcdir)/pdflua.c'; fi` - libluatex_a-pagetree.o: pagetree.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-pagetree.o -MD -MP -MF $(DEPDIR)/libluatex_a-pagetree.Tpo -c -o libluatex_a-pagetree.o `test -f 'pagetree.c' || echo '$(srcdir)/'`pagetree.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-pagetree.Tpo $(DEPDIR)/libluatex_a-pagetree.Po @@ -5870,6 +5853,20 @@ libluatex_a-pdfxform.obj: pdfxform.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-pdfxform.obj `if test -f 'pdfxform.c'; then $(CYGPATH_W) 'pdfxform.c'; else $(CYGPATH_W) '$(srcdir)/pdfxform.c'; fi` +libluatex_a-pdflua.o: pdflua.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-pdflua.o -MD -MP -MF $(DEPDIR)/libluatex_a-pdflua.Tpo -c -o libluatex_a-pdflua.o `test -f 'pdflua.c' || echo '$(srcdir)/'`pdflua.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-pdflua.Tpo $(DEPDIR)/libluatex_a-pdflua.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdflua.c' object='libluatex_a-pdflua.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-pdflua.o `test -f 'pdflua.c' || echo '$(srcdir)/'`pdflua.c + +libluatex_a-pdflua.obj: pdflua.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-pdflua.obj -MD -MP -MF $(DEPDIR)/libluatex_a-pdflua.Tpo -c -o libluatex_a-pdflua.obj `if test -f 'pdflua.c'; then $(CYGPATH_W) 'pdflua.c'; else $(CYGPATH_W) '$(srcdir)/pdflua.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-pdflua.Tpo $(DEPDIR)/libluatex_a-pdflua.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdflua.c' object='libluatex_a-pdflua.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-pdflua.obj `if test -f 'pdflua.c'; then $(CYGPATH_W) 'pdflua.c'; else $(CYGPATH_W) '$(srcdir)/pdflua.c'; fi` + libluatex_a-align.o: align.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-align.o -MD -MP -MF $(DEPDIR)/libluatex_a-align.Tpo -c -o libluatex_a-align.o `test -f 'align.c' || echo '$(srcdir)/'`align.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libluatex_a-align.Tpo $(DEPDIR)/libluatex_a-align.Po @@ -7621,18 +7618,18 @@ ttf2afm-macnames.obj: pdftexdir/macnames.c @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ttf2afm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ttf2afm-macnames.obj `if test -f 'pdftexdir/macnames.c'; then $(CYGPATH_W) 'pdftexdir/macnames.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/macnames.c'; fi` txt2zlib-txt2zlib.o: txt2zlib.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(txt2zlib_CPPFLAGS) $(CPPFLAGS) $(txt2zlib_CFLAGS) $(CFLAGS) -MT txt2zlib-txt2zlib.o -MD -MP -MF $(DEPDIR)/txt2zlib-txt2zlib.Tpo -c -o txt2zlib-txt2zlib.o `test -f 'txt2zlib.c' || echo '$(srcdir)/'`txt2zlib.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(txt2zlib_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT txt2zlib-txt2zlib.o -MD -MP -MF $(DEPDIR)/txt2zlib-txt2zlib.Tpo -c -o txt2zlib-txt2zlib.o `test -f 'txt2zlib.c' || echo '$(srcdir)/'`txt2zlib.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/txt2zlib-txt2zlib.Tpo $(DEPDIR)/txt2zlib-txt2zlib.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='txt2zlib.c' object='txt2zlib-txt2zlib.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(txt2zlib_CPPFLAGS) $(CPPFLAGS) $(txt2zlib_CFLAGS) $(CFLAGS) -c -o txt2zlib-txt2zlib.o `test -f 'txt2zlib.c' || echo '$(srcdir)/'`txt2zlib.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(txt2zlib_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o txt2zlib-txt2zlib.o `test -f 'txt2zlib.c' || echo '$(srcdir)/'`txt2zlib.c txt2zlib-txt2zlib.obj: txt2zlib.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(txt2zlib_CPPFLAGS) $(CPPFLAGS) $(txt2zlib_CFLAGS) $(CFLAGS) -MT txt2zlib-txt2zlib.obj -MD -MP -MF $(DEPDIR)/txt2zlib-txt2zlib.Tpo -c -o txt2zlib-txt2zlib.obj `if test -f 'txt2zlib.c'; then $(CYGPATH_W) 'txt2zlib.c'; else $(CYGPATH_W) '$(srcdir)/txt2zlib.c'; fi` +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(txt2zlib_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT txt2zlib-txt2zlib.obj -MD -MP -MF $(DEPDIR)/txt2zlib-txt2zlib.Tpo -c -o txt2zlib-txt2zlib.obj `if test -f 'txt2zlib.c'; then $(CYGPATH_W) 'txt2zlib.c'; else $(CYGPATH_W) '$(srcdir)/txt2zlib.c'; fi` @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/txt2zlib-txt2zlib.Tpo $(DEPDIR)/txt2zlib-txt2zlib.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='txt2zlib.c' object='txt2zlib-txt2zlib.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(txt2zlib_CPPFLAGS) $(CPPFLAGS) $(txt2zlib_CFLAGS) $(CFLAGS) -c -o txt2zlib-txt2zlib.obj `if test -f 'txt2zlib.c'; then $(CYGPATH_W) 'txt2zlib.c'; else $(CYGPATH_W) '$(srcdir)/txt2zlib.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(txt2zlib_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o txt2zlib-txt2zlib.obj `if test -f 'txt2zlib.c'; then $(CYGPATH_W) 'txt2zlib.c'; else $(CYGPATH_W) '$(srcdir)/txt2zlib.c'; fi` xetex-xetexextra.o: xetexdir/xetexextra.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetex-xetexextra.o -MD -MP -MF $(DEPDIR)/xetex-xetexextra.Tpo -c -o xetex-xetexextra.o `test -f 'xetexdir/xetexextra.c' || echo '$(srcdir)/'`xetexdir/xetexextra.c @@ -9307,9 +9304,6 @@ luatoken.c: ctangle$(EXEEXT) luatexdir/lua/luatoken.w texluac.c: ctangle$(EXEEXT) luatexdir/lua/texluac.w $(luatex_lua_ctangle) texluac.w -pdflua.c: txt2zlib$(EXEEXT) luatexdir/luascripts/pdflua.lua - $(luatex_luascripts_txt2zlib) $(srcdir)/luatexdir/luascripts/pdflua.lua pdflua.c - pagetree.c: ctangle$(EXEEXT) luatexdir/pdf/pagetree.w $(luatex_pdf_ctangle) pagetree.w pdfaction.c: ctangle$(EXEEXT) luatexdir/pdf/pdfaction.w @@ -9357,6 +9351,17 @@ pdfthread.c: ctangle$(EXEEXT) luatexdir/pdf/pdfthread.w pdfxform.c: ctangle$(EXEEXT) luatexdir/pdf/pdfxform.w $(luatex_pdf_ctangle) pdfxform.w +txt2zlib.c: ctangle$(EXEEXT) luatexdir/luascripts/txt2zlib.w + $(luatex_luascripts_ctangle) txt2zlib.w + +@cross_TRUE@pdflua.c: luatexdir/luascripts/pdflua.c +@cross_TRUE@ rm -f pdflua.c +@cross_TRUE@ $(LN_S) $(srcdir)/luatexdir/luascripts/pdflua.c pdflua.c +@cross_FALSE@pdflua.c: txt2zlib$(EXEEXT) luatexdir/luascripts/pdflua.lua +@cross_FALSE@ ./txt2zlib $(srcdir)/luatexdir/luascripts/pdflua.lua pdflua.c +@cross_FALSE@ cmp -s pdflua.c $(srcdir)/luatexdir/luascripts/pdflua.c || \ +@cross_FALSE@ cp -f pdflua.c $(srcdir)/luatexdir/luascripts/pdflua.c + align.c: ctangle$(EXEEXT) luatexdir/tex/align.w $(luatex_tex_ctangle) align.w arithmetic.c: ctangle$(EXEEXT) luatexdir/tex/arithmetic.w @@ -9430,9 +9435,6 @@ utils.c: ctangle$(EXEEXT) luatexdir/utils/utils.w $(luatex_utils_ctangle) utils.w $(libluatex_a_OBJECTS): libff.a libmplib.a - -txt2zlib.c: ctangle$(EXEEXT) luatexdir/luascripts/txt2zlib.w - $(luatex_luascripts_ctangle) txt2zlib.w $(xetex_OBJECTS): $(xetex_prereq) $(xetex_c_h): xetex-web2c 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 diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 68033caaf36..4b5866436a6 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with Autoconf to produce a configure script for Web2c. dnl -dnl Copyright (C) 2009, 2010 Peter Breitenlohner +dnl Copyright (C) 2009 - 2011 Peter Breitenlohner dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -37,6 +37,8 @@ dnl Common code for all programs using libkpathsea. KPSE_COMMON([web2c programs]) KPSE_CANONICAL_HOST +AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes]) + AC_PROG_CXX AC_PROG_OBJCXX KPSE_CXX_HACK @@ -274,21 +276,6 @@ AS_IF([test "x$kpse_cv_have_getPDFMajorVersion" = xyes], AC_LANG_POP([C++]) KPSE_RESTORE_FLAGS -# Checks for xpdf (libpoppler) features. -KPSE_ADD_FLAGS([poppler]) -AC_LANG_PUSH([C++]) -AC_CACHE_CHECK([for PDFDoc::getPDFMajorVersion], - [kpse_cv_have_getPDFMajorVersion], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[PDFDoc *pdfDoc; pdfDoc->getPDFMajorVersion();]])], - [kpse_cv_have_getPDFMajorVersion=yes], - [kpse_cv_have_getPDFMajorVersion=no])]) -AS_IF([test "x$kpse_cv_have_getPDFMajorVersion" = xyes], - [AC_DEFINE([HAVE_GETPDFMAJORVERSION], 1, - [Define to 1 if class `PDFDoc' has the `getPDFMajorVersion' member.])]) -AC_LANG_POP([C++]) -KPSE_RESTORE_FLAGS - dnl Write output here, instead of putting a zillion -D's on the command line. AC_CONFIG_HEADERS([w2c/c-auto.h:c-auto.in], [sed -e 's/^#define PACKAGE/#define WEB2C_PACKAGE/' \ @@ -323,8 +310,6 @@ AH_BOTTOM([#endif /* !WEB2C_C_AUTO_H */]) dnl Additional config header for luaTeX AC_CONFIG_HEADERS([ff-config.h:luatexdir/luafontloader/ff-config.in]) -dnl This is also for luatex -KPSE_CROSS_PATH_PROG([TXTTOZLIB], [txt2zlib], [./txt2zlib]) # For cross-compilation. Put at the end so there is a fair chance # these are still visible when the configure script has finished. diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in index 91ab9b87859..a6824c7833f 100644 --- a/Build/source/texk/web2c/doc/Makefile.in +++ b/Build/source/texk/web2c/doc/Makefile.in @@ -225,7 +225,6 @@ TECKIT_DEPEND = @TECKIT_DEPEND@ TECKIT_INCLUDES = @TECKIT_INCLUDES@ TECKIT_LIBS = @TECKIT_LIBS@ TIE = @TIE@ -TXTTOZLIB = @TXTTOZLIB@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in index a3f4021445a..f039e8cf906 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -223,7 +223,6 @@ TECKIT_DEPEND = @TECKIT_DEPEND@ TECKIT_INCLUDES = @TECKIT_INCLUDES@ TECKIT_LIBS = @TECKIT_LIBS@ TIE = @TIE@ -TXTTOZLIB = @TXTTOZLIB@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index a81c794c09f..a34e1d3ed9b 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,11 @@ +2011-04-13 Peter Breitenlohner + + * am/libluatex.am, am/txt2zlib.am: When cross compiling skip + txt2zlib and use installed luascripts/pdflua.c. + + Need poppler at least 0.12 for PDFDoc::getPDF*Version(). + * image/pdftoepdf.cc: Remove code for older poppler versions. + 2011-04-12 Peter Breitenlohner * image/writepng.w: Fix to build with png-1.5 (and avoid diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am index 05247a2ab55..8bf1148d334 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -206,22 +206,6 @@ libluatex_a_SOURCES += \ luatexdir/lua/luagen.h \ luatexdir/lua/luatex-api.h -##********************************************************************** - -luatex_luascripts_txt2zlib = $(TXTTOZLIB) - -pdflua.c: txt2zlib$(EXEEXT) luatexdir/luascripts/pdflua.lua - $(luatex_luascripts_txt2zlib) $(srcdir)/luatexdir/luascripts/pdflua.lua pdflua.c - -nodist_libluatex_a_SOURCES += pdflua.c - -libluatex_a_SOURCES += \ - luatexdir/luascripts/pdflua.h - -EXTRA_DIST += luatexdir/luascripts/pdflua.lua - -##********************************************************************** - ## from luatexdir/pdf ## luatex_pdf_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle) @@ -314,6 +298,37 @@ libluatex_a_SOURCES += \ luatexdir/pdf/pdftypes.h \ luatexdir/pdf/pdfxform.h +## from luatexdir/scripts +## +luatex_luascripts_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/luascripts $(ctangle) + +txt2zlib.c: ctangle$(EXEEXT) luatexdir/luascripts/txt2zlib.w + $(luatex_luascripts_ctangle) txt2zlib.w + +libluatex_web += \ + luatexdir/luascripts/pdflua.c \ + luatexdir/luascripts/pdflua.lua \ + luatexdir/luascripts/txt2zlib.w + +## We normaly use the auxiliary program txt2zlib to create pdflua.c +## from luatexdir/luascripts/pdflua.lua. When cross compiling we +## use instead the distributed luatexdir/luascripts/pdflua.c. +if cross +pdflua.c: luatexdir/luascripts/pdflua.c + rm -f pdflua.c + $(LN_S) $(srcdir)/luatexdir/luascripts/pdflua.c pdflua.c +else !cross +pdflua.c: txt2zlib$(EXEEXT) luatexdir/luascripts/pdflua.lua + ./txt2zlib $(srcdir)/luatexdir/luascripts/pdflua.lua pdflua.c + cmp -s pdflua.c $(srcdir)/luatexdir/luascripts/pdflua.c || \ + cp -f pdflua.c $(srcdir)/luatexdir/luascripts/pdflua.c +endif !cross + +nodist_libluatex_a_SOURCES += pdflua.c + +libluatex_a_SOURCES += \ + luatexdir/luascripts/pdflua.h + ## from luatexdir/tex ## luatex_tex_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/tex $(ctangle) diff --git a/Build/source/texk/web2c/luatexdir/am/txt2zlib.am b/Build/source/texk/web2c/luatexdir/am/txt2zlib.am index 31d702df15b..8f83b9c74c7 100644 --- a/Build/source/texk/web2c/luatexdir/am/txt2zlib.am +++ b/Build/source/texk/web2c/luatexdir/am/txt2zlib.am @@ -2,22 +2,15 @@ ## ## Copyright (C) 2010, 2011 Hartmut Henkel ## You may freely use, modify and/or distribute this file. -## -## $Id: txt2zlib.am 3958 2010-11-12 22:57:13Z hhenkel $ -noinst_PROGRAMS += txt2zlib +EXTRA_PROGRAMS += txt2zlib nodist_txt2zlib_SOURCES = txt2zlib.c + txt2zlib_CPPFLAGS = $(ZLIB_INCLUDES) txt2zlib_DEPENDENCIES = $(ZLIB_DEPEND) -txt2zlib_CFLAGS = $(WARNING_CFLAGS) txt2zlib_LDADD = $(ZLIB_LIBS) -DISTCLEANFILES += txt2zlib.c -luatex_luascripts_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/luascripts $(ctangle) - -txt2zlib.c: ctangle$(EXEEXT) luatexdir/luascripts/txt2zlib.w - $(luatex_luascripts_ctangle) txt2zlib.w +DISTCLEANFILES += txt2zlib.c -EXTRA_DIST += luatexdir/luascripts/txt2zlib.w diff --git a/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc b/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc index 8c112d4261b..9bc0b5a7d86 100644 --- a/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc +++ b/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc @@ -25,7 +25,6 @@ static const char _svn_version[] = // define DEBUG #include "epdf.h" -#define HAVE_GETPDFMAJORVERSION 1 // This file is mostly C and not very much C++; it's just used to interface // the functions of xpdf, which happens to be written in C++. @@ -534,11 +533,7 @@ read_pdf_info(image_dict * idict, int minor_pdf_version_wanted, Page *page; int rotate; PDFRectangle *pagebox; -#ifdef HAVE_GETPDFMAJORVERSION int pdf_major_version_found, pdf_minor_version_found; -#else - float pdf_version_found, pdf_version_wanted; -#endif float xsize, ysize, xorig, yorig; assert(idict != NULL); assert(img_type(idict) == IMG_TYPE_PDF); @@ -555,7 +550,6 @@ read_pdf_info(image_dict * idict, int minor_pdf_version_wanted, // this works only for PDF 1.x -- but since any versions of PDF newer // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will // then have to changed drastically anyway. -#ifdef HAVE_GETPDFMAJORVERSION pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion(); pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion(); if ((pdf_major_version_found > 1) @@ -570,19 +564,6 @@ read_pdf_info(image_dict * idict, int minor_pdf_version_wanted, minor_pdf_version_wanted); } } -#else - pdf_version_found = pdf_doc->doc->getPDFVersion(); - pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1); - if (pdf_version_found > pdf_version_wanted + 0.01) { - char msg[] = - "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed"; - if (pdf_inclusion_errorlevel > 0) { - pdftex_fail(msg, pdf_version_found, pdf_version_wanted); - } else { - pdftex_warn(msg, pdf_version_found, pdf_version_wanted); - } - } -#endif img_totalpages(idict) = pdf_doc->doc->getCatalog()->getNumPages(); if (img_pagename(idict)) { // get page by name diff --git a/Build/source/texk/web2c/luatexdir/luascripts/pdflua.c b/Build/source/texk/web2c/luatexdir/luascripts/pdflua.c new file mode 100644 index 00000000000..e94bdde857c --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/luascripts/pdflua.c @@ -0,0 +1,45 @@ +/* pdflua.c + + Copyright 2010 Taco Hoekwater + Copyright 2010 Hartmut Henkel + + This file is part of LuaTeX. + + LuaTeX is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your + option) any later version. + + LuaTeX is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU General Public License along + with LuaTeX; if not, see . */ + +#include "ptexlib.h" + +static const Byte compr[259] = { + 0x78, 0x9c, 0xad, 0x51, 0xc1, 0x4a, 0xc4, 0x30, 0x10, 0xbd, 0xe7, 0x2b, 0xe6, 0xd0, 0x83, 0xc2, + 0x36, 0x49, 0x57, 0x59, 0x69, 0xc1, 0x0f, 0x10, 0x3c, 0x09, 0x5e, 0xbc, 0xa5, 0xe9, 0xb4, 0x0d, + 0x0d, 0x49, 0x98, 0x24, 0xae, 0x8b, 0xf8, 0xef, 0xa6, 0x50, 0x74, 0x55, 0xbc, 0x6d, 0x98, 0x84, + 0xc7, 0xbc, 0x97, 0x79, 0x0f, 0xa6, 0xae, 0xa1, 0x7a, 0x18, 0x3a, 0x08, 0xc3, 0x68, 0xb3, 0xe2, + 0xe5, 0xc2, 0x4d, 0x7b, 0xdb, 0xc2, 0x5e, 0x36, 0xb2, 0x6e, 0x9a, 0x5a, 0xde, 0x81, 0x94, 0x9d, + 0x6c, 0xbb, 0xa6, 0x7d, 0x81, 0x79, 0x46, 0xb7, 0xa0, 0x85, 0x8a, 0xd5, 0xe5, 0xdb, 0xf3, 0xd3, + 0x63, 0x07, 0x73, 0x4a, 0xa1, 0x13, 0x62, 0xf4, 0xd9, 0x0d, 0x74, 0xe2, 0x31, 0x07, 0xb4, 0xa8, + 0xf9, 0x48, 0x22, 0xbe, 0x3a, 0x51, 0xc6, 0x25, 0x7c, 0x13, 0x49, 0x4d, 0x51, 0xf4, 0x98, 0x54, + 0x2d, 0xf9, 0xe1, 0xc0, 0xa5, 0x88, 0x3e, 0x93, 0x46, 0x51, 0xb8, 0x45, 0x1c, 0xb1, 0xdf, 0xeb, + 0x4d, 0x39, 0x18, 0x5a, 0x51, 0xd4, 0x64, 0x42, 0x8a, 0xe2, 0x2c, 0x54, 0xc5, 0x56, 0xcf, 0x34, + 0x9b, 0x08, 0xa5, 0x50, 0x91, 0x3d, 0xc1, 0xd1, 0xd3, 0x02, 0xc6, 0x41, 0x20, 0x3f, 0x11, 0xc6, + 0xc8, 0x39, 0x5f, 0x55, 0x97, 0x39, 0x8c, 0xf5, 0x38, 0x19, 0x17, 0xd4, 0x84, 0x70, 0x0f, 0x63, + 0x76, 0x3a, 0x19, 0xef, 0xae, 0xd4, 0x35, 0x43, 0x37, 0xb0, 0xf5, 0xf9, 0x8f, 0xf2, 0x39, 0x85, + 0x52, 0x85, 0x8d, 0x89, 0xf0, 0x87, 0x64, 0x53, 0x5c, 0x2e, 0xa3, 0xf5, 0x5a, 0xd9, 0x6d, 0x79, + 0xc5, 0xe8, 0x9d, 0x01, 0x9c, 0xc7, 0xfe, 0xc2, 0xbb, 0x42, 0x7c, 0x47, 0xde, 0xd0, 0xda, 0xfc, + 0x1b, 0xf6, 0x57, 0x67, 0xc7, 0x3e, 0x18, 0x23, 0x4c, 0x99, 0xdc, 0xe6, 0xc3, 0x3e, 0x01, 0x6c, + 0x2e, 0xa2, 0xa9 +}; + +static const zlib_struct compr_struct = { 564, 259, compr }; + +const zlib_struct *pdflua_zlib_struct_ptr = &compr_struct; diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in index 06178ab778f..48b16fefa35 100644 --- a/Build/source/texk/web2c/man/Makefile.in +++ b/Build/source/texk/web2c/man/Makefile.in @@ -231,7 +231,6 @@ TECKIT_DEPEND = @TECKIT_DEPEND@ TECKIT_INCLUDES = @TECKIT_INCLUDES@ TECKIT_LIBS = @TECKIT_LIBS@ TIE = @TIE@ -TXTTOZLIB = @TXTTOZLIB@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index 4035224d649..46d408141ce 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -239,7 +239,6 @@ TECKIT_DEPEND = @TECKIT_DEPEND@ TECKIT_INCLUDES = @TECKIT_INCLUDES@ TECKIT_LIBS = @TECKIT_LIBS@ TIE = @TIE@ -TXTTOZLIB = @TXTTOZLIB@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in index cf5fc7f5cc3..3786070a333 100644 --- a/Build/source/texk/web2c/otps/Makefile.in +++ b/Build/source/texk/web2c/otps/Makefile.in @@ -260,7 +260,6 @@ TECKIT_DEPEND = @TECKIT_DEPEND@ TECKIT_INCLUDES = @TECKIT_INCLUDES@ TECKIT_LIBS = @TECKIT_LIBS@ TIE = @TIE@ -TXTTOZLIB = @TXTTOZLIB@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in index 38985bafd39..5f9a80d38c7 100644 --- a/Build/source/texk/web2c/window/Makefile.in +++ b/Build/source/texk/web2c/window/Makefile.in @@ -221,7 +221,6 @@ TECKIT_DEPEND = @TECKIT_DEPEND@ TECKIT_INCLUDES = @TECKIT_INCLUDES@ TECKIT_LIBS = @TECKIT_LIBS@ TIE = @TIE@ -TXTTOZLIB = @TXTTOZLIB@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -- cgit v1.2.3