Import Ghostscript 9.55ghostscript-9.55

Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

1 files changed, 268 insertions, 312 deletions

diff --git a/configure b/configure
index 49b9a969..cef01a2c 100755
--- a/configure
+++ b/configure
@@ -689,6 +689,7 @@ SO_LIB_EXT
 X11_DEVS
 INSTALL_SHARED
 DYNAMIC_LIBS
+PDF_DYNAMIC_LDFLAGS
 PDL_DYNAMIC_LDFLAGS
 XPS_DYNAMIC_LDFLAGS
 PCL_DYNAMIC_LDFLAGS
@@ -699,6 +700,9 @@ DYNAMIC_CFLAGS
 GPDL_SONAME_MAJOR_MINOR
 GPDL_SONAME_MAJOR
 GPDL_SONAME
+PDF_SONAME_MAJOR_MINOR
+PDF_SONAME_MAJOR
+PDF_SONAME
 XPS_SONAME_MAJOR_MINOR
 XPS_SONAME_MAJOR
 XPS_SONAME
@@ -720,6 +724,11 @@ COMPILE_INITS
 GPDL_MAK
 GPDL_TARGET
 GPDL
+PDFROMFS_MAK
+GPDF_DEV
+PDF_MAK
+PDF_TARGET
+PDF
 XPSROMFS_MAK
 XPS_MAK
 XPS_TARGET
@@ -959,6 +968,7 @@ with_x
 with_gs
 with_pcl
 with_xps
+with_pdf
 with_gpdl
 enable_compile_inits
 with_drivers
@@ -1675,6 +1685,8 @@ Optional Packages:
                           available, ignored otherwise) [[gpcl6]]
   --with-xps=NAME         name of the GhostXPS executible (if the source is
                           available, ignored otherwise) [[gxps]]
+  --with-pdf=NAME         name of the Ghostpdf executible (if the source is
+                          available, ignored otherwise) [[gpdf]]
   --with-gpdl=NAME        name of the GhostPDL executible (if the source is
                           available, ignored otherwise) [[gpdl]]
   --with-drivers=LIST     Drivers to support, separated by commas.
@@ -1710,7 +1722,9 @@ Optional Packages:
                           Default: ALL
   --with-driversfile=FILE Drivers to support from file, separated by newlines.
   --with-extract-dir=EXTRACT_DIR
-
+                          Build with the specified Extract library. By default
+                          we build with Extract automatically if
+                          <ghostpdl-directory>/extract exists.
   --with-fontpath         set font search path for gs
   --with-tessdata         set tesseract data search path
   --with-memory-alignment Allows setting minimum alignment for the memory
@@ -4791,7 +4805,7 @@ fi
 
 
 # debug configurarion is available by default with "make debug"
-#AC_ARG_ENABLE([debug], AC_HELP_STRING([--enable-debug],
+#AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug],
 #    [turn on debugging]))
 #if test x$enable_debug = xyes; then
 #    optflags_to_try="-g"
@@ -5460,13 +5474,10 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
    no)
      BIGENDIAN=0 ;; #(
    universal)
-
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-
+     as_fn_error $? "Building of universal binaries is not implemented." "$LINENO" 5
      ;; #(
    *)
-     as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+     as_fn_error $? "Endian status cannot be determined" "$LINENO" 5 ;;
  esac
 
 
@@ -5690,118 +5701,6 @@ fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
 for ac_header in errno.h fcntl.h limits.h malloc.h memory.h stdlib.h string.h strings.h sys/ioctl.h sys/param.h sys/time.h sys/times.h syslog.h unistd.h dirent.h ndir.h sys/dir.h sys/ndir.h inttypes.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -6023,41 +5922,6 @@ esac
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_time=yes
-else
-  ac_cv_header_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
-
-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
-
-fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
 if ${ac_cv_struct_tm+:} false; then :
