diff options
| -rw-r--r-- | Build/source/libs/poppler/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/libs/poppler/Makefile.am | 4 | ||||
| -rw-r--r-- | Build/source/libs/poppler/Makefile.in | 2 | ||||
| -rw-r--r-- | Build/source/m4/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/m4/kpse-poppler-flags.m4 | 4 | ||||
| -rwxr-xr-x | Build/source/texk/web2c/configure | 2 |
6 files changed, 14 insertions, 6 deletions
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog index 86d5215a797..69f8bb38612 100644 --- a/Build/source/libs/poppler/ChangeLog +++ b/Build/source/libs/poppler/ChangeLog @@ -1,3 +1,7 @@ +2012-01-13 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (AM_CPPFLAGS): Drop `-DPDF_PARSER_ONLY'. + 2011-10-10 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Reorganize definition of POPPLER_VERSION. diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am index fad9ccd569b..0d22322272c 100644 --- a/Build/source/libs/poppler/Makefile.am +++ b/Build/source/libs/poppler/Makefile.am @@ -1,6 +1,6 @@ ## Proxy Makefile.am to build poppler for TeX Live. ## -## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -31,7 +31,7 @@ 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) $(ZLIB_INCLUDES) -AM_CPPFLAGS = -DPDF_PARSER_ONLY -DPOPPLER_DATADIR='"."' +AM_CPPFLAGS = -DPOPPLER_DATADIR='"."' AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = $(NO_WARN_CXXFLAGS) diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in index 26fe053d850..60b74b5ceff 100644 --- a/Build/source/libs/poppler/Makefile.in +++ b/Build/source/libs/poppler/Makefile.in @@ -262,7 +262,7 @@ 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) $(ZLIB_INCLUDES) -AM_CPPFLAGS = -DPDF_PARSER_ONLY -DPOPPLER_DATADIR='"."' +AM_CPPFLAGS = -DPOPPLER_DATADIR='"."' AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = $(NO_WARN_CXXFLAGS) noinst_LIBRARIES = libpoppler.a diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index e84451fa6f9..3f05fb6403f 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,7 @@ +2012-01-13 Peter Breitenlohner <peb@mppmu.mpg.de> + + * kpse-poppler-flags.m4: Drop `-DPDF_PARSER_ONLY'. + 2011-12-06 Peter Breitenlohner <peb@mppmu.mpg.de> * kpse-web2c.m4: Modify msgs when setting enable_*TeX_synctex. diff --git a/Build/source/m4/kpse-poppler-flags.m4 b/Build/source/m4/kpse-poppler-flags.m4 index e2a01e172d8..29f741a97d4 100644 --- a/Build/source/m4/kpse-poppler-flags.m4 +++ b/Build/source/m4/kpse-poppler-flags.m4 @@ -1,5 +1,5 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -13,7 +13,7 @@ # LIBS required for the `-lpoppler' library in libs/poppler/ of the TL tree. AC_DEFUN([KPSE_POPPLER_FLAGS], [_KPSE_LIB_FLAGS([poppler], [poppler], [], - [-DPDF_PARSER_ONLY -IBLD/libs/poppler -IBLD/libs/poppler/goo -IBLD/libs/poppler/poppler], + [-IBLD/libs/poppler -IBLD/libs/poppler/goo -IBLD/libs/poppler/poppler], [BLD/libs/poppler/libpoppler.a], [], [], [${top_builddir}/../../libs/poppler/poppler/Stream.h])[]dnl ]) # KPSE_POPPLER_FLAGS diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 901bd9e86ec..19436bfcff1 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -22375,7 +22375,7 @@ elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5 fi else - POPPLER_INCLUDES=`echo '-DPDF_PARSER_ONLY -IBLD/libs/poppler -IBLD/libs/poppler/goo -IBLD/libs/poppler/poppler' | sed \ + POPPLER_INCLUDES=`echo '-IBLD/libs/poppler -IBLD/libs/poppler/goo -IBLD/libs/poppler/poppler' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` POPPLER_LIBS=`echo 'BLD/libs/poppler/libpoppler.a' | sed \ |