texlive[46958] Build/source/libs/poppler: hardwire

[commits+karl at tug.org]

Revision: 46958
          http://tug.org/svn/texlive?view=revision&revision=46958
Author:   karl
Date:     2018-03-14 02:50:06 +0100 (Wed, 14 Mar 2018)
Log Message:
-----------
hardwire HAVE_{DCT,JPX}_DECODER to 1

Modified Paths:
--------------
    trunk/Build/source/libs/poppler/ChangeLog
    trunk/Build/source/libs/poppler/config.h.in
    trunk/Build/source/libs/poppler/configure
    trunk/Build/source/libs/poppler/configure.ac

Modified: trunk/Build/source/libs/poppler/ChangeLog
===================================================================
--- trunk/Build/source/libs/poppler/ChangeLog	2018-03-14 01:25:13 UTC (rev 46957)
+++ trunk/Build/source/libs/poppler/ChangeLog	2018-03-14 01:50:06 UTC (rev 46958)
@@ -1,3 +1,10 @@
+2018-03-14  Luigi Scarso  <luigi.scarso at 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 at freefriends.org>
 
 	Import poppler-0.62.0.

Modified: trunk/Build/source/libs/poppler/config.h.in
===================================================================
--- trunk/Build/source/libs/poppler/config.h.in	2018-03-14 01:25:13 UTC (rev 46957)
+++ trunk/Build/source/libs/poppler/config.h.in	2018-03-14 01:50:06 UTC (rev 46958)
@@ -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. */

Modified: trunk/Build/source/libs/poppler/configure
===================================================================
--- trunk/Build/source/libs/poppler/configure	2018-03-14 01:25:13 UTC (rev 46957)
+++ trunk/Build/source/libs/poppler/configure	2018-03-14 01:50:06 UTC (rev 46958)
@@ -750,8 +750,6 @@
 enable_multithreaded
 enable_exceptions
 enable_fixedpoint
-enable_dctdecoder
-enable_libopenjpeg
 enable_largefile
 with_system_zlib
 with_zlib_includes
@@ -1401,8 +1399,6 @@
   --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,29 +7020,17 @@
 fi
 
 
-# Check whether --enable-dctdecoder was given.
-if test "${enable_dctdecoder+set}" = set; then :
-  enableval=$enable_dctdecoder; if test "x$enableval" = xlibjpeg; then
 
+# For TL, we just hardware DCT/JPX_DECODER to on.
+
 $as_echo "#define HAVE_DCT_DECODER 1" >>confdefs.h
 
-fi
 
-fi
 
-
-# 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
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default"

Modified: trunk/Build/source/libs/poppler/configure.ac
===================================================================
--- trunk/Build/source/libs/poppler/configure.ac	2018-03-14 01:25:13 UTC (rev 46957)
+++ trunk/Build/source/libs/poppler/configure.ac	2018-03-14 01:50:06 UTC (rev 46958)
@@ -69,22 +69,28 @@
 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 ****
 
 AC_CHECK_HEADERS([strings.h])