@@ -6166,11 +6030,11 @@ fi
 if test "$ac_cv_c_const" != yes; then
         GCFLAGS="$GCFLAGS -Dconst="
 fi
-if test "x$ac_cv_header_stdint_h" = xyes; then
+if test "x$ac_cv_header_stdint_h" = "xyes"; then
         GCFLAGS="$GCFLAGS -DHAVE_STDINT_H=1"
 fi
 
-if test "x$ac_cv_header_dirent_h" = xyes; then
+if test "x$ac_cv_header_dirent_h" = "xyes"; then
         GCFLAGS="$GCFLAGS -DHAVE_DIRENT_H=1"
 fi
 
@@ -6178,23 +6042,23 @@ if test "x$ac_cv_header_ndir_h" = xyes; then
         GCFLAGS="$GCFLAGS -DHAVE_NDIR_H=1"
 fi
 
-if test "x$ac_cv_header_sys_dir_h" = xyes; then
+if test "x$ac_cv_header_sys_dir_h" = "xyes"; then
         GCFLAGS="$GCFLAGS -DHAVE_SYS_DIR_H=1"
 fi
 
-if test "x$ac_cv_header_sys_ndir_h" = xyes; then
+if test "x$ac_cv_header_sys_ndir_h" = "xyes"; then
         GCFLAGS="$GCFLAGS -DHAVE_SYS_NDIR_H=1"
 fi
 
-if test "x$ac_cv_header_sys_time_h" = xyes; then
+if test "x$ac_cv_header_sys_time_h" = "xyes"; then
         GCFLAGS="$GCFLAGS -DHAVE_SYS_TIME_H=1"
 fi
 
-if test "x$ac_cv_header_sys_times_h" = xyes; then
+if test "x$ac_cv_header_sys_times_h" = "xyes"; then
         GCFLAGS="$GCFLAGS -DHAVE_SYS_TIMES_H=1"
 fi
 
-if test "x$ac_cv_header_inttypes_h" = xyes; then
+if test "x$ac_cv_header_inttypes_h" = "xyes"; then
         GCFLAGS="$GCFLAGS -DHAVE_INTTYPES_H=1"
 fi
 
@@ -6826,6 +6690,9 @@ TESSERACTINCLUDE=
 TESSERACT_LIBS=
 OCR_DEVS=
 
+OCR_DEVS_WARNING_LINE1=
+OCR_DEVS_WARNING_LINE2=
+
 
 # Check whether --with-tesseract was given.
 if test "${with_tesseract+set}" = set; then :
@@ -7138,7 +7005,7 @@ $as_echo_n "checking supported C++ compiler flags... " >&6; }
 
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
+#include <cstdlib>
 int
 main ()
 {
@@ -7157,27 +7024,33 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         CXXFLAGS="$old_cflags"
       done
 
-      CXXFLAGS="$save_cxxflags $CXXFLAGS_TO_USE"
+      if test x"$GXX" = x"no" || echo $CXXFLAGS_TO_USE | grep "std=c++17" ; then
+        if test x"$GXX" = x"no" ; then
+          OCR_DEVS_WARNING_LINE1="C++ compiler does not appear to be gcc or compatible, attempting to continue anyway"
+          OCR_DEVS_WARNING_LINE2="NOTE: that tesseract requires a C++17 compatible C++ compiler"
+        fi
+
+        CXXFLAGS="$save_cxxflags $CXXFLAGS_TO_USE"
 
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking sse4.1 support" >&5
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking sse4.1 support" >&5
 $as_echo_n "checking sse4.1 support... " >&6; }
-      save_cxxflags=$CXXFLAGS
-      TESS_CXXFLAGS="$CXXFLAGS"
-      CXXFLAGS="$CXXFLAGS -msse4.1"
+        save_cxxflags=$CXXFLAGS
+        TESS_CXXFLAGS="$CXXFLAGS"
+        CXXFLAGS="$CXXFLAGS -msse4.1"
 
