diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-01-16 11:05:04 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-01-16 11:05:04 +0000 |
| commit | e6cfb853062c9807683a8bd3ba8bd7c814da1685 (patch) | |
| tree | 99fa8d23a0d633a1a96e44249dfcec669744edd9 /Build/source/libs/poppler | |
| parent | bc98f9ee5faabe0c2e39dc0d9d57c9ba6e139af0 (diff) | |
poppler: Drop `DPDF_PARSER_ONLY' from CPPFLAGS
git-svn-id: svn://tug.org/texlive/trunk@25116 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/poppler')
| -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 |
3 files changed, 7 insertions, 3 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 |