From 5b9c91d6e0e41a58ad65caf1f8a19b5ac22ba042 Mon Sep 17 00:00:00 2001 From: Luigi Scarso <luigi.scarso@gmail.com> Date: Thu, 1 Feb 2018 13:16:57 +0000 Subject: [PATCH] revert ac files for poppler . --- source/libs/poppler/Makefile.am | 2 +- source/libs/poppler/Makefile.in | 1 - source/libs/poppler/configure | 6 ------ source/libs/poppler/configure.ac | 7 +------ source/libs/poppler/include/Makefile.in | 1 - source/libs/poppler/include/fofi/Makefile.in | 1 - source/libs/poppler/include/goo/Makefile.in | 1 - 7 files changed, 2 insertions(+), 17 deletions(-) diff --git a/source/libs/poppler/Makefile.am b/source/libs/poppler/Makefile.am index 6fb22155b..e7d85423b 100644 --- a/source/libs/poppler/Makefile.am +++ b/source/libs/poppler/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am 46257 2018-01-09 18:53:05Z karl $ +## $Id: Makefile.am 46370 2018-01-18 23:05:30Z lscarso $ ## Proxy Makefile.am to build poppler for TeX Live. ## ## Copyright 2016-2018 Karl Berry <tex-live@tug.org> diff --git a/source/libs/poppler/Makefile.in b/source/libs/poppler/Makefile.in index 730532e80..66748099a 100644 --- a/source/libs/poppler/Makefile.in +++ b/source/libs/poppler/Makefile.in @@ -341,7 +341,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ -CXX_FLAGS_RELEASE = @CXX_FLAGS_RELEASE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ diff --git a/source/libs/poppler/configure b/source/libs/poppler/configure index a9154aa9b..30f45bde6 100755 --- a/source/libs/poppler/configure +++ b/source/libs/poppler/configure @@ -637,7 +637,6 @@ MINGW32_FALSE MINGW32_TRUE WIN32_FALSE WIN32_TRUE -CXX_FLAGS_RELEASE NO_WARN_CXXFLAGS EGREP GREP @@ -6981,11 +6980,6 @@ fi -CXX_FLAGS_RELEASE='-O2 -DNDEBUG -fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE' - - - - # Check whether --enable-opi was given. if test "${enable_opi+set}" = set; then : enableval=$enable_opi; if test "x$enableval" = xyes; then diff --git a/source/libs/poppler/configure.ac b/source/libs/poppler/configure.ac index 1ba274a7c..ff3b2f5ea 100644 --- a/source/libs/poppler/configure.ac +++ b/source/libs/poppler/configure.ac @@ -1,4 +1,4 @@ -dnl $Id: configure.ac 46257 2018-01-09 18:53:05Z karl $ +dnl $Id: configure.ac 46373 2018-01-18 23:12:02Z karl $ dnl Process this file with autoconf to produce a configure script. dnl dnl Copyright 2018 Karl Berry <tex-live@tug.org> @@ -36,11 +36,6 @@ fi AC_SUBST([NO_WARN_CXXFLAGS]) -CXX_FLAGS_RELEASE='-O2 -DNDEBUG -fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE' - -AC_SUBST([CXX_FLAGS_RELEASE]) - - dnl ##### Optional features. AC_ARG_ENABLE([opi], AS_HELP_STRING([--enable-opi], diff --git a/source/libs/poppler/include/Makefile.in b/source/libs/poppler/include/Makefile.in index 5cb1d58d9..903043db5 100644 --- a/source/libs/poppler/include/Makefile.in +++ b/source/libs/poppler/include/Makefile.in @@ -200,7 +200,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ -CXX_FLAGS_RELEASE = @CXX_FLAGS_RELEASE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ diff --git a/source/libs/poppler/include/fofi/Makefile.in b/source/libs/poppler/include/fofi/Makefile.in index c08382f40..7e38b6861 100644 --- a/source/libs/poppler/include/fofi/Makefile.in +++ b/source/libs/poppler/include/fofi/Makefile.in @@ -140,7 +140,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ -CXX_FLAGS_RELEASE = @CXX_FLAGS_RELEASE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ diff --git a/source/libs/poppler/include/goo/Makefile.in b/source/libs/poppler/include/goo/Makefile.in index c67a99d9b..b900e0822 100644 --- a/source/libs/poppler/include/goo/Makefile.in +++ b/source/libs/poppler/include/goo/Makefile.in @@ -140,7 +140,6 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ -CXX_FLAGS_RELEASE = @CXX_FLAGS_RELEASE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -- GitLab