-      TESS_SSE4_1=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        TESS_SSE4_1=""
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <emmintrin.h>
-                          #include <smmintrin.h>
+                            #include <smmintrin.h>
 int
 main ()
 {
 __m128i input1;
-                          unsigned char buf1[128];
-                          input1 = _mm_loadu_si128((const __m128i *)buf1);
-                          input1 = _mm_hadd_epi32(input1, input1);
-                          return(0);
+                            unsigned char buf1[128];
+                            input1 = _mm_loadu_si128((const __m128i *)buf1);
+                            input1 = _mm_hadd_epi32(input1, input1);
+                            return(0);
 
   ;
   return 0;
@@ -7191,29 +7064,29 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-      if test "x$TESS_SSE4_1" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+        if test "x$TESS_SSE4_1" != x; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        TESS_CXXFLAGS="$TESS_CXXFLAGS -DHAVE_SSE4_1"
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+          TESS_CXXFLAGS="$TESS_CXXFLAGS -DHAVE_SSE4_1"
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-      fi
+        fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking avx support" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking avx support" >&5
 $as_echo_n "checking avx support... " >&6; }
-      CXXFLAGS="$save_cxxflags -mavx"
+        CXXFLAGS="$save_cxxflags -mavx"
 
-      TESS_AVX=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        TESS_AVX=""
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <immintrin.h>
 int
 main ()
 {
 __m256d input1 = _mm256_setzero_pd();
-                          input1 = _mm256_hadd_pd(input1, input1);
-                          return(0);
+                            input1 = _mm256_hadd_pd(input1, input1);
+                            return(0);
   ;
   return 0;
 }
@@ -7226,31 +7099,31 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-      if test "x$TESS_AVX" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+        if test "x$TESS_AVX" != x; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        TESS_CXXFLAGS="$TESS_CXXFLAGS -DHAVE_AVX"
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+          TESS_CXXFLAGS="$TESS_CXXFLAGS -DHAVE_AVX"
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-      fi
+        fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking avx2 support" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking avx2 support" >&5
 $as_echo_n "checking avx2 support... " >&6; }
-      CXXFLAGS="$save_cxxflags -mavx2"
+        CXXFLAGS="$save_cxxflags -mavx2"
 
-      TESS_AVX2=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        TESS_AVX2=""
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <immintrin.h>
 int
 main ()
 {
 __m256i input1;
-                          unsigned char buf1[256];
-                          input1 = _mm256_loadu_si256((const __m256i *)buf1);
-                          input1 = _mm256_adds_epu8(input1, input1);
-                          return(0);
+                            unsigned char buf1[256];
+                            input1 = _mm256_loadu_si256((const __m256i *)buf1);
+                            input1 = _mm256_adds_epu8(input1, input1);
+                            return(0);
   ;
   return 0;
 }
@@ -7263,29 +7136,29 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-      if test "x$TESS_AVX2" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+        if test "x$TESS_AVX2" != x; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        TESS_CXXFLAGS="$TESS_CXXFLAGS -DHAVE_AVX2"
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+          TESS_CXXFLAGS="$TESS_CXXFLAGS -DHAVE_AVX2"
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-      fi
+        fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking fma support" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking fma support" >&5
 $as_echo_n "checking fma support... " >&6; }
-      CXXFLAGS="$save_cxxflags -mfma"
+        CXXFLAGS="$save_cxxflags -mfma"
 
-      TESS_FMA=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        TESS_FMA=""
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <immintrin.h>
 int
 main ()
 {
 __m256d input1 = _mm256_setzero_pd();
-                          input1 = _mm256_fmadd_pd(input1, input1, input1);
-                          return(0);
+                            input1 = _mm256_fmadd_pd(input1, input1, input1);
+                            return(0);
   ;
   return 0;
 }
