hardwire HAVE_{DCT,JPX}_DECODER to 1

git-svn-id: svn://tug.org/texlive/trunk@46958 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 31 insertions, 34 deletions

diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index afe783aeab5..f972855b6d9 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,10 @@
+2018-03-14  Luigi Scarso  <luigi.scarso@gmail.com>
+
+	* configure.ac (HAVE_DCT_DECODER, HAVE_JPX_DECODER): hardwire to 1,
+	instead of requiring --enable.
+	Original report from Jose Manuel,
+	http://tug.org/pipermail/tex-live/2018-March/041158.html
+
 2018-01-08  Karl Berry  <karl@freefriends.org>
 
 	Import poppler-0.62.0.
diff --git a/Build/source/libs/poppler/config.h.in b/Build/source/libs/poppler/config.h.in
index c598ea143ff..f33427bc400 100644
--- a/Build/source/libs/poppler/config.h.in
+++ b/Build/source/libs/poppler/config.h.in
@@ -6,7 +6,7 @@
 /* define if the compiler supports basic C++11 syntax */
 #undef HAVE_CXX11
 
-/* Do we have any DCT decoder?. */
+/* Do we have any DCT decoder? */
 #undef HAVE_DCT_DECODER
 
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
@@ -28,7 +28,7 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Do we have any JPX decoder?. */
+/* Do we have any JPX decoder? */
 #undef HAVE_JPX_DECODER
 
 /* Define to 1 if you have the `localtime_r' function. */
diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure
index 30f45bde68d..1bb36bd8b7e 100755
--- a/Build/source/libs/poppler/configure
+++ b/Build/source/libs/poppler/configure
@@ -750,8 +750,6 @@ enable_opi
 enable_multithreaded
 enable_exceptions
 enable_fixedpoint
-enable_dctdecoder
-enable_libopenjpeg
 enable_largefile
 with_system_zlib
 with_zlib_includes
@@ -1401,8 +1399,6 @@ Optional Features:
   --enable-exceptions     use C++ exceptions
   --enable-fixedpoint     use fixed point (instead of floating point)
                           arithmetic
-  --enable-dctdecoder     use dctdecoder
-  --enable-libopenjpeg    use openjpeg decoder
   --disable-largefile     omit support for large files
 
 Optional Packages:
@@ -7024,27 +7020,15 @@ fi
 fi
 
 
-# Check whether --enable-dctdecoder was given.
-if test "${enable_dctdecoder+set}" = set; then :
-  enableval=$enable_dctdecoder; if test "x$enableval" = xlibjpeg; then
 
-$as_echo "#define HAVE_DCT_DECODER 1" >>confdefs.h
-
-fi
+# For TL, we just hardware DCT/JPX_DECODER to on.
 
-fi
+$as_echo "#define HAVE_DCT_DECODER 1" >>confdefs.h
 
 
-# Check whether --enable-libopenjpeg was given.
-if test "${enable_libopenjpeg+set}" = set; then :
-  enableval=$enable_libopenjpeg; if test "x$enableval" = xopenjpeg2; then
 
 $as_echo "#define HAVE_JPX_DECODER 1" >>confdefs.h
 
-fi
-
-fi
-
 
 
 for ac_header in strings.h
diff --git a/Build/source/libs/poppler/configure.ac b/Build/source/libs/poppler/configure.ac
index d7ae76f8e92..74596c7b298 100644
--- a/Build/source/libs/poppler/configure.ac
+++ b/Build/source/libs/poppler/configure.ac
@@ -69,21 +69,27 @@ AC_ARG_ENABLE([fixedpoint],
 fi
 ])
 
-AC_ARG_ENABLE([dctdecoder],
-              AS_HELP_STRING([--enable-dctdecoder],
-                             [use dctdecoder]),
-              [if test "x$enableval" = xlibjpeg; then
-  AC_DEFINE([HAVE_DCT_DECODER], 1, [Do we have any DCT decoder?.])
-fi
-])
 
-AC_ARG_ENABLE([libopenjpeg],
-              AS_HELP_STRING([--enable-libopenjpeg],
-                             [use openjpeg decoder]),
-              [if test "x$enableval" = xopenjpeg2; then
-  AC_DEFINE([HAVE_JPX_DECODER], 1, [Do we have any JPX decoder?.])
-fi
-])
+# For TL, we just hardware DCT/JPX_DECODER to on.
+AC_DEFINE([HAVE_DCT_DECODER], 1, [Do we have any DCT decoder?])
+dnl
+dnl AC_ARG_ENABLE([dctdecoder],
+dnl               AS_HELP_STRING([--enable-dctdecoder],
+dnl                             [use dctdecoder]),
+dnl              [if test "x$enableval" = xlibjpeg; then
+dnl  AC_DEFINE([HAVE_DCT_DECODER], 1, [Do we have any DCT decoder?])
+dnl fi
+dnl ])
+
+AC_DEFINE([HAVE_JPX_DECODER], 1, [Do we have any JPX decoder?])
+dnl
+dnl AC_ARG_ENABLE([libopenjpeg],
+dnl              AS_HELP_STRING([--enable-libopenjpeg],
+dnl                              [use openjpeg decoder]),
+dnl               [if test "x$enableval" = xopenjpeg2; then
+dnl   AC_DEFINE([HAVE_JPX_DECODER], 1, [Do we have any JPX decoder?])
+dnl fi
+dnl ])
 
 dnl **** Checks for header files ****