@@ -7298,28 +7171,28 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-      if test "x$TESS_FMA" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+        if test "x$TESS_FMA" != x; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        TESS_CXXFLAGS="$TESS_CXXFLAGS -DHAVE_FMA"
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+          TESS_CXXFLAGS="$TESS_CXXFLAGS -DHAVE_FMA"
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-      fi
+        fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking neon support" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking neon support" >&5
 $as_echo_n "checking neon support... " >&6; }
-      CXXFLAGS="$save_cxxflags -mfpu=neon -mcpu=cortex-a53"
+        CXXFLAGS="$save_cxxflags -mfpu=neon -mcpu=cortex-a53"
 
-      TESS_NEON=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        TESS_NEON=""
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "arm_neon.h"
 int
 main ()
 {
 int32x4_t round = vdupq_n_s32(10);
-                         return(0);
+                           return(0);
   ;
   return 0;
 }
@@ -7332,22 +7205,25 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-      if test "x$TESS_NEON" != x; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+        if test "x$TESS_NEON" != x; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        TESS_CXXFLAGS="$TESS_CXXFLAGS -DHAVE_NEON"
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+          TESS_CXXFLAGS="$TESS_CXXFLAGS -DHAVE_NEON"
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-      fi
+        fi
 
-      CXXFLAGS="$save_cxxflags"
+        CXXFLAGS="$save_cxxflags"
 
-      OCR_VERSION=1
-      OCR_DEVS="\$(DD)ocr.dev \$(DD)hocr.dev \$(DD)pdfocr8.dev \$(DD)pdfocr24.dev \$(DD)pdfocr32.dev"
-      LEPTONICAINCLUDE="include base/leptonica.mak"
-      TESSERACTINCLUDE="include base/tesseract.mak"
-      TESSERACT_LIBS="-lstdc++"
+        OCR_VERSION=1
+        OCR_DEVS="\$(DD)ocr.dev \$(DD)hocr.dev \$(DD)pdfocr8.dev \$(DD)pdfocr24.dev \$(DD)pdfocr32.dev"
+        LEPTONICAINCLUDE="include base/leptonica.mak"
+        TESSERACTINCLUDE="include base/tesseract.mak"
+        TESSERACT_LIBS="-lstdc++"
+      else
+        OCR_DEVS_WARNING_LINE1="OCR devices disabled due to incompatible compiler: tesseract requires a C++17 compatible compiler"
+      fi
     fi
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -8942,7 +8818,7 @@ if test x"$SHARE_LIBTIFF" = x"0" ; then
       if ! test -d "$LIBTIFFCONFDIR" ; then
         mkdir "$LIBTIFFCONFDIR"
       fi
-      cd "$LIBTIFFCONFDIR" && "$absolute_source_path/$LIBTIFFDIR/configure" --disable-jbig --disable-lzma --disable-zstd --disable-webp $SUBCONFIG_OPTS
+      cd "$LIBTIFFCONFDIR" && "$absolute_source_path/$LIBTIFFDIR/configure" $GS_TIFF_CONFIGURE_OPTS --disable-jbig --disable-lzma --disable-zstd --disable-webp --disable-libdeflate $SUBCONFIG_OPTS
       status=$?
       if test $status -ne 0 ; then
         as_fn_error $status "libtiff configure script failed" "$LINENO" 5
@@ -9385,6 +9261,50 @@ done
 $as_echo "$as_me: WARNING: USING LOCAL CUPS SOURCE" >&2;}
             SHARELCUPS=0
             SHARELCUPSI=0
+            for ac_func in strlcat
+do :
+  ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat"
+if test "x$ac_cv_func_strlcat" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STRLCAT 1
+_ACEOF
+ CUPSCFLAGS="$CUPSCFLAGS -DHAVE_STRLCAT=1"
+fi
+done
+
+            for ac_func in strlcpy
+do :
+  ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
+if test "x$ac_cv_func_strlcpy" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STRLCPY 1
+_ACEOF
+ CUPSCFLAGS="$CUPSCFLAGS -DHAVE_STRLCPY=1"
+fi
+done
+
+            for ac_func in snprintf
+do :
+  ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
+if test "x$ac_cv_func_snprintf" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SNPRINTF 1
+_ACEOF
+ CUPSCFLAGS="$CUPSCFLAGS -DHAVE_SNPRINTF=1"
+fi
+done
+
+            for ac_func in vsnprintf
+do :
+  ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
+if test "x$ac_cv_func_vsnprintf" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VSNPRINTF 1
+_ACEOF
+ CUPSCFLAGS="$CUPSCFLAGS -DHAVE_VSNPRINTF=1"
+fi
+done
+
             LCUPSBUILDTYPE=linux
             LCUPSINCLUDE="include \$(GLSRCDIR)/lcups.mak"
             LCUPSIINCLUDE="include \$(GLSRCDIR)/lcupsi.mak"
@@ -9968,7 +9888,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-  #AC_ARG_ENABLE([sse4.2], AC_HELP_STRING([--disable-sse4.2],
+  #AC_ARG_ENABLE([sse4.2], AS_HELP_STRING([--disable-sse4.2],
   #       [Do not use sse4.2 instrinsics]), [
   #             if test "x$enable_sse4.2" = xno; then
   #                HAVE_SSE4_2=""
@@ -10012,7 +9932,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-  #AC_ARG_ENABLE([sse4.2], AC_HELP_STRING([--disable-sse4.2],
+  #AC_ARG_ENABLE([sse4.2], AS_HELP_STRING([--disable-sse4.2],
   #       [Do not use sse4.2 instrinsics]), [
   #             if test "x$enable_sse4.2" = xno; then
   #                HAVE_SSE4_2=""
@@ -10052,7 +9972,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-  #AC_ARG_ENABLE([neon], AC_HELP_STRING([--disable-neon],
+  #AC_ARG_ENABLE([neon], AS_HELP_STRING([--disable-neon],
   #       [Do not use neon instrinsics]), [
   #             if test "x$enable_neon" = xno; then
   #                HAVE_NEON=""
@@ -11105,6 +11025,42 @@ fi
 
 
 
+GPDF_DEV=
+PDF=
+PDF_MAK="\$(GLSRCDIR)\$(D)stub.mak"
+PDFROMFS_MAK="\$(GLSRCDIR)\$(D)stub.mak"
+
+if test x"$with_pdf" != x"no" ; then
+  if test -f $srcdir/pdf/pdf.mak; then
+
+# Check whether --with-pdf was given.
+if test "${with_pdf+set}" = set; then :
+  withval=$with_pdf; PDFEXE="$with_pdf"
+else
+  PDFEXE='gpdf'
+fi
+
+
+    if test -f $srcdir/pcl/pl/pl.mak && test x"$PCL_TARGET" != x"" ; then
+        PDF_TARGET=gpdf
+        PDF=$PDFEXE
+    else
+        PDF=no_gpdf
+    fi
+    CFLAGS="-DBUILD_PDF=1 -I$srcdir/pdf $CFLAGS"
+    GPDF_DEV="\$(PDFOBJDIR)\$(D)pdfi.dev"
+    PDF_MAK="\$(PDFSRCDIR)\$(D)pdf.mak"
+    PDFROMFS_MAK="\$(PDFSRCDIR)\$(D)pdfromfs.mak"
+  fi
+fi
+
+
+
+
+
+
+
+
 GPDL=no_gpdl
 GPDL_TARGET=
 GPDL_TARGET_VAR=
@@ -11520,6 +11476,11 @@ PCL_SONAME_MAJOR_MINOR="lib\$(PCL${libname3}"
 XPS_SONAME="lib\$(XPS${libname1}"
 XPS_SONAME_MAJOR="lib\$(XPS${libname2}"
 XPS_SONAME_MAJOR_MINOR="lib\$(XPS${libname3}"
+
+PDF_SONAME="lib\$(PDF${libname1}"
+PDF_SONAME_MAJOR="lib\$(PDF${libname2}"
+PDF_SONAME_MAJOR_MINOR="lib\$(PDF${libname3}"
+
 GPDL_SONAME="lib\$(GPDL${libname1}"
 GPDL_SONAME_MAJOR="lib\$(GPDL${libname2}"
 GPDL_SONAME_MAJOR_MINOR="lib\$(GPDL${libname3}"
@@ -11547,6 +11508,7 @@ case $host in
       PCL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR)"
       XPS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(XPS_SONAME_MAJOR)"
       PDL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GPDL_SONAME_MAJOR)"
+      PDF_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PDF_SONAME_MAJOR)"
       if test $GCC = yes; then
         # GCC high level flag
         DYNAMIC_LIBS="-rdynamic"
@@ -11580,6 +11542,9 @@ case $host in
       XPS_SONAME="lib\$(XPS${libname1}"
       XPS_SONAME_MAJOR="lib\$(XPS${libname3}"
       XPS_SONAME_MAJOR_MINOR="lib\$(XPS${libname2}"
+      PDF_SONAME="lib\$(PDF${libname1}"
+      PDF_SONAME_MAJOR="lib\$(PDF${libname3}"
+      PDF_SONAME_MAJOR_MINOR="lib\$(PDF${libname2}"
       GPDL_SONAME="lib\$(GPDL${libname1}"
       GPDL_SONAME_MAJOR="lib\$(GPDL${libname3}"
       GPDL_SONAME_MAJOR_MINOR="lib\$(GPDL${libname2}"
@@ -11616,6 +11581,7 @@ case $host in
       PCL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR)"
       XPS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(XPS_SONAME_MAJOR)"
       PDL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GPDL_SONAME_MAJOR)"
+      PDF_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PDF_SONAME_MAJOR)"
       DYNAMIC_LIBS=""
       SO_LIB_EXT=".so"
     ;;
@@ -11625,6 +11591,7 @@ case $host in
       PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(PCL_SONAME_MAJOR_MINOR)"
       XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(XPS_SONAME_MAJOR_MINOR)"
       PDL_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(GPDL_SONAME_MAJOR_MINOR)"
+      PDF_DYNAMIC_LDFLAGS="-dynamiclib -install_name $DARWIN_LDFLAGS_SO_PREFIX\$(PDF_SONAME_MAJOR_MINOR)"
       DYNAMIC_LIBS=""
       SO_LIB_EXT=".dylib"
     ;;
@@ -11644,6 +11611,7 @@ case $host in
       PCL_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR) $_ldflags"
       XPS_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(XPS_SONAME_MAJOR) $_ldflags"
       PDL_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GPDL_SONAME_MAJOR) $_ldflags"
+      PDF_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PDF_SONAME_MAJOR)"
       DYNAMIC_LIBS=""
       SO_LIB_EXT=".so"
     ;;
@@ -11655,12 +11623,15 @@ case $host in
         PCL_DYNAMIC_LDFLAGS="-shared -Wl,-brtl,-G -fPIC"
         XPS_DYNAMIC_LDFLAGS="-shared -Wl,-brtl,-G -fPIC"
         PDL_DYNAMIC_LDFLAGS="-shared -Wl,-brtl,-G -fPIC"
+        PDF_DYNAMIC_LDFLAGS="-shared -Wl,-brtl,-G -fPIC"
       else
         DYNAMIC_CFLAGS="$DYNAMIC_CFLAGS"
         GCFLAGS="-Wl,-brtl -D_LARGE_FILES $GCFLAGS"
         GS_DYNAMIC_LDFLAGS="-G -qmkshrobj -Wl,-brtl,-G"
         PCL_DYNAMIC_LDFLAGS="-G -qmkshrobj -Wl,-brtl,-G"
         XPS_DYNAMIC_LDFLAGS="-G -qmkshrobj -Wl,-brtl,-G"
+        PDL_DYNAMIC_LDFLAGS="-G -qmkshrobj -Wl,-brtl,-G"
+        PDF_DYNAMIC_LDFLAGS="-G -qmkshrobj -Wl,-brtl,-G"
       fi
       SO_LIB_EXT=".so"
       ;;
@@ -11692,6 +11663,11 @@ fi
 
 
 
+
+
+
+
+
 # Check whether --enable-dynamic was given.
 if test "${enable_dynamic+set}" = set; then :
   enableval=$enable_dynamic;
@@ -11753,6 +11729,7 @@ fi
 
 
 
+
 # Check whether --with-fontpath was given.
 if test "${with_fontpath+set}" = set; then :
   withval=$with_fontpath; fontpath="$withval"
@@ -12319,39 +12296,6 @@ test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
 esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if ${ac_cv_type_signal+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_type_signal=int
-else
-  ac_cv_type_signal=void
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
 $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
 if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
@@ -12512,48 +12456,50 @@ fi
 
 
 ALIGN_TEXT_PROG_INCS="\
-#include <stdio.h> \
-#include <stdlib.h>"
+#include <stdio.h>
+#include <stdlib.h>
+"
 
 
 ALIGN_TEXT_PROG="\
-    struct altest \
-    { \
-      char a; \
-      int b; \
-      long c; \
-      long long d; \
-      float e; \
-      double f; \
-      void *g; \
-    }; \
-    struct altest *a; \
-    struct altest d; \
-    char *b, *c, *lim; \
-    int ret = 0; \
-    c = b = malloc(64 * sizeof(struct altest)); \
-    lim = b + (64 * sizeof(struct altest)); \
-    do \
-    { \
-        b++; \
-        if ((b >= lim) || \
-            ((((unsigned int)b) & 4) == 0 && (((unsigned int)b) & 8) != 0)) \
-        { \
-          break; \
-        } \
-    } while(1); \
-    if (b >= lim) \
-    { \
-        ret = -1; \
-    } \
-    else \
-    { \
-        a = (struct altest *)b; \
-        b = a->g; \
-        ret = 0; \
-    } \
-    free(c); \
-    exit(ret);"
+    struct altest
+    {
+      char a;
+      int b;
+      long c;
+      long long d;
+      float e;
+      double f;
+      void *g;
+    };
+    struct altest *a;
+    struct altest d;
+    char *b, *c, *lim;
+    int ret = 0;
+    c = b = malloc(64 * sizeof(struct altest));
+    lim = b + (64 * sizeof(struct altest));
+    do
+    {
+        b++;
+        if ((b >= lim) ||
+            ((((unsigned int)b) & 4) == 0 && (((unsigned int)b) & 8) != 0))
+        {
+          break;
+        }
+    } while(1);
+    if (b >= lim)
+    {
+        ret = -1;
+    }
+    else
+    {
+        a = (struct altest *)b;
+        b = a->g;
+        ret = 0;
+    }
+    free(c);
+    exit(ret);
+"
 
 
 GS_MEMPTR_ALIGNMENT=
@@ -13688,6 +13634,17 @@ $as_echo "$as_me: WARNING: Due to the --enable-threadsafe option, the following
    echo "$NTS_EXCLUDES"
 fi
 
+if test x"$OCR_DEVS_WARNING_LINE1" != x"" ; then
+    echo ""
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $OCR_DEVS_WARNING_LINE1" >&5
+$as_echo "$as_me: WARNING: $OCR_DEVS_WARNING_LINE1" >&2;}
+    if test x"$OCR_DEVS_WARNING_LINE2" != x"" ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $OCR_DEVS_WARNING_LINE2" >&5
+$as_echo "$as_me: WARNING: $OCR_DEVS_WARNING_LINE2" >&2;}
+    fi
+    echo ""
+fi
+
 ac_config_files="$ac_config_files $CONFIG_FILES_LIST"
 
 
@@ -13837,7 +13794,6 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 
-
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files