Thu Sep 21 20:24:28 UTC 2017

.gitignore                       |   20 
 INSTALL                          |  244 +-------
 INSTALL.cmake                    |   76 --
 Makefile.am                      |  133 ----
 autogen.sh                       |  117 ---
 configure.ac                     | 1154 ---------------------------------------
 cpp/Makefile.am                  |   74 --
 cpp/tests/Makefile.am            |   21 
 fofi/Makefile.am                 |   28 
 glib/Makefile.am                 |  122 ----
 glib/demo/Makefile.am            |   56 -
 glib/poppler-features.h.in       |   88 --
 glib/reference/Makefile.am       |   92 ---
 glib/reference/version.xml.in    |    1 
 goo/Makefile.am                  |   69 --
 poppler-cairo-uninstalled.pc.in  |    6 
 poppler-cairo.pc.in              |    9 
 poppler-cpp-uninstalled.pc.in    |    7 
 poppler-cpp.pc.in                |   13 
 poppler-glib-uninstalled.pc.in   |    7 
 poppler-glib.pc.in               |   13 
 poppler-qt4-uninstalled.pc.in    |    7 
 poppler-qt4.pc.in                |   13 
 poppler-qt5-uninstalled.pc.in    |    7 
 poppler-qt5.pc.in                |   13 
 poppler-splash-uninstalled.pc.in |    7 
 poppler-splash.pc.in             |    9 
 poppler-uninstalled.pc.in        |    6 
 poppler.pc.in                    |   11 
 poppler/Makefile.am              |  348 -----------
 poppler/poppler-config.h.in      |  196 ------
 qt4/Makefile.am                  |    1 
 qt4/demos/Makefile.am            |   65 --
 qt4/src/Makefile.am              |   76 --
 qt4/tests/Makefile.am            |  141 ----
 qt5/Makefile.am                  |    1 
 qt5/demos/Makefile.am            |   65 --
 qt5/src/Makefile.am              |   78 --
 qt5/tests/Makefile.am            |  141 ----
 splash/Makefile.am               |   73 --
 test/Makefile.am                 |   67 --
 utils/Makefile.am                |  155 -----
 42 files changed, 43 insertions(+), 3787 deletions(-)

New commits:
commit 851bc59c6f4b007333d064af5c6992702b92cdf6
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Sep 21 20:45:52 2017 +0200

    Remove the autotools based build system

diff --git a/.gitignore b/.gitignore
index 73b67a25..a0f7d90c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,6 @@
-.cvsignore
 Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-test-driver
-compile
 ChangeLog
+gtkdoc.pyc
 poppler-cairo.pc
 poppler-cpp.pc
 poppler-glib.pc
@@ -26,7 +9,6 @@ poppler-qt4.pc
 poppler-qt5.pc
 poppler-splash.pc
 poppler.pc
-stamp-h1
 gtk-doc.make
 *.o
 *~
diff --git a/INSTALL b/INSTALL
index 56b077d6..7b5d6585 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,236 +1,76 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
 Basic Installation
 ==================
 
-These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
+mkdir build
+cd build
+cmake ..
+make
+make install
 
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
 
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+CMake configuration options can be set using the -D option. eg
 
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=release
 
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
 
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
+Build Options
+=============
 
-Specifying the System Type
-==========================
+Set install prefix:
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
+  -DCMAKE_INSTALL_PREFIX=<path>
 
-     CPU-COMPANY-SYSTEM
+Set build type. This sets the standard compiler flags for the build
+type.
 
-where SYSTEM can have one of these forms:
+  -DCMAKE_BUILD_TYPE=debug  or  -DCMAKE_BUILD_TYPE=release
 
-     OS KERNEL-OS
+Set compiler flags:
 
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
+  -DCMAKE_CXX_FLAGS=<flags>   or set CXXFLAGS environment variable
 
-   If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
-produce code for.
+Set linker flags:
 
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
+  -DCMAKE_LD_FLAGS=<flags>   or set LDFLAGS environment variable
 
-Sharing Defaults
-================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
+Optional Features
+=================
 
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
+  -D<FEATURE>=<ON|OFF>
 
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+eg
 
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+  -DENABLE_SPLASH=ON -DBUILD_GTK_TESTS=OFF
 
-`configure' Invocation
-======================
+A list of all options can be display with the commmand:
 
-`configure' recognizes the following options to control how it operates.
+  egrep '^ *(option|set.*STRING)' CMakeLists.txt
 
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
+Alternatively, the options can be edited by running "ccmake ." in the
+build directory.
 
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
 
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
+Cross Compiling
+===============
 
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
+A toolchain file is required to specify the target specific compiler
+tools. Run cmake with the option:
 
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
+  -DCMAKE_TOOLCHAIN_FILE=<Toolchain file>
 
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
+A sample toolchain for a 64-bit mingw build is shown below. Replace
+/path/to/win/root with the install prefix for the target environment.
 
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
+  SET(CMAKE_SYSTEM_NAME Windows)
+  SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+  SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
+  SET(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
+  SET(CMAKE_FIND_ROOT_PATH  /usr/x86_64-w64-mingw32 /path/to/win/root )
+  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+  set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
diff --git a/INSTALL.cmake b/INSTALL.cmake
deleted file mode 100644
index 7b5d6585..00000000
--- a/INSTALL.cmake
+++ /dev/null
@@ -1,76 +0,0 @@
-Installation Instructions
-*************************
-
-Basic Installation
-==================
-
-mkdir build
-cd build
-cmake ..
-make
-make install
-
-
-CMake configuration options can be set using the -D option. eg
-
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=release
-
-
-Build Options
-=============
-
-Set install prefix:
-
-  -DCMAKE_INSTALL_PREFIX=<path>
-
-Set build type. This sets the standard compiler flags for the build
-type.
-
-  -DCMAKE_BUILD_TYPE=debug  or  -DCMAKE_BUILD_TYPE=release
-
-Set compiler flags:
-
-  -DCMAKE_CXX_FLAGS=<flags>   or set CXXFLAGS environment variable
-
-Set linker flags:
-
-  -DCMAKE_LD_FLAGS=<flags>   or set LDFLAGS environment variable
-
-
-Optional Features
-=================
-
-  -D<FEATURE>=<ON|OFF>
-
-eg
-
-  -DENABLE_SPLASH=ON -DBUILD_GTK_TESTS=OFF
-
-A list of all options can be display with the commmand:
-
-  egrep '^ *(option|set.*STRING)' CMakeLists.txt
-
-Alternatively, the options can be edited by running "ccmake ." in the
-build directory.
-
-
-Cross Compiling
-===============
-
-A toolchain file is required to specify the target specific compiler
-tools. Run cmake with the option:
-
-  -DCMAKE_TOOLCHAIN_FILE=<Toolchain file>
-
-A sample toolchain for a 64-bit mingw build is shown below. Replace
-/path/to/win/root with the install prefix for the target environment.
-
-  SET(CMAKE_SYSTEM_NAME Windows)
-  SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
-  SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
-  SET(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
-  SET(CMAKE_FIND_ROOT_PATH  /usr/x86_64-w64-mingw32 /path/to/win/root )
-  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-  set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index bf878bad..00000000
--- a/Makefile.am
+++ /dev/null
@@ -1,133 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-testdatadir=$(TESTDATADIR)
-
-if BUILD_SPLASH_OUTPUT
-splash_subdir = splash
-splash_pc_file = poppler-splash.pc
-endif
-
-if BUILD_CAIRO_OUTPUT
-cairo_pc_file = poppler-cairo.pc
-endif
-
-if BUILD_POPPLER_GLIB
-glib_subdir = glib
-glib_pc_file = poppler-glib.pc
-endif
-
-if BUILD_POPPLER_QT5
-qt5_subdir = qt5
-qt5_pc_file = poppler-qt5.pc
-endif
-
-if BUILD_POPPLER_QT4
-qt4_subdir = qt4
-qt4_pc_file = poppler-qt4.pc
-endif
-
-
-if BUILD_POPPLER_CPP
-cpp_subdir = cpp
-cpp_pc_file = poppler-cpp.pc
-endif
-
-SUBDIRS = goo fofi $(splash_subdir) poppler utils $(glib_subdir) test $(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
-
-EXTRA_DIST =					\
-	README-XPDF				\
-	poppler.pc.in				\
-	poppler-uninstalled.pc.in		\
-	poppler-cairo.pc.in			\
-	poppler-cairo-uninstalled.pc.in		\
-	poppler-splash.pc.in			\
-	poppler-splash-uninstalled.pc.in	\
-	poppler-qt4.pc.in			\
-	poppler-qt4-uninstalled.pc.in		\
-	poppler-qt5.pc.in			\
-	poppler-qt5-uninstalled.pc.in		\
-	poppler-cpp.pc.in			\
-	poppler-cpp-uninstalled.pc.in
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA =				\
-	poppler.pc				\
-	$(cairo_pc_file)			\
-	$(splash_pc_file)			\
-	$(glib_pc_file)				\
-	$(qt4_pc_file)				\
-	$(qt5_pc_file)				\
-	$(cpp_pc_file)
-
-# Add CMake buildsystem files here so they get added on make dist
-EXTRA_DIST +=							\
-	cpp/tests/CMakeLists.txt				\
-	cpp/CMakeLists.txt					\
-	glib/demo/CMakeLists.txt				\
-	glib/CMakeLists.txt					\
-	glib/poppler-features.h.cmake				\
-	qt4/src/CMakeLists.txt					\
-	qt4/tests/CMakeLists.txt				\
-	qt4/CMakeLists.txt					\
-	qt4/demos/CMakeLists.txt				\
-	qt5/src/CMakeLists.txt					\
-	qt5/tests/CMakeLists.txt				\
-	qt5/CMakeLists.txt					\
-	qt5/demos/CMakeLists.txt				\
-	test/CMakeLists.txt					\
-	utils/CMakeLists.txt					\
-	CMakeLists.txt						\
-	ConfigureChecks.cmake					\
-	cmake/modules/CheckFileOffsetBits.c			\
-	cmake/modules/CheckFileOffsetBits.cmake			\
-	cmake/modules/COPYING-CMAKE-SCRIPTS			\
-	cmake/modules/FindCairo.cmake				\
-	cmake/modules/FindFontconfig.cmake			\
-	cmake/modules/FindGLIB.cmake				\
-	cmake/modules/FindGObjectIntrospection.cmake		\
-	cmake/modules/FindGTK.cmake				\
-	cmake/modules/FindIconv.cmake				\
-	cmake/modules/FindLCMS.cmake				\
-	cmake/modules/FindLCMS2.cmake				\
-        cmake/modules/FindNSS3.cmake				\
-	cmake/modules/FindQt4.cmake				\
-	cmake/modules/GObjectIntrospectionMacros.cmake		\
-	cmake/modules/MacroBoolTo01.cmake			\
-	cmake/modules/MacroEnsureVersion.cmake			\
-	cmake/modules/MacroOptionalFindPackage.cmake		\
-	cmake/modules/MacroPushRequiredVars.cmake		\
-	cmake/modules/PopplerDefaults.cmake			\
-	cmake/modules/PopplerMacros.cmake			\
-	cmake/modules/FindLIBOPENJPEG.cmake			\
-	cmake/modules/FindLIBOPENJPEG2.cmake			\
-	config.h.cmake						\
-	poppler-cairo.pc.cmake					\
-	poppler/poppler-config.h.cmake				\
-	poppler-cpp.pc.cmake					\
-	poppler-glib.pc.cmake					\
-	poppler-qt4.pc.cmake					\
-	poppler-qt5.pc.cmake					\
-	poppler-splash.pc.cmake					\
-	poppler.pc.cmake
-
-
-
-distclean-local:
-	if test "$(srcdir)" = "."; then :; else \
-		rm -f ChangeLog; \
-	fi
-
-ChangeLog:
-	$(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
-	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat) | fmt --split-only > $@.tmp \
-	  && mv -f $@.tmp $@ \
-	  || ($(RM) $@.tmp; \
-	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
-	      (test -f $@ || echo git log is required to generate this file >> $@)); \
-	else \
-	  test -f $@ || \
-	  (echo A git checkout and git log is required to generate ChangeLog >&2 && \
-	  echo A git checkout and git log is required to generate this file >> $@); \
-	fi
-
-.PHONY: ChangeLog
-
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index ae95c2f7..00000000
--- a/autogen.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-
-# Package name
-PKG_NAME=${PKG_NAME:-Poppler}
-srcdir=$(dirname $0)
-
-# Default version requirements
-REQUIRED_GTK_DOC_VERSION=${REQUIRED_GTK_DOC_VERSION:-1.0}
-
-# Print types
-boldface="`tput bold 2>/dev/null`"
-normal="`tput sgr0 2>/dev/null`"
-printbold() {
-    echo $ECHO_N "$boldface"
-    echo "$@"
-    echo $ECHO_N "$normal"
-}
-printboldn() {
-    echo -n $ECHO_N "$boldface"
-    echo "$@"
-    echo -n $ECHO_N "$normal"
-}
-printerr() {
-    echo "$@" >&2
-}		
-
-# Usage:
-#     compare_versions MIN_VERSION ACTUAL_VERSION
-# returns true if ACTUAL_VERSION >= MIN_VERSION
-compare_versions() {
-    ch_min_version=$1
-    ch_actual_version=$2
-    ch_status=0
-    IFS="${IFS=         }"; ch_save_IFS="$IFS"; IFS="."
-    set $ch_actual_version
-    for ch_min in $ch_min_version; do
-        ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
-        if [ -z "$ch_min" ]; then break; fi
-        if [ -z "$ch_cur" ]; then ch_status=1; break; fi
-        if [ $ch_cur -gt $ch_min ]; then break; fi
-        if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
-    done
-    IFS="$ch_save_IFS"
-    return $ch_status
-}
-
-# Usage:
-#     version_check PACKAGE VARIABLE CHECKPROGS MIN_VERSION SOURCE
-# checks to see if the package is available
-version_check() {
-    vc_package=$1
-    vc_variable=$2
-    vc_checkprogs=$3
-    vc_min_version=$4
-    vc_source=$5
-    vc_status=1
-
-    vc_checkprog=`eval echo "\\$$vc_variable"`
-    if [ -n "$vc_checkprog" ]; then
-        printbold "using $vc_checkprog for $vc_package"
-        return 0
-    fi
-
-    printbold "Checking for $vc_package >= $vc_min_version..."
-    for vc_checkprog in $vc_checkprogs; do
-        echo -n $ECHO_N "  Testing $vc_checkprog... "
-        if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then
-            vc_actual_version=`$vc_checkprog --version | head -n 1 | \
-                               sed 's/^.*[      ]\([0-9.]*[a-z]*\).*$/\1/'`
-            if compare_versions $vc_min_version $vc_actual_version; then
-                echo "found $vc_actual_version"
-                # set variable
-                eval "$vc_variable=$vc_checkprog"
-                vc_status=0
-                break
-            else
-                echo "too old (found version $vc_actual_version)"
-            fi
-        else
-            echo "not found."
-        fi
-    done
-    if [ "$vc_status" != 0 ]; then
-	printerr
-	printboldn "  Error: You must have $vc_package >= $vc_min_version"
-	printboldn "         installed to build $PKG_NAME"
-	printerr
-	printerr "  Download the appropriate package for"
-	printerr "  from your distribution or get the source tarball at"
-	printerr "  $vc_source"
-	printerr
-    fi
-    return $vc_status
-}
-
-want_gtk_doc=false
-if [ ! "`echo $@ |grep -- --enable-gtk-doc`" = "" ]; then
-    version_check gtk-doc GTKDOCIZE gtkdocize $REQUIRED_GTK_DOC_VERSION \
-"http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" || DIE=1
-    want_gtk_doc=true
-fi
-
-printbold "Running autoreconf -v -i ..."
-(cd $srcdir && autoreconf -v -i )
-
-if $want_gtk_doc; then
-    printbold "Running $GTKDOCIZE..."
-    (cd $srcdir && $GTKDOCIZE --copy) || exit 1
-fi
-
-if test x$NOCONFIGURE = x; then
-    printbold "Running $srcdir/configure $@ ..."
-    $srcdir/configure "$@"
-else
-    printbold "Skipping configure process."
-fi
-
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index e4054581..00000000
--- a/configure.ac
+++ /dev/null
@@ -1,1154 +0,0 @@
-m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[59])
-m4_define([poppler_version_micro],[0])
-m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
-
-AC_PREREQ(2.59)
-AC_INIT([poppler],[poppler_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=poppler])
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.7 foreign])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-AC_CONFIG_HEADERS([config.h poppler/poppler-config.h])
-AC_C_BIGENDIAN
-
-dnl ##### Initialize libtool.
-AC_LIBTOOL_WIN32_DLL
-define([AC_LIBTOOL_LANG_F77_CONFIG], [:])
-AC_PROG_LIBTOOL
-
-dnl ##### Checks for programs.
-AC_PROG_CC
-AC_PROG_CXX
-AC_ISC_POSIX
-AC_PROG_CC_STDC
-#if test -z "$CXX" -a "$CC" = "gcc"; then
-#  CXX="gcc"
-#fi
-AC_PROG_CXX
-AC_PROG_INSTALL
-CXXFLAGS="$CXXFLAGS -std=c++11 -D_DEFAULT_SOURCE"
-
-dnl ##### Check for pkgconfig
-PKG_PROG_PKG_CONFIG
-
-dnl ##### Export the version
-AC_DEFINE_UNQUOTED([POPPLER_VERSION], ["poppler_version"], [Defines the poppler version])
-
-dnl Enable these unconditionally.
-AC_DEFINE([OPI_SUPPORT], [1], [Generate OPI comments in PS output.])
-AC_DEFINE([MULTITHREADED], [1], [Enable multithreading support.])
-AC_DEFINE([TEXTOUT_WORD_LIST], [1], [Enable word list support.])
-
-dnl Check for OS specific flags
-win32_libs=""
-create_shared_lib=""
-auto_import_flags=""
-case "$host_os" in
-  cygwin*)
-    create_shared_lib="-no-undefined"
-  ;;
-  mingw*)
-    os_win32=yes
-    win32_libs="-lgdi32 -lwinspool -lcomdlg32"
-    create_shared_lib="-no-undefined"
-    auto_import_flags="-Wl,--enable-auto-import"
-
-    # Use mingw's ansi stdio extensions
-    CXXFLAGS="$CXXFLAGS -D__USE_MINGW_ANSI_STDIO=1"
-  ;;
-esac
-
-AC_SUBST(win32_libs)
-AC_SUBST(create_shared_lib)
-AC_SUBST(auto_import_flags)
-
-AX_PTHREAD()
-
-dnl Install xpdf headers
-AC_ARG_ENABLE(xpdf-headers,
-	      AC_HELP_STRING([--enable-xpdf-headers],
-	                     [Install unsupported xpdf headers.]),
-              enable_xpdf_headers=$enableval,
-              enable_xpdf_headers="no")
-AM_CONDITIONAL(ENABLE_XPDF_HEADERS, test x$enable_xpdf_headers = xyes)
-
-dnl ##### Emulate cmake -DCMAKE_BUILD_TYPE=Release using options from cmake/modules/PopplerMacros.cmake
-
-AC_ARG_ENABLE(build-type,
-              AC_HELP_STRING([--enable-build-type=@<:@relwithdebinfo/release/debug/debugfull/profile@:>@],
-                             [Build with options similar to 'cmake -DCMAKE_BUILD_TYPE=' values.]),
-              [enable_build_type=no;
-              case "$enableval" in
-              relwithdebinfo|release|debug|debugfull|profile) enable_build_type="$enableval" ;;
-              *) AC_MSG_ERROR([bad value $enableval for --enable-build-type option.
-                               Options are relwithdebinfo, release, debug, debugfull, and profile.]) ;;
-              esac],
-              enable_build_type=no)
-
-if test "x$GCC" = "xyes"; then
-    case "$enable_build_type" in
-    relwithdebinfo)
-        CFLAGS="-O2 -g $CFLAGS"
-        CXXFLAGS="-O2 -g $CXXFLAGS"
-        ;;
-    release)
-        CFLAGS="-O2 $CFLAGS -g0 -DNDEBUG"
-        CXXFLAGS="-O2 $CXXFLAGS -g0 -DNDEBUG"
-        ;;
-    debug)
-        CFLAGS="-O2 -g $CFLAGS -fno-reorder-blocks -fno-schedule-insns -fno-inline"
-        CXXFLAGS="-O2 -g $CXXFLAGS -fno-reorder-blocks -fno-schedule-insns -fno-inline"
-        ;;
-    debugfull)
-        CFLAGS="$CFLAGS -g3 -fno-inline"
-        CXXFLAGS="$CXXFLAGS -g3 -fno-inline"
-        ;;
-    profile)
-        CFLAGS="$CFLAGS -g3 -fno-inline -ftest-coverage -fprofile-arcs"
-        CXXFLAGS="$CXXFLAGS -g3 -fno-inline -ftest-coverage -fprofile-arcs"
-        LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage -lgcov"
-        ;;
-    *)
-        enable_build_type=no
-        ;;
-    esac
-else
-    case "$enable_build_type" in
-    relwithdebinfo|release|debug|debugfull|profile)
-        echo "  Warning: --enable-build-type ignored for non-gcc compiler."
-        ;;
-    esac
-    enable_build_type=no
-fi
-
-AC_ARG_ENABLE(single-precision,
-        AC_HELP_STRING([--enable-single-precision],
-                       [use single precision arithmetic (instead of double
-                        precision) in the Splash backend]),
-        enable_single_precision=$enableval,
-        enable_single_precision=no)
-if test x$enable_single_precision != xno; then
-        AC_DEFINE(USE_FLOAT, [1], [Use single precision arithmetic in the Splash backend])
-fi
-
-AC_ARG_ENABLE(fixedpoint,
-        AC_HELP_STRING([--enable-fixedpoint],
-                       [use fixed point (instead of double precision) arithmetic
-                        in the Splash backend]),
-        enable_fixedpoint=$enableval,
-        enable_fixedpoint=no)
-if test x$enable_fixedpoint != xno; then
-        if test x$enable_single_precision != xno; then
-                AC_MSG_ERROR([Choose only one of --enable-single-precision or --enable-fixedpoint!])
-        fi
-        AC_DEFINE(USE_FIXEDPOINT, [1], [Use fixed point arithmetic in the Splash backend])
-fi
-
-AC_ARG_ENABLE(cmyk,
-        AC_HELP_STRING([--enable-cmyk],
-                       [Include support for CMYK rasterization]),
-        enable_cmyk=$enableval,
-        enable_cmyk=no)
-if test x$enable_cmyk != xno; then
-        AC_DEFINE(SPLASH_CMYK, [1], [Include support for CMYK rasterization])
-fi
-
-dnl Relocation support
-AC_ARG_ENABLE(relocatable,
-    AC_HELP_STRING([--disable-relocatable],
-                   [Hardcode the poppler library location (on Windows).]),
-    enable_relocatable=$enableval,
-    [if test x$os_win32 = xyes; then
-         # default to yes on native Windows.
-         enable_relocatable="yes"
-     else
-         # default to no everywhere else.
-         enable_relocatable="no"
-     fi
-    ]
-)
-
-if test x$enable_relocatable = xyes; then
-    if test x$os_win32 = xyes; then
-     AC_DEFINE([ENABLE_RELOCATABLE],
-               [1],[Do not hardcode the library location])
-    else
-        AC_MSG_ERROR(
-               [Invalid setting for relocatable, only supported on windows])
-
-    fi
-fi
-
-dnl ##### Check for installed poppler-data. Use the same datarootdir as default otherwise.
-PKG_CHECK_EXISTS(poppler-data,
-                 [POPPLER_DATADIR=`$PKG_CONFIG --variable=poppler_datadir poppler-data`
-                  AC_DEFINE_DIR(POPPLER_DATADIR, "{POPPLER_DATADIR}", [Poppler data dir])],
-                 [AC_DEFINE_DIR(POPPLER_DATADIR, "{datarootdir}/poppler", [Poppler data dir])]
-                 )
-
-dnl ##### Checks for header files.
-AC_PATH_XTRA
-AC_HEADER_DIRENT
-AC_CHECK_HEADERS([stdint.h])
-
-dnl ##### Switch over to C++.  This will make the checks below a little
-dnl ##### bit stricter (requiring function prototypes in include files).
-dnl ##### (99% of xpdf is written in C++.)
-AC_LANG_CPLUSPLUS
-
-AC_CHECK_DECL(gettimeofday, [AC_CHECK_FUNC(gettimeofday, AC_DEFINE(HAVE_GETTIMEOFDAY, 1, [Defines if gettimeofday is available on your system]))],[],[#include <sys/time.h>])
-AC_CHECK_FUNC(localtime_r, AC_DEFINE(HAVE_LOCALTIME_R, 1, [Defines if localtime_r is available on your system]))
-AC_CHECK_FUNC(gmtime_r, AC_DEFINE(HAVE_GMTIME_R, 1, [Defines if gmtime_r is available on your system]))
-AC_CHECK_FUNC(timegm, AC_DEFINE(HAVE_TIMEGM, 1, [Defines if timegm is available on your system]))
-AC_CHECK_FUNC(rand_r, AC_DEFINE(HAVE_RAND_R, 1, [Defines if rand_r is available on your system]))
-
-dnl ##### Check for extra libraries needed by X.  (LynxOS needs this.)
-AC_CHECK_FUNC(nanosleep,,)
-dnl try in librt if not found in current LIBS
-if test x$ac_cv_func_nanosleep = xno
-then
-   AC_CHECK_LIB(rt,nanosleep, X_EXTRA_LIBS="$X_EXTRA_LIBS -lrt")
-fi
-
-dnl try in libposix4, if not found so far
-if test x$ac_cv_func_nanosleep = xno && test x$ac_cv_lib_rt_nanosleep = xno
-then
-   AC_CHECK_LIB(posix4,nanosleep, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix4")
-fi
-
-
-dnl ##### Test for libopenjpeg. Versions prior to 1.4 do not provide a pkgconfig file.
-openjpeg1="no"
-openjpeg2="no"
-AC_ARG_ENABLE(libopenjpeg,
-	      AC_HELP_STRING([--enable-libopenjpeg=@<:@auto/openjpeg1/openjpeg2/unmaintained/none@:>@],
-                             [Use openjpeg for JPEG2000 images. 'auto' prefers openjpeg2 over openjpeg1 if both are available. 'unmaintained' gives you the internal unmaintained decoder. Use at your own risk. 'none' compiles no JPX decoder at all. [[default=auto]]]),
-              [enable_libopenjpeg=$enableval],
-              [enable_libopenjpeg="auto"])
-
-openjpeg_header=yes
-
-dnl test for libopenjpeg2
-if test x$enable_libopenjpeg = xopenjpeg2 || test x$enable_libopenjpeg = xauto; then
-  PKG_CHECK_MODULES(LIBOPENJPEG, libopenjp2,
-                    [openjpeg2=yes],[openjpeg2=no])
-fi
-
-dnl test for libopenjpeg1
-if test x$openjpeg2 = xno; then
-  if test x$enable_libopenjpeg = xopenjpeg1 || test x$enable_libopenjpeg = xauto; then
-    PKG_CHECK_MODULES(LIBOPENJPEG, libopenjpeg,
-      [openjpeg1="yes"],
-      [AC_CHECK_LIB([openjpeg], [opj_cio_open],
-        [openjpeg1="yes"
-         LIBOPENJPEG_LIBS="-lopenjpeg"],[openjpeg_header=no])
-       AC_CHECK_HEADERS([openjpeg.h],,
-		        [openjpeg_header="no"])])
-  fi
-fi
-
-
-if test x$enable_libopenjpeg = xopenjpeg1 && test x$openjpeg1 = xno; then
-  if test x$openjpeg_header = xno; then
-    AC_MSG_ERROR("*** libopenjpeg headers not found ***")
-  else
-    AC_MSG_ERROR("*** libopenjpeg library not found ***")
-  fi
-fi
-
-if test x$enable_libopenjpeg = xopenjpeg2 && test x$openjpeg2 = xno; then
-  AC_MSG_ERROR("*** libopenjp2 library not found ***")
-fi
-
-if test x$openjpeg1 = xyes || test x$openjpeg2 = xyes; then
-  enable_libopenjpeg=yes
-  if test x$openjpeg1 = xyes; then
-    AC_DEFINE(USE_OPENJPEG1, 1, [Defined if using openjpeg1])
-  fi
-  if test x$openjpeg2 = xyes; then
-    AC_DEFINE(USE_OPENJPEG2, 1, [Defined if using openjpeg2])
-  fi
-
-  AC_SUBST(LIBOPENJPEG_CFLAGS)
-  AC_SUBST(LIBOPENJPEG_LIBS)
-  AC_DEFINE(ENABLE_LIBOPENJPEG)
-  PKG_CHECK_EXISTS(libopenjpeg >= 1.5,
-      [AC_DEFINE(WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG, 1, [OpenJPEG with the OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG flag.])],
-      [PKG_CHECK_EXISTS(libopenjpeg1 >= 1.5,
-       [AC_DEFINE(WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG, 1, [OpenJPEG with the OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG flag.])],
-       [])
-      ])
-  have_jpx_decoder=yes
-  AC_DEFINE(HAVE_JPX_DECODER)
-else
-  if test x$enable_libopenjpeg = xunmaintained; then
-    enable_libopenjpeg=no
-    have_jpx_decoder=yes
-    AC_DEFINE(HAVE_JPX_DECODER)
-  elif test x$enable_libopenjpeg = xnone; then
-    enable_libopenjpeg=no
-    have_jpx_decoder=no
-  else
-    if test x$enable_libopenjpeg = xopenjpeg2 || test x$enable_libopenjpeg = xopenjpeg1 || test x$enable_libopenjpeg = xauto; then
-      AC_MSG_ERROR([Install libopenjpeg2 or libopenjpeg1 before trying to build poppler. You can also decide to use the internal unmaintained JPX decoder or none at all. See --help.])
-    else
-      AC_MSG_ERROR([Invalid --enable-libopenjpeg value. See --help.])
-    fi
-  fi
-fi
-
-AH_TEMPLATE([HAVE_JPX_DECODER], [Do we have any JPX decoder?.])
-
-dnl Test for NSS
-AC_ARG_ENABLE(libnss,
-        AC_HELP_STRING([--disable-libnss],
-                       [Do not build against libnss3.]),
-              enable_libnss=$enableval,
-              enable_libnss="try")
-
-if test x$enable_libnss != xno; then
-  PKG_CHECK_MODULES(NSS3, nss, [enable_nss="yes"],
-      [enable_nss="no"])
-fi
-
-if test x$enable_nss = xyes; then
-  AC_DEFINE(ENABLE_NSS3, 1, [Build against NSS.])
-fi
-
-AM_CONDITIONAL(BUILD_LIBOPENJPEG, test x$openjpeg1 = xyes || test x$openjpeg2 = xyes)
-AH_TEMPLATE([ENABLE_LIBOPENJPEG],
-	    [Use libopenjpeg instead of builtin jpeg2000 decoder.])
-
-AM_CONDITIONAL(BUILD_NSS, test x$enable_nss = xyes)
-AH_TEMPLATE([ENABLE_NSS3], [Build Poppler against NSS for digital signature support.])
-
-dnl ##### Test for libtiff
-AC_ARG_ENABLE(libtiff,
-		AC_HELP_STRING([--disable-libtiff],
-				[Don't build against libtiff.]),
-		enable_libtiff=$enableval,
-		enable_libtiff="try")
-
-AC_ARG_VAR([LIBTIFF_CFLAGS], [C compiler flags for LIBTIFF])
-AC_ARG_VAR([LIBTIFF_LIBS], [linker flags to link LIBTIFF (default is -ltiff)])
-ac_save_CPPFLAGS="$CPPFLAGS"
-ac_save_CXXFLAGS="$CXXFLAGS"
-ac_save_LIBS="$LDFLAGS"
-CPPFLAGS="$CPPFLAGS $LIBTIFF_CFLAGS"
-CXXFLAGS="$CXXFLAGS $LIBTIFF_CFLAGS"
-LIBS="$LIBS $LIBTIFF_LIBS"
-if test x$enable_libtiff = xyes; then
-  if test x"$LIBTIFF_LIBS" != x; then
-    AC_CHECK_FUNC([TIFFOpen],,
-		  AC_MSG_ERROR("*** libtiff library not found ***"))
-  else
-    AC_CHECK_LIB([tiff], [TIFFOpen],,
-		  AC_MSG_ERROR("*** libtiff library not found ***"))
-  fi
-  AC_CHECK_HEADERS([tiffio.h],,
-		AC_MSG_ERROR("*** libtiff headers not found ***"))
-elif test x$enable_libtiff = xtry; then
-  if test x"$LIBTIFF_LIBS" != x; then
-    AC_CHECK_FUNC([TIFFOpen],
-		  [enable_libtiff="yes"],
-		  [enable_libtiff="no"])
-  else
-    AC_CHECK_LIB([tiff], [TIFFOpen],
-		 [enable_libtiff="yes"],
-		 [enable_libtiff="no"])
-  fi
-  AC_CHECK_HEADERS([tiffio.h],,
-		[enable_libtiff="no"])
-fi
-CPPFLAGS="$ac_save_CPPFLAGS"
-CXXFLAGS="$ac_save_CXXFLAGS"
-LIBS="$ac_save_LIBS"
-
-if test x$enable_libtiff = xyes; then
-  if test x"$LIBTIFF_LIBS" = x; then
-    LIBTIFF_LIBS="-ltiff"
-  fi
-  AC_SUBST(LIBTIFF_CFLAGS)
-  AC_SUBST(LIBTIFF_LIBS)
-  AC_DEFINE(ENABLE_LIBTIFF)
-fi
-
-AM_CONDITIONAL(BUILD_LIBTIFF, test x$enable_libtiff = xyes)
-AH_TEMPLATE([ENABLE_LIBTIFF], [Build against libtiff.])
-if test x$enable_libtiff = xyes; then
-  AC_DEFINE(ENABLE_LIBTIFF, 1, [Build against libtiff.])
-fi
-
-dnl ##### Checks for library functions.
-AC_CHECK_FUNCS(popen mkstemp mkstemps)
-AC_CHECK_FUNCS(strcpy_s strcat_s)
-
-dnl ##### Back to C for the library tests.
-AC_LANG_C
-
-dnl ##### Check for fseeko/ftello or fseek64/ftell64
-dnl The LARGEFILE and FSEEKO macros have to be called in C, not C++, mode.
-AC_SYS_LARGEFILE
-AC_FUNC_FSEEKO
-AC_CHECK_FUNCS(fseek64, xpdf_cv_func_fseek64=yes, xpdf_cv_func_fseek64=no)
-AC_CHECK_FUNCS(ftell64, xpdf_cv_func_ftell64=yes, xpdf_cv_func_ftell64=no)
-if test "$xpdf_cv_func_fseek64" = yes -a "$xpdf_cv_func_ftell64" = yes; then
-  AC_DEFINE(HAVE_FSEEK64)
-fi
-AC_CHECK_FUNCS(pread64 lseek64)
-
-dnl Test for zlib
-AC_ARG_ENABLE(zlib,
-	      AC_HELP_STRING([--disable-zlib],
-			     [Don't build against zlib.]),
-	      enable_zlib=$enableval,
-	      enable_zlib="try")
-
-AC_ARG_ENABLE([zlib_uncompress],
-	      AS_HELP_STRING([--enable-zlib-uncompress],
-			     [Use zlib to uncompress flate streams (not totally safe)]),
-              enable_zlib_uncompress=$enableval,
-              enable_zlib_uncompress="no")
-
-if test x$enable_zlib = xyes; then
-   AC_CHECK_LIB([z], [inflate],,
-        AC_MSG_ERROR("*** zlib library not found ***"))
-   AC_CHECK_HEADERS([zlib.h],,
-	AC_MSG_ERROR("*** zlib headers not found ***"))
-elif test x$enable_zlib = xtry; then
-   AC_CHECK_LIB([z], [inflate],
-	        [enable_zlib="yes"],
-		[enable_zlib="no"])
-   AC_CHECK_HEADERS([zlib.h],,
-		[enable_zlib="no"])
-fi
-
-if test x$enable_zlib = xyes; then
-    ZLIB_LIBS="-lz"
-    AC_SUBST(ZLIB_LIBS)
-    AC_DEFINE(ENABLE_ZLIB, 1, [Build against zlib.])
-
-    if test x$enable_zlib_uncompress = xyes; then
-        AC_DEFINE(ENABLE_ZLIB_UNCOMPRESS, 1,
-             [Use zlib instead of builtin zlib decoder to uncompress flate streams.])
-    fi
-else
-    if test x$enable_zlib_uncompress = xyes; then
-	echo "  Warning: --enable-zlib-uncompress is incompatible with --disable-zlib."
-    fi
-    enable_zlib_uncompress="no"
-fi
-
-AM_CONDITIONAL(BUILD_ZLIB, test x$enable_zlib = xyes)
-AH_TEMPLATE([ENABLE_ZLIB],
-	    [Build against zlib.])
-AM_CONDITIONAL(BUILD_ZLIB_UNCOMPRESS, test x$enable_zlib_uncompress = xyes)
-AH_TEMPLATE([ENABLE_ZLIB_UNCOMPRESS],
-	    [Use zlib instead of builtin zlib decoder to uncompress flate streams.])
-
-dnl Test for libcurl
-AC_ARG_ENABLE(libcurl,
-	      AC_HELP_STRING([--enable-libcurl],
-	                     [Build with libcurl based HTTP support.]),
-              enable_libcurl=$enableval,
-              enable_libcurl="no")
-
-if test x$enable_libcurl = xyes; then
-  PKG_CHECK_MODULES(LIBCURL, libcurl)
-  AC_DEFINE(ENABLE_LIBCURL, 1, [Build against libcurl.])
-  AC_DEFINE(POPPLER_HAS_CURL_SUPPORT, 1,
-     [Support for curl based doc builder is compiled in.])
-fi
-
-AM_CONDITIONAL(BUILD_LIBCURL, test x$enable_libcurl = xyes)
-
-dnl Test for dct decoder
-AC_ARG_ENABLE(dctdecoder,
-	      AC_HELP_STRING([--enable-dctdecoder=@<:@libjpeg/unmaintained/none@:>@],
-                             [Decides which DCT decoder to use. 'libjpeg' will use libjpeg if available or fail if not. 'unmaintained' gives you the internal unmaintained decoder. Use at your own risk. 'none' compiles no DCT decoder at all. [[default=libjpeg]]]),
-              [dctdecoder=$enableval],
-              [dctdecoder="libjpeg"])
-
-AC_ARG_VAR([LIBJPEG_CFLAGS], [C compiler flags for LIBJPEG])
-if test x$dctdecoder = x"libjpeg"; then
-
-  dnl
-  dnl POPPLER_FIND_JPEG uses "USER_INCLUDES" and "USER_LIBS"
-  dnl to receive the flags for header and library directories.
-  dnl
-  ac_save_USER_INCLUDES="$USER_INCLUDES"
-  ac_save_USER_LDFLAGS="$USER_LDFLAGS"
-  USER_INCLUDES="$USER_INCLUDES $LIBJPEG_CFLAGS"
-  USER_LDFLAGS="$USER_LDFLAGS $LIBJPEG_CFLAGS"
-  POPPLER_FIND_JPEG
-
-  dnl check INT16, INT32 typedef conflict in jmorecfg.h
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  ac_save_CFLAGS="$CFLAGS"
-  CPPFLAGS="$CPPFLAGS $LIBJPEG_CFLAGS"
-  CFLAGS="$CFLAGS $LIBJPEG_CFLAGS"
-  AC_MSG_CHECKING([libjpeg.h works correctly])
-  AC_COMPILE_IFELSE([
-    AC_LANG_PROGRAM([
-#ifdef _WIN32
-#include <windows.h>
-#endif
-#include <sys/types.h>
-#include <stdio.h>
-#include <jpeglib.h>
-],[{return 0;}])],[
-    AC_MSG_RESULT([ok])
-  ],[
-    AC_MSG_RESULT([no])
-    AC_MSG_CHECKING([libjpeg.h problem can be fixed by XMD_H macro])
-    CPPFLAGS="$CPPFLAGS -DXMD_H"
-    CFLAGS="$CFLAGS -DXMD_H"
-    AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([
-#ifdef _WIN32
-#include <windows.h>
-#endif
-#include <sys/types.h>
-#include <stdio.h>
-#include <jpeglib.h>
-],[{return 0;}])],[
-      AC_MSG_RESULT([ok, -DXMD_H is added to LIBJPEG_CFLAGS])
-      LIBJPEG_CFLAGS="$LIBJPEG_CFLAGS -DXMD_H"
-    ],[
-      AC_MSG_RESULT([no, disable libjpeg])
-      enable_libjpeg="no"
-    ])
-  ])
-  CPPFLAGS="$ac_save_CPPFLAGS"
-  CFLAGS="$ac_save_CFLAGS"
-
-  dnl POPPLER_FIND_JPEG sets LIBJPEG_LIBS
-  AC_SUBST(LIBJPEG_CFLAGS)
-  USER_INCLUDES="$ac_save_USER_INCLUDES"
-  USER_LDFLAGS="$ac_save_USER_LDFLAGS"
-
-  if test x$enable_libjpeg != x"yes"; then
-    AC_MSG_ERROR([Install libjpeg before trying to build poppler. You can also decide to use the internal unmaintained DCT decoder or none at all. See --help.])
-  fi
-  have_dct_decoder="yes"
-  AC_DEFINE(HAVE_DCT_DECODER)
-elif test x$dctdecoder = x"unmaintained"; then
-  enable_libjpeg="no"
-  have_dct_decoder="yes"
-  AC_DEFINE(HAVE_DCT_DECODER)
-elif test x$dctdecoder = x"none"; then
-  enable_libjpeg="no"
-  have_dct_decoder="no"
-else
-    AC_MSG_ERROR([Invalid --enable-dctdecoder value. See --help.])
-fi
-
-AH_TEMPLATE([HAVE_DCT_DECODER], [Do we have any DCT decoder?.])
-
-AM_CONDITIONAL(BUILD_LIBJPEG, test x$enable_libjpeg = xyes)
-AH_TEMPLATE([ENABLE_LIBJPEG],
-            [Use libjpeg instead of builtin unmaintained jpeg decoder.])
-
-dnl Test for libpng
-AC_ARG_ENABLE(libpng,
-	      AC_HELP_STRING([--disable-libpng],
-	                     [Do not build against libpng.]),
-              enable_libpng=$enableval,
-              enable_libpng="try")
-
-if test x$enable_libpng != xno; then
-  PKG_CHECK_MODULES(LIBPNG, libpng, [enable_libpng="yes"],
-      [enable_libpng="no"])
-fi
-
-if test x$enable_libpng = xyes; then
-  AC_DEFINE(ENABLE_LIBPNG, 1, [Build against libpng.])
-fi
-
-AM_CONDITIONAL(BUILD_LIBPNG, test x$enable_libpng = xyes)
-
-dnl Check for freetype headers
-
-PKG_CHECK_MODULES(FREETYPE, freetype2,
-                  [freetype_pkgconfig=yes], [freetype_pkgconfig=no])
-
-if test "x$freetype_pkgconfig" = "xyes"; then
-
-  AC_DEFINE(HAVE_FREETYPE_H, 1, [Have FreeType2 include files])
-
-else
-
-  FREETYPE_LIBS=
-  FREETYPE_CFLAGS=
-
-  AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-  if test "x$FREETYPE_CONFIG" != "xno" ; then
-
-    FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
-    FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
-    AC_DEFINE(HAVE_FREETYPE_H, 1, [Have FreeType2 include files])
-
-  fi
-
-fi
-
-AC_SUBST(FREETYPE_CFLAGS)
-AC_SUBST(FREETYPE_LIBS)
-
-AC_MSG_CHECKING([which font configuration to use])
-AC_ARG_WITH([font_configuration],
-   [AS_HELP_STRING([--with-font-configuration=fontconfig|win32],
-                   [Select font configuration backend])],
-   [],
-   [if test x$os_win32 = xyes; then
-        # default to win32 on native Windows.
-        with_font_configuration=win32
-    else
-        # default to fontconig everywhere else.
-        with_font_configuration=fontconfig
-    fi
-   ]
-)
-AC_MSG_RESULT([$with_font_configuration])
-
-case $with_font_configuration in
-  win32)
-     AC_DEFINE([WITH_FONTCONFIGURATION_WIN32],
-               [1],[Use win32 font configuration backend])
-     # Set the minimum required Internet Explorer version to 5.0
-     CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x0500"
-     ;;
-  fontconfig)
-     AC_DEFINE([WITH_FONTCONFIGURATION_FONTCONFIG],
-               [1],[Use fontconfig font configuration backend])
-     PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.0.0)
-     ;;
-  *)
-     AC_MSG_ERROR(
-               [Invalid font configuration setting: $with_font_configuration])
-     ;;
-esac
-
-AM_CONDITIONAL(BUILD_WITH_WIN32_FONTCONFIGURATION,
-               test x$with_font_configuration = xwin32)
-
-AC_ARG_ENABLE(splash-output,
-              AC_HELP_STRING([--disable-splash-output],
-	                     [Don't build the Splash graphics backend.]),,
-              enable_splash_output="yes")
-AM_CONDITIONAL(BUILD_SPLASH_OUTPUT, test x$enable_splash_output = xyes)
-AH_TEMPLATE([HAVE_SPLASH], [Use splash for rendering.])
-if test x$enable_splash_output = xyes; then
-  AC_DEFINE(HAVE_SPLASH)
-fi
-
-CAIRO_VERSION="1.10.0"
-AC_SUBST(CAIRO_VERSION)
-CAIRO_DEPS="cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION"
-AC_ARG_ENABLE(cairo-output,
-              AC_HELP_STRING([--disable-cairo-output],
-                             [Don't build the cairo graphics backend.]),
-              enable_cairo_output=$enableval,
-              enable_cairo_output="try")
-use_cairo=""
-if test x$enable_cairo_output = xyes; then
-  PKG_CHECK_MODULES(CAIRO, $CAIRO_DEPS)
-elif test x$enable_cairo_output = xtry; then
-  PKG_CHECK_MODULES(CAIRO, $CAIRO_DEPS,
-                    [enable_cairo_output="yes"],
-                    [enable_cairo_output="no"
-		     use_cairo="no (requires cairo >= $CAIRO_VERSION)"])
-fi
-if test "x$use_cairo" = "x"; then
-   use_cairo=$enable_cairo_output
-fi
-
-AC_SUBST(CAIRO_CFLAGS)
-AC_SUBST(CAIRO_LIBS)
-
-AM_CONDITIONAL(BUILD_CAIRO_OUTPUT, test x$enable_cairo_output = xyes)
-AH_TEMPLATE([HAVE_CAIRO], [Use cairo for rendering.])
-if test x$enable_cairo_output = xyes; then
-  PDFTOCAIRO_DEPS="cairo cairo-ft"
-  dnl Check for optional cairo backends used by pdftocairo
-  PKG_CHECK_EXISTS(cairo-pdf, [PDFTOCAIRO_DEPS="$PDFTOCAIRO_DEPS cairo-pdf"], [])
-  PKG_CHECK_EXISTS(cairo-ps,  [PDFTOCAIRO_DEPS="$PDFTOCAIRO_DEPS cairo-ps"],  [])
-  PKG_CHECK_EXISTS(cairo-svg, [PDFTOCAIRO_DEPS="$PDFTOCAIRO_DEPS cairo-svg"], [])
-
-  PKG_CHECK_MODULES(PDFTOCAIRO, $PDFTOCAIRO_DEPS)
-  AC_SUBST(PDFTOCAIRO_CFLAGS)
-  AC_SUBST(PDFTOCAIRO_LIBS)
-
-  AC_DEFINE(HAVE_CAIRO)
-  CAIRO_FEATURE="#define POPPLER_HAS_CAIRO 1"
-  CAIRO_REQ="cairo"
-  AC_CHECK_HEADERS(fcntl.h sys/mman.h sys/stat.h)
-else
-  CAIRO_FEATURE="#undef POPPLER_HAS_CAIRO"
-  CAIRO_REQ=""
-fi
-AC_SUBST(CAIRO_FEATURE)
-AC_SUBST(CAIRO_REQ)
-
-use_glib=""
-found_introspection=no
-if test x$enable_cairo_output = xyes; then
-  POPPLER_GLIB_DISABLE_DEPRECATED=""
-  POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
-
-  GLIB_REQUIRED=2.41
-  AC_SUBST(GLIB_REQUIRED)
-  AC_ARG_ENABLE(poppler-glib,
-	        AC_HELP_STRING([--disable-poppler-glib],
-		               [Don't compile poppler glib wrapper.]),
-              		       enable_poppler_glib=$enableval,
-			       enable_poppler_glib="try")
-  if test x$enable_poppler_glib = xyes; then
-    PKG_CHECK_MODULES(POPPLER_GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION)
-  elif test x$enable_poppler_glib = xtry; then
-    PKG_CHECK_MODULES(POPPLER_GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION,
-                      [enable_poppler_glib="yes"],
-                      [enable_poppler_glib="no"
-                      use_glib="no (requires glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION)"])
-  fi
-  if test x$enable_poppler_glib = xyes; then
-    # Check for introspection
-    GOBJECT_INTROSPECTION_CHECK([0.6.7])
-
-    AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
-    POPPLER_GLIB_DISABLE_DEPRECATED="$POPPLER_GLIB_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED"
-    POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="$POPPLER_GLIB_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES"
-  fi
-else
-  if test x$enable_poppler_glib = xyes; then
-    AC_MSG_ERROR("Cairo output is required to build glib frontend")
-  fi
-  use_glib="no (requires cairo output)"
-  enable_poppler_glib="no"
-fi
-if test x"$use_glib" = x; then
-   use_glib="$enable_poppler_glib"
-fi
-AM_CONDITIONAL(BUILD_POPPLER_GLIB, test x$enable_poppler_glib = xyes)
-AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-AC_SUBST(GLIB_REQ)
-AC_SUBST(POPPLER_GLIB_DISABLE_DEPRECATED)
-AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
-
-GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
-
-dnl 
-dnl Try Qt4
-dnl
-
-AC_ARG_ENABLE(poppler-qt4,
-              AC_HELP_STRING([--disable-poppler-qt4],
-	                     [Don't compile poppler Qt4 wrapper.]),
-              enable_poppler_qt4=$enableval,
-              enable_poppler_qt4="try")
-if test x$enable_poppler_qt4 = xyes; then
-  PKG_CHECK_MODULES(POPPLER_QT4, 
-	            QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0)
-  PKG_CHECK_MODULES(POPPLER_QT4_TEST, 
-	            QtTest >= 4.7.0)
-elif test x$enable_poppler_qt4 = xtry; then
-  PKG_CHECK_MODULES(POPPLER_QT4,
-                    QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0,
-                    [enable_poppler_qt4="yes"],
-                    [enable_poppler_qt4="no"])
-  if test x$enable_poppler_qt4 = xyes; then
-    PKG_CHECK_MODULES(POPPLER_QT4_TEST,
-                    QtTest >= 4.7.0,
-                    [enable_poppler_qt4="yes"],
-                    [enable_poppler_qt4="no"])
-  fi
-fi
-
-AC_SUBST(POPPLER_QT4_CXXFLAGS)
-AC_SUBST(POPPLER_QT4_LIBS)
-AC_SUBST(POPPLER_QT4_TEST_LIBS)
-
-if test x$enable_poppler_qt4 = xyes; then
-  AC_CHECK_TOOL(MOCQT4, moc)
-  AC_MSG_CHECKING([for Qt4 moc])
-  mocversion=`$MOCQT4 -v 2>&1`
-  mocversiongrep=`echo $mocversion | grep "Qt 4"`
-  if test x"$mocversiongrep" != x"$mocversion"; then
-    AC_MSG_RESULT([no])
-    # moc was not the qt4 one, try with moc-qt4
-    AC_CHECK_TOOL(MOCQT42, moc-qt4)
-    AC_MSG_CHECKING([for Qt4 moc-qt4])
-    mocversion=`$MOCQT42 -v 2>&1`
-    mocversiongrep=`echo $mocversion | grep "Qt 4"`
-    if test x"$mocversiongrep" != x"$mocversion"; then
-      # no valid moc found
-      enable_poppler_qt4=no;
-      MOCQT4="not found"
-    else
-      MOCQT4=$MOCQT42
-    fi
-  fi
-  AC_SUBST(MOCQT4)
-  AC_MSG_RESULT([$MOCQT4])
-fi
-
-AM_CONDITIONAL(BUILD_POPPLER_QT4, test "x$enable_poppler_qt4" = "xyes")
-
-dnl 
-dnl Try Qt5
-dnl
-
-AC_ARG_ENABLE(poppler-qt5,
-              AC_HELP_STRING([--disable-poppler-qt5],
-	                     [Don't compile poppler Qt5 wrapper.]),
-              enable_poppler_qt5=$enableval,
-              enable_poppler_qt5="try")
-if test x$enable_poppler_qt5 = xyes; then
-  PKG_CHECK_MODULES(POPPLER_QT5, 
-	            Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0)
-  PKG_CHECK_MODULES(POPPLER_QT5_TEST, 
-	            Qt5Test >= 5.0.0 ) 
-elif test x$enable_poppler_qt5 = xtry; then
-  PKG_CHECK_MODULES(POPPLER_QT5,
-                    Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0,
-                    [enable_poppler_qt5="yes"],
-                    [enable_poppler_qt5="no"])
-  if test x$enable_poppler_qt5 = xyes; then
-    PKG_CHECK_MODULES(POPPLER_QT5_TEST,
-                    Qt5Test >= 5.0.0,
-                    [enable_poppler_qt5="yes"],
-                    [enable_poppler_qt5="no"])
-  fi
-fi
-
-AC_SUBST(POPPLER_QT5_CXXFLAGS)
-AC_SUBST(POPPLER_QT5_LIBS)
-AC_SUBST(POPPLER_QT5_TEST_LIBS)
-
-if test x$enable_poppler_qt5 = xyes; then
-  AC_CHECK_TOOL(MOCQT5, moc)
-  AC_MSG_CHECKING([for Qt5 moc])
-  mocversion=`$MOCQT5 -v 2>&1`
-  mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
-  if test x"$mocversiongrep" != x"$mocversion"; then
-    AC_MSG_RESULT([no])
-    # moc was not the qt5 one, try with moc-qt5
-    AC_CHECK_TOOL(MOCQT52, moc-qt5)
-    AC_MSG_CHECKING([for Qt5 moc-qt5])
-    mocversion=`$MOCQT52 -v 2>&1`
-    mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"`
-    if test x"$mocversiongrep" != x"$mocversion"; then
-      AC_CHECK_TOOL(QTCHOOSER, qtchooser)
-      AC_MSG_CHECKING([for qtchooser])
-      qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
-      mocversion=`$qt5tooldir/moc -v 2>&1`
-      mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
-      if test x"$mocversiongrep" != x"$mocversion"; then
-        # no valid moc found
-        enable_poppler_qt5=no;
-        MOCQT5="not found"
-      else
-        MOCQT5=$qt5tooldir/moc
-      fi
-    else
-      MOCQT5=$MOCQT52
-    fi
-  fi
-  AC_SUBST(MOCQT5)
-  AC_MSG_RESULT([$MOCQT5])
-fi
-
-AM_CONDITIONAL(BUILD_POPPLER_QT5, test "x$enable_poppler_qt5" = "xyes")
-
-dnl
-dnl CPP frontend
-dnl
-
-AC_ARG_ENABLE(poppler-cpp,
-              AC_HELP_STRING([--disable-poppler-cpp],
-                             [Don't compile poppler cpp wrapper.]),
-              enable_poppler_cpp=$enableval,
-              enable_poppler_cpp="yes")
-if test x$enable_poppler_cpp = xyes; then
-  AM_ICONV()
-  if test x$am_func_iconv != xyes; then
-    enable_poppler_cpp=no
-  fi
-fi
-
-AM_CONDITIONAL(BUILD_POPPLER_CPP, test "x$enable_poppler_cpp" = "xyes")
-
-
-GTK_TEST_DEPS='gtk+-3.0 >= 3.8 gdk-pixbuf-2.0'
-if test x$enable_cairo_output = xyes; then
-  GTK_TEST_DEPS="$GTK_TEST_DEPS $CAIRO_DEPS"
-fi
-AC_ARG_ENABLE(gtk-test,
-              AC_HELP_STRING([--disable-gtk-test],
-	                     [Don't compile GTK+ test program.]),
-              enable_gtk_test=$enableval,
-              enable_gtk_test="try")
-if test x$enable_gtk_test = xyes; then
-  PKG_CHECK_MODULES(GTK_TEST, $GTK_TEST_DEPS)
-elif test x$enable_gtk_test = xtry; then
-  PKG_CHECK_MODULES(GTK_TEST, $GTK_TEST_DEPS,
-                    [enable_gtk_test="yes"],
-                    [enable_gtk_test="no"])
-fi
-AM_CONDITIONAL(BUILD_GTK_TEST, test x$enable_gtk_test = xyes -a x$enable_poppler_glib = xyes)
-
-AC_ARG_ENABLE(utils,
-              AC_HELP_STRING([--disable-utils],
-	                     [Don't compile poppler command line utils.]),
-              enable_utils=$enableval,
-              enable_utils="yes")
-AM_CONDITIONAL(BUILD_UTILS, test x$enable_utils = xyes)
-
-AC_ARG_ENABLE(compile-warnings,
-              AC_HELP_STRING([--enable-compile-warnings=@<:@no/yes/kde@:>@],
-                             [Turn on compiler warnings.]),,
-              [enable_compile_warnings="yes"])
-
-dnl
-dnl   Color Management
-dnl
-
-AC_ARG_ENABLE(cms,
-              AC_HELP_STRING([--enable-cms=@<:@auto/lcms1/lcms2/none@:>@],
-                             [Use color management system. 'auto' prefers lcms2 over lcms1 if both are available [[default=auto]]]),
-              [enable_cms=$enableval],
-              [enable_cms="auto"])
-if test x$enable_cms = xauto; then
-  PKG_CHECK_MODULES(LCMS, lcms2, [lcms2=yes], [lcms2=no])
-  if test x$lcms2 = xno; then
-      PKG_CHECK_MODULES(LCMS, lcms, [lcms1=yes], [lcms1=no])
-  fi
-elif test x$enable_cms = xlcms1; then
-  PKG_CHECK_MODULES(LCMS, lcms, [lcms1=yes], [lcms1=no])
-elif test x$enable_cms = xlcms2; then
-  PKG_CHECK_MODULES(LCMS, lcms2, [lcms2=yes], [lcms2=no])
-fi
-
-if test x$lcms1 = xyes || test x$lcms2 = xyes; then
-  enable_cms=yes
-  AC_DEFINE(USE_CMS, 1, [Defines if use cms])
-  if test x$lcms1 = xyes; then
-    lcms1=yes;
-    AC_DEFINE(USE_LCMS1, 1, [Defines if use lcms1])
-  fi
-else
-  enable_cms=no
-fi
-
-AM_CONDITIONAL(USE_CMS, test x$enable_cms = xyes)
-AM_CONDITIONAL(USE_LCMS1, test x$lcms1 = xyes)
-
-AC_ARG_WITH([testdatadir],
-   [AS_HELP_STRING([--with-testdatadir=/path/to/testdatadir],
-                   [Specify test data dir])],
-   [case $withval in
-       [[\\/]]* | ?:[[\\/]]* )  # Absolute name.
-          TESTDATADIR=$withval ;;
-       *) # Relative name.
-          TESTDATADIR=$ac_pwd/$withval ;;
-    esac
-   ],
-   [case $srcdir in
-       [[\\/]]* | ?:[[\\/]]* )  # Absolute name.
-          TESTDATADIR=$srcdir/../test ;;
-       *) # Relative name.
-          TESTDATADIR=$ac_pwd/$srcdir/../test ;;
-    esac
-   ]
-)
-AC_MSG_CHECKING([for test data in $TESTDATADIR])
-if test -d $TESTDATADIR && test -f $TESTDATADIR/test-poppler.c; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_WARN([
- No test data found in $TESTDATADIR.
- You will not be able to run 'make check' successfully.
-
- The test data is not included in the source packages
- and is also not part of the main git repository. Instead,
- you can checkout the test data from its own git
- repository with:
-
-   git clone git://git.freedesktop.org/git/poppler/test
-
- You should checkout the test data as a sibling of your
- poppler source folder or specify the location of your
- checkout with --with-testdatadir=/path/to/checkoutdir/test.
-])
-fi
-AC_SUBST(TESTDATADIR)
-
-# some compilers do not support this flag (see bug #76963)
-fno_check_new=
-AC_MSG_CHECKING([for -fno-check-new compiler flag])
-AC_LANG_PUSH([C++])
-saved_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-fno-check-new $CXXFLAGS"
-AC_TRY_COMPILE([], [],
-  [AC_MSG_RESULT([yes])
-  fno_check_new="-fno-check-new"],
-  AC_MSG_RESULT([no])
-)
-CXXFLAGS=$saved_CXXFLAGS
-AC_LANG_POP
-
-if test "x$GCC" != xyes; then
-  enable_compile_warnings=no
-fi
-case "$enable_compile_warnings" in
-  no)	;;
-  yes)	CXXFLAGS="-Wall -Woverloaded-virtual -Wnon-virtual-dtor -Wcast-align -fno-exceptions $fno_check_new -fno-common $CXXFLAGS";
-        CFLAGS="-Wall $CFLAGS" ;;
-  kde)	CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef \
-		-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align \
-		-Wconversion -Wall -W -Wpointer-arith \
-		-Wwrite-strings -O2 -Wformat-security \
-		-Wmissing-format-attribute -fno-exceptions $fno_check_new \
-		-fno-common $CXXFLAGS" ;;
-esac
-
-case "$host_os" in
-  mingw*|cygwin*)
-    # mingw and cygwin print "warning: -fPIC ignored for target (all code is position independent)"
-    # for every file
-    ;;
-  *)
-    CXXFLAGS="-fPIC $CXXFLAGS";
-    ;;
-esac
-
-
-case `$PKG_CONFIG --version` in
-  0.?|0.1[0-7])
-    PC_REQUIRES_PRIVATE="";
-    PC_REQUIRES="poppler = $VERSION";;
-  *)
-    PC_REQUIRES_PRIVATE="Requires.private: poppler = $VERSION";
-    PC_REQUIRES="";;
-esac
-
-AC_SUBST(PC_REQUIRES)
-AC_SUBST(PC_REQUIRES_PRIVATE)
-
-AC_SUBST([POPPLER_MAJOR_VERSION],[poppler_version_major])
-AC_SUBST([POPPLER_MINOR_VERSION],[poppler_version_minor])
-AC_SUBST([POPPLER_MICRO_VERSION],[poppler_version_micro])
-AC_SUBST([POPPLER_VERSION],[poppler_version])
-
-AC_OUTPUT([
-Makefile
-goo/Makefile
-fofi/Makefile
-splash/Makefile
-poppler/Makefile
-utils/Makefile
-glib/Makefile
-glib/poppler-features.h
-glib/reference/Makefile
-glib/reference/version.xml
-glib/demo/Makefile
-test/Makefile
-qt4/Makefile
-qt4/src/Makefile
-qt4/tests/Makefile
-qt4/demos/Makefile
-qt5/Makefile
-qt5/src/Makefile
-qt5/tests/Makefile
-qt5/demos/Makefile
-cpp/Makefile
-cpp/poppler-version.h
-cpp/tests/Makefile
-poppler.pc
-poppler-uninstalled.pc
-poppler-cairo.pc
-poppler-cairo-uninstalled.pc
-poppler-splash.pc
-poppler-splash-uninstalled.pc
-poppler-glib.pc
-poppler-glib-uninstalled.pc
-poppler-qt4.pc
-poppler-qt4-uninstalled.pc
-poppler-qt5.pc
-poppler-qt5-uninstalled.pc
-poppler-cpp.pc
-poppler-cpp-uninstalled.pc])
-
-
-echo ""
-echo "Building poppler with support for:"
-echo "  font configuration:  $with_font_configuration"
-echo "  splash output:       $enable_splash_output"
-if test x$enable_cmyk = xyes;then
-        echo "      with CMYK support"
-fi
-echo "  cairo output:        $use_cairo"
-echo "  qt4 wrapper:         $enable_poppler_qt4"
-echo "  qt5 wrapper:         $enable_poppler_qt5"
-echo "  glib wrapper:        $use_glib"
-echo "    introspection:     $found_introspection"
-echo "  cpp wrapper:         $enable_poppler_cpp"
-echo "  use gtk-doc:         $enable_gtk_doc"
-echo "  use libjpeg:         $enable_libjpeg"
-echo "  use libpng:          $enable_libpng"
-echo "  use libtiff:         $enable_libtiff"
-echo "  use zlib compress:   $enable_zlib"
-echo "  use zlib uncompress: $enable_zlib_uncompress"
-echo "  use nss:             $enable_nss"
-echo "  use libcurl:         $enable_libcurl"
-echo "  use libopenjpeg:     $enable_libopenjpeg"
-if test x$enable_libopenjpeg = xyes;then
-    if test x$openjpeg1 = xyes;then
-        echo "      with openjpeg1"
-    else
-        echo "      with openjpeg2"
-    fi
-fi
-echo "  use cms:             $enable_cms"
-if test x$enable_cms = xyes;then
-    if test x$lcms1 = xyes;then
-        echo "      with lcms1"
-    else
-        echo "      with lcms2"
-    fi
-fi
-if test x$enable_build_type != xno;then
-        echo "  build type:          $enable_build_type"
-fi
-echo "  command line utils:  $enable_utils"
-echo "  test data dir:       $TESTDATADIR"
-echo ""
-
-if test x$enable_splash_output = xno -a x$enable_cairo_output = xno; then
-	echo "  Warning: There is no rendering backend enabled"
-fi
-
-if test x$enable_single_precision = xyes -a x$enable_fixedpoint = xyes; then
-	echo "  Warning: Single precision and fixed point options should not be enabled at the same time"
-fi
-
-if test x$enable_libjpeg != xyes -a x$have_dct_decoder = xyes; then
-	echo "  Warning: Using libjpeg is recommended. The internal DCT decoder is unmaintained."
-fi
-
-if test x$have_dct_decoder = xno; then
-	echo "  Warning: You're not compiling any DCT decoder. Some files will fail to display properly."
-fi
-
-if test x$enable_zlib_uncompress != xno; then
-	echo "  Warning: Using zlib for decompression is not totally safe"
-fi
-
-if test x$enable_libopenjpeg != xyes -a x$have_jpx_decoder = xyes; then
-	echo "  Warning: Using libopenjpeg2 is recommended. The internal JPX decoder is unmaintained."
-fi
-
-if test x$have_jpx_decoder = xno; then
-	echo "  Warning: You're not compiling any JPX decoder. Some files will fail to display properly."
-fi
diff --git a/cpp/Makefile.am b/cpp/Makefile.am
deleted file mode 100644
index 91fb15c3..00000000
--- a/cpp/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-SUBDIRS = . tests
-
-lib_LTLIBRARIES = libpoppler-cpp.la
-
-libpoppler_cpp_includedir = $(includedir)/poppler/cpp
-libpoppler_cpp_include_HEADERS =		\
-	poppler-document.h			\
-	poppler-embedded-file.h			\
-	poppler-font.h				\
-	poppler-global.h			\
-	poppler-image.h				\
-	poppler-page.h				\
-	poppler-page-renderer.h			\
-	poppler-page-transition.h		\
-	poppler-rectangle.h			\
-	poppler-toc.h				\
-	$(builddir)/poppler-version.h
-
-libpoppler_cpp_la_SOURCES =			\
-	poppler-document.cpp			\
-	poppler-document-private.h		\
-	poppler-embedded-file.cpp		\
-	poppler-embedded-file-private.h		\
-	poppler-font.cpp			\
-	poppler-global.cpp			\
-	poppler-image.cpp			\
-	poppler-image-private.h			\
-	poppler-page.cpp			\
-	poppler-page-private.h			\
-	poppler-page-renderer.cpp		\
-	poppler-page-transition.cpp		\
-	poppler-private.cpp			\
-	poppler-private.h			\
-	poppler-rectangle.cpp			\
-	poppler-toc.cpp				\
-	poppler-toc-private.h			\
-	poppler-version.cpp
-
-if BUILD_LIBJPEG
-libjpeg_includes = $(LIBJPEG_CFLAGS)
-endif
-
-if BUILD_LIBTIFF
-libtiff_includes = $(LIBTIFF_CFLAGS)
-endif
-
-if BUILD_LIBOPENJPEG
-libjpeg2000_includes = $(LIBOPENJPEG_CFLAGS)
-endif
-
-if BUILD_LIBPNG
-libpng_includes = $(LIBPNG_CFLAGS)
-endif
-
-libpoppler_cpp_la_CPPFLAGS =			\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/goo			\
-	-I$(top_srcdir)/poppler			\
-	$(libjpeg_includes)			\
-	$(libtiff_includes)			\
-	$(libjpeg2000_includes)			\
-	$(libpng_includes)
-
-libpoppler_cpp_la_CXXFLAGS =			\
-	-Dpoppler_cpp_EXPORTS
-
-libpoppler_cpp_la_LIBADD =			\
-	$(top_builddir)/poppler/libpoppler.la	\
-	$(LIBICONV)
-
-libpoppler_cpp_la_LDFLAGS =			\
-	-version-info 3:0:3			\
-	@create_shared_lib@			\
-	@auto_import_flags@
diff --git a/cpp/tests/Makefile.am b/cpp/tests/Makefile.am
deleted file mode 100644
index 901c4a64..00000000
--- a/cpp/tests/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-AM_LDFLAGS = @auto_import_flags@
-
-AM_CPPFLAGS =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/utils			\
-	-I$(top_srcdir)/cpp
-
-LDADD =						\
-	$(top_builddir)/utils/libparseargs.la	\
-	$(top_builddir)/poppler/libpoppler.la	\
-	$(top_builddir)/cpp/libpoppler-cpp.la
-
-noinst_PROGRAMS =				\
-	poppler-dump				\
-	poppler-render
-
-poppler_dump_SOURCES =				\
-	poppler-dump.cpp
-
-poppler_render_SOURCES =			\
-	poppler-render.cpp
diff --git a/fofi/Makefile.am b/fofi/Makefile.am
deleted file mode 100644
index 4deb7d5e..00000000
--- a/fofi/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-noinst_LTLIBRARIES = libfofi.la
-
-if ENABLE_XPDF_HEADERS
-poppler_fofi_includedir = $(includedir)/poppler/fofi
-poppler_fofi_include_HEADERS =	\
-	FoFiBase.h		\
-	FoFiEncodings.h		\
-	FoFiTrueType.h		\
-	FoFiType1.h		\
-	FoFiIdentifier.h	\
-	FoFiType1C.h
-endif
-
-libfofi_la_SOURCES =		\
-	FoFiBase.cc		\
-	FoFiBase.h		\
-	FoFiEncodings.cc	\
-	FoFiEncodings.h		\
-	FoFiTrueType.cc		\
-	FoFiTrueType.h		\
-	FoFiType1.cc		\
-	FoFiType1.h		\
-	FoFiType1C.cc		\
-	FoFiIdentifier.cc	\
-	FoFiType1C.h
-
-libfofi_la_CPPFLAGS =		\
-	-I$(top_srcdir)
diff --git a/glib/Makefile.am b/glib/Makefile.am
deleted file mode 100644
index 1cae1229..00000000
--- a/glib/Makefile.am
+++ /dev/null
@@ -1,122 +0,0 @@
-AM_LDFLAGS = @auto_import_flags@
-
-SUBDIRS = . reference demo
-
-lib_LTLIBRARIES = libpoppler-glib.la
-
-stamp_files = stamp-poppler-enums.h
-
-poppler-enums.h: stamp-poppler-enums.h
-	@true
-
-stamp-poppler-enums.h: poppler-enums.h.template $(poppler_glib_public_headers)
-	$(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \
-	&& (cmp -s xgen-etbh poppler-enums.h || cp xgen-etbh poppler-enums.h ) \
-	&& rm -f xgen-etbh \
-	&& echo timestamp > $(@F)
-
-poppler-enums.c: poppler-enums.c.template $(poppler_glib_public_headers)
-	$(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \
-	&& (cmp -s xgen-etbc poppler-enums.c || cp xgen-etbc poppler-enums.c ) \
-	&& rm -f xgen-etbc
-
-EXTRA_DIST =					\
-	poppler-enums.h.template		\
-	poppler-enums.c.template
-
-poppler_glib_public_headers =			\
-	poppler-action.h			\
-	poppler-date.h				\
-	poppler-document.h			\
-	poppler-page.h				\
-	poppler-attachment.h			\
-	poppler-form-field.h			\
-	poppler-annot.h				\
-	poppler-layer.h				\
-	poppler-media.h				\
-	poppler-movie.h				\
-	poppler-structure-element.h		\
-	poppler.h
-
-poppler_glib_includedir = $(includedir)/poppler/glib
-
-poppler_glib_include_HEADERS =			\
-	$(poppler_glib_public_headers)		\
-	poppler-enums.h
-nodist_poppler_glib_include_HEADERS = poppler-features.h
-
-libpoppler_glib_la_SOURCES =			\
-	$(BUILT_SOURCES)			\
-	poppler-action.cc			\
-	poppler-date.cc				\
-	poppler-document.cc			\
-	poppler-page.cc				\
-	poppler-attachment.cc			\
-	poppler-form-field.cc			\
-	poppler-annot.cc			\
-	poppler-layer.cc			\
-	poppler-media.cc			\
-	poppler-movie.cc			\
-	poppler-cached-file-loader.cc		\
-	poppler-cached-file-loader.h		\
-	poppler-input-stream.cc			\
-	poppler-input-stream.h			\
-	poppler-structure-element.cc		\
-	poppler.cc				\
-	poppler-private.h
-
-libpoppler_glib_la_CPPFLAGS =			\
-	-DG_LOG_DOMAIN=\"Poppler\"		\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/poppler			\
-	$(POPPLER_GLIB_CFLAGS)			\
-	$(FREETYPE_CFLAGS)			\
-	$(POPPLER_GLIB_DISABLE_DEPRECATED)	\
-	$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
-
-libpoppler_glib_la_LIBADD =				\
-	$(top_builddir)/poppler/libpoppler.la		\
-	$(top_builddir)/poppler/libpoppler-cairo.la	\
-	$(PTHREAD_LIBS)					\
-	$(POPPLER_GLIB_LIBS)				\
-	$(FREETYPE_LIBS)
-
-libpoppler_glib_la_LDFLAGS =			\
-	-version-info 17:0:9			\
-	@create_shared_lib@			\
-	@auto_import_flags@
-
-BUILT_SOURCES =					\
-	poppler-enums.c				\
-	poppler-enums.h
-
-CLEANFILES = $(BUILT_SOURCES) $(stamp_files)
-DISTCLEANFILES = $(BUILT_SOURCES) $(stamp_files)
-MAINTAINERCLEANFILES = $(BUILT_SOURCES) $(stamp_files)
-
-# GObject Introspection
-if HAVE_INTROSPECTION
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-
-introspection_files = $(filter-out poppler-private.h poppler-input-stream.h, $(libpoppler_glib_la_SOURCES)) $(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS)
-Poppler-0.18.gir: libpoppler-glib.la
-Poppler_0_18_gir_INCLUDES = GObject-2.0 Gio-2.0 cairo-1.0
-Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir)
-Poppler_0_18_gir_LIBS = libpoppler-glib.la $(top_builddir)/poppler/libpoppler.la $(top_builddir)/poppler/libpoppler-cairo.la
-Poppler_0_18_gir_FILES = $(introspection_files)
-Poppler_0_18_gir_SCANNERFLAGS = --c-include poppler.h
-Poppler_0_18_gir_EXPORT_PACKAGES = poppler-glib
-
-INTROSPECTION_GIRS += Poppler-0.18.gir
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibsdir = $(libdir)/girepository-1.0
-typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-endif #HAVE_INTROSPECTION
diff --git a/glib/demo/Makefile.am b/glib/demo/Makefile.am
deleted file mode 100644
index 2e09d8ce..00000000
--- a/glib/demo/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-AM_LDFLAGS = @auto_import_flags@
-
-if BUILD_GTK_TEST
-bin_PROGRAMS = poppler-glib-demo
-endif
-
-poppler_glib_demo_SOURCES =			\
-	main.c					\
-	annots.h				\
-	annots.c				\
-	attachments.c				\
-	attachments.h				\
-	find.h					\
-	find.c					\
-	fonts.h					\
-	fonts.c					\
-	forms.h					\
-	forms.c					\
-	images.h				\
-	images.c				\
-	info.h					\
-	info.cc					\
-	layers.h				\
-	layers.c				\
-	links.h					\
-	links.c					\
-	outline.h				\
-	outline.c				\
-	page.h					\
-	page.c					\
-	print.h					\
-	print.c					\
-	render.h				\
-	render.c				\
-	selections.h				\
-	selections.c				\
-	text.h					\
-	taggedstruct.h				\
-	taggedstruct.c				\
-	text.c					\
-	transitions.h				\
-	transitions.c				\
-	utils.h					\
-	utils.c
-
-poppler_glib_demo_CPPFLAGS =			\
-	-I$(top_srcdir)/glib			\
-	-I$(top_builddir)/glib			\
-	$(GTK_TEST_CFLAGS)			\
-	$(POPPLER_GLIB_DISABLE_DEPRECATED)	\
-	$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
-
-poppler_glib_demo_LDADD =			\
-	$(top_builddir)/glib/libpoppler-glib.la	\
-	$(top_builddir)/poppler/libpoppler.la	\
-	$(GTK_TEST_LIBS)
diff --git a/glib/poppler-features.h.in b/glib/poppler-features.h.in
deleted file mode 100644
index e6b3a8ee..00000000
--- a/glib/poppler-features.h.in
+++ /dev/null
@@ -1,88 +0,0 @@
-/* poppler-features.h: glib interface to poppler
- * Copyright (C) 2006, Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef __POPPLER_FEATURES_H__
-#define __POPPLER_FEATURES_H__
-
-/**
- * SECTION:poppler-features
- * @short_description: Variables and functions to check the poppler version and features
- * @Title: Version and Features Information
- *
- * Poppler provides version information, and information about features
- * enabled at compile time. This is primarily useful in configure checks
- * for builds that have a configure script, or for allowing code to optionally
- * depend but not require a specific poppler version.
- */
-
-/**
- * POPPLER_HAS_CAIRO:
- *
- * Defined if poppler was compiled with cairo support.
- */
- at CAIRO_FEATURE@
-
-/**
- * POPPLER_MAJOR_VERSION:
- *
- * The major version number of the poppler header files (e.g. in poppler version
- * 0.1.2 this is 0.)
- *
- * Since: 0.12
- */
-#define POPPLER_MAJOR_VERSION (@POPPLER_MAJOR_VERSION@)
-
-/**
- * POPPLER_MINOR_VERSION:
- *
- * The major version number of the poppler header files (e.g. in poppler version
- * 0.1.2 this is 1.)
- *
- * Since: 0.12
- */
-#define POPPLER_MINOR_VERSION (@POPPLER_MINOR_VERSION@)
-
-/**
- * POPPLER_MICRO_VERSION:
- *
- * The micro version number of the poppler header files (e.g. in poppler version
- * 0.1.2 this is 2.)
- *
- * Since: 0.12
- */
-#define POPPLER_MICRO_VERSION (@POPPLER_MICRO_VERSION@)
-
-/**
- * POPPLER_CHECK_VERSION:
- * @major: major version (e.g. 0 for version 0.1.2)
- * @minor: minor version (e.g. 1 for version 0.1.2)
- * @micro: micro version (e.g. 2 for version 0.1.2)
- *
- * Checks the version fo the poppler library
- *
- * Returns: %TRUE if the version of the poppler header files is the same
- * as or newer than the passed-in version
- *
- * Since: 0.12
- */
-#define POPPLER_CHECK_VERSION(major,minor,micro) \
-  (POPPLER_MAJOR_VERSION > (major) || \
-   (POPPLER_MAJOR_VERSION == (major) && POPPLER_MINOR_VERSION > (minor)) || \
-   (POPPLER_MAJOR_VERSION == (major) && POPPLER_MINOR_VERSION == (minor) && POPPLER_MICRO_VERSION >= (micro)))
-
-#endif /* __POPPLER_FEATURES_H__ */
diff --git a/glib/reference/Makefile.am b/glib/reference/Makefile.am
deleted file mode 100644
index a8617625..00000000
--- a/glib/reference/Makefile.am
+++ /dev/null
@@ -1,92 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# We require automake 1.6 at least.
-AUTOMAKE_OPTIONS = 1.6
-
-# This is a blank Makefile.am for using gtk-doc.
-# Copy this to your project's API docs directory and modify the variables to
-# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
-# of using the various options.
-
-# The name of the module, e.g. 'glib'.
-DOC_MODULE=poppler
-
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
-
-# Directories containing the source code.
-# gtk-doc will search all .c and .h files beneath these paths
-# for inline comments documenting functions and macros.
-# e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk $(top_srcdir)/gdk
-DOC_SOURCE_DIR=$(top_builddir)/glib $(top_srcdir)/glib
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=
-
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
-SCAN_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml --source-suffixes=c,cc,h
-
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
-# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/glib/*.h
-CFILE_GLOB=$(top_srcdir)/glib/*.cc
-
-# Header files to ignore when scanning.
-# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=				\
-	poppler-private.h		\
-	poppler-input-stream.h		\
-	poppler-cached-file-loader.h	\
-	demo
-
-# Images to copy into HTML directory.
-# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES=
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=version.xml
-
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-# These files must be listed here *and* in content_files
-# e.g. expand_content_files=running.sgml
-expand_content_files=
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-# signals and properties.
-# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
-# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-GTKDOC_CFLAGS=						\
-	-I$(top_srcdir)/glib -I$(top_builddir)/glib	\
-	$(CAIRO_CFLAGS)					\
-	$(POPPLER_GLIB_CFLAGS)				\
-	$(FREETYPE_CFLAGS)
-
-GTKDOC_LIBS=$(top_builddir)/poppler/libpoppler.la	\
-	$(top_builddir)/glib/libpoppler-glib.la		\
-	$(POPPLER_GLIB_LIBS)				\
-	$(FREETYPE_LIBS)				\
-	$(cairo_libs)
-
-
-# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in
diff --git a/glib/reference/version.xml.in b/glib/reference/version.xml.in
deleted file mode 100644
index 9b6e99eb..00000000
--- a/glib/reference/version.xml.in
+++ /dev/null
@@ -1 +0,0 @@
- at POPPLER_VERSION@
diff --git a/goo/Makefile.am b/goo/Makefile.am
deleted file mode 100644
index 004775a4..00000000
--- a/goo/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-noinst_LTLIBRARIES = libgoo.la
-
-if ENABLE_XPDF_HEADERS
-
-poppler_goo_includedir = $(includedir)/poppler/goo
-poppler_goo_include_HEADERS =			\
-	GooHash.h				\
-	GooList.h				\
-	GooTimer.h				\
-	GooMutex.h				\
-	GooString.h				\
-	gtypes.h				\
-	gmem.h					\
-	gfile.h					\
-	FixedPoint.h				\
-	NetPBMWriter.h				\
-	PNGWriter.h				\
-	JpegWriter.h				\
-	TiffWriter.h				\
-	ImgWriter.h				\
-	GooLikely.h				\
-	gstrtod.h				\
-	grandom.h
-
-endif
-
-libgoo_la_SOURCES =				\
-	gfile.cc				\
-	gmempp.cc				\
-	GooHash.cc				\
-	GooList.cc				\
-	GooTimer.cc				\
-	GooString.cc				\
-	gmem.cc					\
-	FixedPoint.cc				\
-	NetPBMWriter.cc				\
-	PNGWriter.cc				\
-	JpegWriter.cc				\
-	TiffWriter.cc				\
-	ImgWriter.cc				\
-	gtypes_p.h				\
-	gstrtod.cc				\
-	grandom.cc                              \
-	glibc.cc
-
-if BUILD_LIBJPEG
-libjpeg_includes = $(LIBJPEG_CFLAGS)
-endif
-
-if BUILD_LIBTIFF
-libtiff_includes = $(LIBTIFF_CFLAGS)
-endif
-
-if BUILD_LIBOPENJPEG
-libjpeg2000_includes = $(LIBOPENJPEG_CFLAGS)
-endif
-
-if BUILD_LIBPNG
-libpng_includes = $(LIBPNG_CFLAGS)
-endif
-
-libgoo_la_CPPFLAGS =				\
-	-I$(top_srcdir)				\
-	$(libjpeg_includes)                     \
-	$(libtiff_includes)                     \
-	$(libjpeg2000_includes)                 \
-	$(libpng_includes)
-
-EXTRA_DIST = glibc.h
\ No newline at end of file
diff --git a/poppler-cairo-uninstalled.pc.in b/poppler-cairo-uninstalled.pc.in
deleted file mode 100644
index 2458eb20..00000000
--- a/poppler-cairo-uninstalled.pc.in
+++ /dev/null
@@ -1,6 +0,0 @@
-Name: poppler-cairo
-Description: Cairo backend for Poppler PDF rendering library - uninstalled
-Version: @VERSION@
-Requires: poppler = @VERSION@ cairo >= @CAIRO_VERSION@
-
-Libs: ${pc_top_builddir}/${pcfiledir}/poppler/libpoppler-cairo.la
diff --git a/poppler-cairo.pc.in b/poppler-cairo.pc.in
deleted file mode 100644
index 367a5b69..00000000
--- a/poppler-cairo.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: poppler-cairo
-Description: Cairo backend for Poppler PDF rendering library
-Version: @VERSION@
-Requires: poppler = @VERSION@ cairo >= @CAIRO_VERSION@
diff --git a/poppler-cpp-uninstalled.pc.in b/poppler-cpp-uninstalled.pc.in
deleted file mode 100644
index af3640eb..00000000
--- a/poppler-cpp-uninstalled.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Name: poppler-cpp
-Description: cpp backend for Poppler PDF rendering library - uninstalled
-Version: @VERSION@
-Requires: poppler = @VERSION@
-
-Libs: ${pc_top_builddir}/${pcfiledir}/cpp/libpoppler-cpp.la
-Cflags: -I${pc_top_builddir}/${pcfiledir}/cpp
diff --git a/poppler-cpp.pc.in b/poppler-cpp.pc.in
deleted file mode 100644
index a7e97c25..00000000
--- a/poppler-cpp.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: poppler-cpp
-Description: cpp backend for Poppler PDF rendering library
-Version: @VERSION@
-Requires: @PC_REQUIRES@
- at PC_REQUIRES_PRIVATE@
-
-Libs: -L${libdir} -lpoppler-cpp
-Cflags: -I${includedir}/poppler/cpp
diff --git a/poppler-glib-uninstalled.pc.in b/poppler-glib-uninstalled.pc.in
deleted file mode 100644
index 5506c4e5..00000000
--- a/poppler-glib-uninstalled.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Name: poppler-glib
-Description: GLib wrapper for poppler - uninstalled
-Version: @VERSION@
-Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ gio-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
-
-Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la
-Cflags: -I${pc_top_builddir}/${pcfiledir}/glib
diff --git a/poppler-glib.pc.in b/poppler-glib.pc.in
deleted file mode 100644
index cd30feb7..00000000
--- a/poppler-glib.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: poppler-glib
-Description: GLib wrapper for poppler
-Version: @VERSION@
-Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ gio-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
- at PC_REQUIRES_PRIVATE@
-
-Libs: -L${libdir} -lpoppler-glib
-Cflags: -I${includedir}/poppler/glib
diff --git a/poppler-qt4-uninstalled.pc.in b/poppler-qt4-uninstalled.pc.in
deleted file mode 100644
index 3a336c6c..00000000
--- a/poppler-qt4-uninstalled.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Name: poppler-qt4
-Description: Qt4 bindings for poppler - uninstalled
-Version: @VERSION@
-Requires: poppler = @VERSION@ 
-
-Libs: ${pc_top_builddir}/${pcfiledir}/qt4/src/libpoppler-qt4.la
-Cflags: -I${pc_top_builddir}/${pcfiledir}/qt4/src
diff --git a/poppler-qt4.pc.in b/poppler-qt4.pc.in
deleted file mode 100644
index 306ae46e..00000000
--- a/poppler-qt4.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: poppler-qt4
-Description: Qt4 bindings for poppler
-Version: @VERSION@
-Requires: @PC_REQUIRES@
- at PC_REQUIRES_PRIVATE@
-
-Libs: -L${libdir} -lpoppler-qt4
-Cflags: -I${includedir}/poppler/qt4
diff --git a/poppler-qt5-uninstalled.pc.in b/poppler-qt5-uninstalled.pc.in
deleted file mode 100644
index a91e1d5a..00000000
--- a/poppler-qt5-uninstalled.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Name: poppler-qt5
-Description: Qt5 bindings for poppler - uninstalled
-Version: @VERSION@
-Requires: poppler = @VERSION@ 
-
-Libs: ${pc_top_builddir}/${pcfiledir}/qt5/src/libpoppler-qt5.la
-Cflags: -I${pc_top_builddir}/${pcfiledir}/qt5/src
diff --git a/poppler-qt5.pc.in b/poppler-qt5.pc.in
deleted file mode 100644
index cda4c6f8..00000000
--- a/poppler-qt5.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: poppler-qt5
-Description: Qt5 bindings for poppler
-Version: @VERSION@
-Requires: @PC_REQUIRES@
- at PC_REQUIRES_PRIVATE@
-
-Libs: -L${libdir} -lpoppler-qt5
-Cflags: -I${includedir}/poppler/qt5
diff --git a/poppler-splash-uninstalled.pc.in b/poppler-splash-uninstalled.pc.in
deleted file mode 100644
index 436ecdb8..00000000
--- a/poppler-splash-uninstalled.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Name: poppler-splash
-Description: Splash backend for Poppler PDF rendering library - uninstalled
-Version: @VERSION@
-Requires: poppler = @VERSION@
-
-Libs: ${pc_top_builddir}/${pcfiledir}/splash/libsplash.la
-
diff --git a/poppler-splash.pc.in b/poppler-splash.pc.in
deleted file mode 100644
index cf3491fc..00000000
--- a/poppler-splash.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: poppler-splash
-Description: Splash backend for Poppler PDF rendering library
-Version: @VERSION@
-Requires: poppler = @VERSION@
diff --git a/poppler-uninstalled.pc.in b/poppler-uninstalled.pc.in
deleted file mode 100644
index 6076e80c..00000000
--- a/poppler-uninstalled.pc.in
+++ /dev/null
@@ -1,6 +0,0 @@
-Name: poppler
-Description: PDF rendering library - uninstalled
-Version: @VERSION@
-
-Libs: ${pc_top_builddir}/${pcfiledir}/poppler/libpoppler.la
-Cflags: -I${pc_top_builddir}/${pcfiledir}/poppler
diff --git a/poppler.pc.in b/poppler.pc.in
deleted file mode 100644
index 8605b286..00000000
--- a/poppler.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: poppler
-Description: PDF rendering library
-Version: @VERSION@
-
-Libs: -L${libdir} -lpoppler
-Cflags: -I${includedir}/poppler
diff --git a/poppler/Makefile.am b/poppler/Makefile.am
deleted file mode 100644
index 8cf7af85..00000000
--- a/poppler/Makefile.am
+++ /dev/null
@@ -1,348 +0,0 @@
-CFLAGS+=$(PTHREAD_CFLAGS)
-CXXFLAGS+=$(PTHREAD_CFLAGS)
-
-AM_CPPFLAGS =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/goo
-
-lib_LTLIBRARIES = libpoppler.la
-
-if BUILD_CAIRO_OUTPUT
-noinst_LTLIBRARIES = libpoppler-cairo.la
-endif
-
-if BUILD_SPLASH_OUTPUT
-
-splash_sources =				\
-	SplashOutputDev.cc
-
-splash_headers =				\
-	SplashOutputDev.h
-
-splash_includes =				\
-	$(SPLASH_CFLAGS)
-
-splash_libs =					\
-	$(SPLASH_LIBS)				\
-	$(top_builddir)/splash/libsplash.la
-
-endif
-
-if BUILD_LIBJPEG
-
-libjpeg_sources =				\
-	DCTStream.h				\
-	DCTStream.cc
-
-libjpeg_libs =					\
-	$(LIBJPEG_LIBS)
-libjpeg_includes =				\
-	$(LIBJPEG_CFLAGS)
-
-endif
-
-if BUILD_LIBPNG
-
-libpng_libs =					\
-	$(LIBPNG_LIBS)
-libpng_includes =				\
-	$(LIBPNG_CFLAGS)
-
-endif
-
-if BUILD_LIBTIFF
-
-libtiff_libs =					\
-	$(LIBTIFF_LIBS)
-libtiff_includes =				\
-	$(LIBTIFF_CFLAGS)
-
-endif
-
-if BUILD_LIBOPENJPEG
-
-libjpeg2000_sources =				\
-	JPEG2000Stream.h			\
-	JPEG2000Stream.cc
-
-libjpeg2000_libs =				\
-	$(LIBOPENJPEG_LIBS)
-libjpeg2000_includes =				\
-	$(LIBOPENJPEG_CFLAGS)
-
-else
-
-libjpeg2000_sources =				\
-	JPXStream.h			\
-	JPXStream.cc
-
-endif
-
-if BUILD_NSS
-
-nss_sources =                   \
-	SignatureHandler.cc
-
-nss_libs =                      \
-	$(NSS3_LIBS)
-
-nss_includes =                  \
-	$(NSS3_CFLAGS)
-
-nss_headers =                   \
-	SignatureHandler.h
-
-endif	
-
-
-if BUILD_ZLIB
-
-zlib_sources =					\
-	FlateEncoder.h				\
-	FlateEncoder.cc
-
-zlib_libs = 					\
-	$(ZLIB_LIBS)
-
-endif
-
-if BUILD_ZLIB_UNCOMPRESS
-
-zlib_uncompress_sources =			\
-	FlateStream.h				\
-	FlateStream.cc
-
-endif
-
-if BUILD_LIBCURL
-
-libcurl_libs =					\
-	$(LIBCURL_LIBS)
-
-libcurl_includes =				\
-	$(LIBCURL_CFLAGS)
-
-curl_headers =					\
-	CurlCachedFile.h			\
-	CurlPDFDocBuilder.h
-
-curl_sources =					\
-	CurlCachedFile.cc			\
-	CurlPDFDocBuilder.cc
-
-endif
-
-if USE_CMS
-cms_includes = $(LCMS_CFLAGS)
-cms_libs = $(LCMS_LIBS)
-endif
-
-if ENABLE_XPDF_HEADERS
-
-poppler_includedir = $(includedir)/poppler
-poppler_include_HEADERS =	\
-	$(splash_headers)	\
-	$(curl_headers)		\
-	$(nss_headers) 		\
-	Annot.h			\
-	Array.h			\
-	BuiltinFont.h		\
-	BuiltinFontTables.h	\
-	CachedFile.h		\
-	Catalog.h		\
-	CharCodeToUnicode.h	\
-	CMap.h			\
-	DateInfo.h		\
-	Decrypt.h		\
-	Dict.h			\
-	Error.h			\
-	FileSpec.h		\
-	FontEncodingTables.h	\
-	FontInfo.h		\
-	Form.h 			\
-	Function.h		\
-	Gfx.h			\
-	GfxFont.h		\
-	GfxState.h		\
-	GfxState_helpers.h	\
-	GlobalParams.h		\
-	Hints.h			\
-	JArithmeticDecoder.h	\
-	JBIG2Stream.h		\
-	Lexer.h			\
-	Linearization.h 	\
-	Link.h			\
-	LocalPDFDocBuilder.h	\
-	Movie.h                 \
-	NameToCharCode.h	\
-	Object.h		\
-	OptionalContent.h	\
-	Outline.h		\
-	OutputDev.h		\
-	Page.h			\
-	PageTransition.h	\
-	Parser.h		\
-	PDFDoc.h		\
-	PDFDocBuilder.h		\
-	PDFDocEncoding.h	\
-	PDFDocFactory.h		\
-	PopplerCache.h		\
-	ProfileData.h		\
-	PreScanOutputDev.h	\
-	PSTokenizer.h		\
-	Rendition.h		\
-	SignatureInfo.h		\
-	StdinCachedFile.h	\
-	StdinPDFDocBuilder.h	\
-	Stream-CCITT.h		\
-	Stream.h		\
-	StructElement.h		\
-	StructTreeRoot.h	\
-	UnicodeMap.h		\
-	UnicodeMapTables.h	\
-	UnicodeTypeTable.h	\
-	UnicodeCClassTables.h	\
-	UnicodeCompTables.h	\
-	UnicodeDecompTables.h	\
-	ViewerPreferences.h	\
-	XRef.h			\
-	CharTypes.h		\
-	CompactFontTables.h	\
-	ErrorCodes.h		\
-	NameToUnicodeTable.h	\
-	PSOutputDev.h		\
-	TextOutputDev.h		\
-	MarkedContentOutputDev.h \
-	SecurityHandler.h	\
-	UTF.h			\
-	UTF8.h			\
-	XpdfPluginAPI.h		\
-	Sound.h
-nodist_poppler_include_HEADERS = poppler-config.h
-
-endif
-
-libpoppler_la_SOURCES =		\
-	$(splash_sources)	\
-	$(libjpeg_sources)	\
-	$(zlib_sources)		\
-	$(zlib_uncompress_sources) \
-	$(nss_sources)      \
-	$(libjpeg2000_sources)	\
-	$(curl_sources)		\
-	Annot.cc		\
-	Array.cc 		\
-	BuiltinFont.cc		\
-	BuiltinFontTables.cc	\
-	CachedFile.cc		\
-	Catalog.cc 		\
-	CharCodeToUnicode.cc	\
-	CMap.cc			\
-	DateInfo.cc		\
-	Decrypt.cc		\
-	Dict.cc 		\
-	Error.cc 		\
-	FileSpec.cc		\
-	FontEncodingTables.cc	\
-	Form.cc 		\
-	FontInfo.cc		\
-	Function.cc		\
-	Gfx.cc 			\
-	GfxFont.cc 		\
-	GfxState.cc		\
-	GlobalParams.cc		\
-	Hints.cc		\
-	JArithmeticDecoder.cc	\
-	JBIG2Stream.cc		\
-	Lexer.cc 		\
-	Linearization.cc 	\
-	Link.cc 		\
-	LocalPDFDocBuilder.cc	\
-	Movie.cc                \
-	NameToCharCode.cc	\
-	Object.cc 		\
-	OptionalContent.cc	\
-	Outline.cc		\
-	OutputDev.cc 		\
-	Page.cc 		\
-	PageTransition.cc	\
-	Parser.cc 		\
-	PDFDoc.cc 		\
-	PDFDocEncoding.cc	\
-	PDFDocFactory.cc	\
-	PopplerCache.cc		\
-	ProfileData.cc		\
-	PreScanOutputDev.cc \
-	PSTokenizer.cc		\
-	Rendition.cc		\
-	SignatureInfo.cc	\
-	StdinCachedFile.cc	\
-	StdinPDFDocBuilder.cc	\
-	Stream.cc 		\
-	StructTreeRoot.cc	\
-	StructElement.cc	\
-	strtok_r.cpp		\
-	UnicodeMap.cc		\
-	UnicodeTypeTable.cc	\
-	UTF.cc                  \
-	ViewerPreferences.cc	\
-	XRef.cc			\
-	PSOutputDev.cc		\
-	TextOutputDev.cc	\
-	MarkedContentOutputDev.cc \
-	PageLabelInfo.h		\
-	PageLabelInfo.cc	\
-	SecurityHandler.cc	\
-	Sound.cc		\
-	XpdfPluginAPI.cc
-
-libpoppler_la_CPPFLAGS =			\
-	$(cms_includes)				\
-	$(splash_includes)			\
-	$(libjpeg_includes)			\
-	$(libtiff_includes)			\
-	$(libjpeg2000_includes)			\
-	$(libpng_includes)			\
-	$(libcurl_includes)			\
-	$(nss_includes)				\
-	$(FREETYPE_CFLAGS)			\
-	$(FONTCONFIG_CFLAGS)			\
-	$(AM_CPPFLAGS)
-
-libpoppler_la_LIBADD =				\
-	$(top_builddir)/goo/libgoo.la		\
-	$(top_builddir)/fofi/libfofi.la		\
-	$(cms_libs)				\
-	$(splash_libs)				\
-	$(libtiff_libs)				\
-	$(libjpeg_libs)				\
-	$(libpng_libs)				\
-	$(zlib_libs)				\
-	$(libcurl_libs)				\
-	$(nss_libs)                 \
-	$(libjpeg2000_libs)			\
-	$(FREETYPE_LIBS)			\
-	$(FONTCONFIG_LIBS)			\
-	$(PTHREAD_LIBS)				\
-	$(win32_libs)
-
-libpoppler_la_LDFLAGS =				\
-	-version-info 70:0:0			\
-	@create_shared_lib@			\
-	@auto_import_flags@
-
-libpoppler_cairo_la_SOURCES =			\
-	CairoFontEngine.cc			\
-	CairoFontEngine.h			\
-	CairoOutputDev.cc			\
-	CairoOutputDev.h			\
-	CairoRescaleBox.cc			\
-	CairoRescaleBox.h
-
-libpoppler_cairo_la_CPPFLAGS =			\
-	$(CAIRO_CFLAGS)				\
-	$(AM_CPPFLAGS)
-
-EXTRA_DIST = gen-unicode-tables.py	\
-             GlobalParamsWin.cc         \
-             PageLabelInfo_p.h
diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in
deleted file mode 100644
index 0d0aa9e5..00000000
--- a/poppler/poppler-config.h.in
+++ /dev/null
@@ -1,196 +0,0 @@
-//================================================= -*- mode: c++ -*- ====
-//
-// poppler-config.h
-//
-// Copyright 1996-2011 Glyph & Cog, LLC
-//
-//========================================================================
-
-//========================================================================
-//
-// Modified under the Poppler project - http://poppler.freedesktop.org
-//
-// All changes made under the Poppler project to this file are licensed
-// under GPL version 2 or later
-//
-// Copyright (C) 2014 Bogdan Cristea <cristeab at gmail.com>
-// Copyright (C) 2014 Hib Eris <hib at hiberis.nl>
-// Copyright (C) 2016 Tor Lillqvist <tml at collabora.com>
-//
-// To see a description of the changes please see the Changelog file that
-// came with your tarball or type make ChangeLog if you are building from git
-//
-//========================================================================
-
-#ifndef POPPLER_CONFIG_H
-#define POPPLER_CONFIG_H
-
-#include <stdio.h>
-
-// We duplicate some of the config.h #define's here since they are
-// used in some of the header files we install.  The #ifndef/#endif
-// around #undef look odd, but it's to silence warnings about
-// redefining those symbols.
-
-/* Defines the poppler version. */
-#ifndef POPPLER_VERSION
-#undef POPPLER_VERSION
-#endif
-
-/* Enable multithreading support. */
-#ifndef MULTITHREADED
-#undef MULTITHREADED
-#endif
-
-/* Use fixedpoint. */
-#ifndef USE_FIXEDPOINT
-#undef USE_FIXEDPOINT
-#endif
-
-/* Use single precision arithmetic in the Splash backend */
-#ifndef USE_FLOAT
-#undef USE_FLOAT
-#endif
-
-/* Include support for OPI comments. */
-#ifndef OPI_SUPPORT
-#undef OPI_SUPPORT
-#endif
-
-/* Enable word list support. */
-#ifndef TEXTOUT_WORD_LIST
-#undef TEXTOUT_WORD_LIST
-#endif
-
-/* Support for curl is compiled in. */
-#ifndef POPPLER_HAS_CURL_SUPPORT
-#undef POPPLER_HAS_CURL_SUPPORT
-#endif
-
-/* Use libjpeg instead of builtin jpeg decoder. */
-#ifndef ENABLE_LIBJPEG
-#undef ENABLE_LIBJPEG
-#endif
-
-/* Build against libtiff. */
-#ifndef ENABLE_LIBTIFF
-#undef ENABLE_LIBTIFF
-#endif
-
-/* Build against libpng. */
-#ifndef ENABLE_LIBPNG
-#undef ENABLE_LIBPNG
-#endif
-
-/* Use zlib instead of builtin zlib decoder for uncompressing flate streams. */
-#ifndef ENABLE_ZLIB_UNCOMPRESS
-#undef ENABLE_ZLIB_UNCOMPRESS
-#endif
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#ifndef HAVE_DIRENT_H
-#undef HAVE_DIRENT_H
-#endif
-
-/* Defines if gettimeofday is available on your system */
-#ifndef HAVE_GETTIMEOFDAY
-#undef HAVE_GETTIMEOFDAY
-#endif
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#ifndef HAVE_NDIR_H
-#undef HAVE_NDIR_H
-#endif
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-#ifndef HAVE_SYS_DIR_H
-#undef HAVE_SYS_DIR_H
-#endif
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-#ifndef HAVE_SYS_NDIR_H
-#undef HAVE_SYS_NDIR_H
-#endif
-
-/* Have FreeType2 include files */
-#ifndef HAVE_FREETYPE_H
-#undef HAVE_FREETYPE_H
-#endif
-
-/* Defines if use cms */
-#ifndef USE_CMS
-#undef USE_CMS
-#endif
-
-// Also, there are preprocessor symbols in the header files
-// that are used but never defined when building poppler using configure
-// or cmake: DISABLE_OUTLINE, DEBUG_MEM, SPLASH_CMYK, HAVE_T1LIB_H,
-// ENABLE_PLUGINS, DEBUG_FORMS, HAVE_FREETYPE_FREETYPE_H
-
-//------------------------------------------------------------------------
-// version
-//------------------------------------------------------------------------
-
-// copyright notice
-#define popplerCopyright "Copyright 2005-2017 The Poppler Developers - http://poppler.freedesktop.org"
-#define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC"
-
-//------------------------------------------------------------------------
-// popen
-//------------------------------------------------------------------------
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-#define popen _popen
-#define pclose _pclose
-#endif
-
-#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__) || defined(MACOS)
-#define POPEN_READ_MODE "rb"
-#else
-#define POPEN_READ_MODE "r"
-#endif
-
-//------------------------------------------------------------------------
-// Win32 stuff
-//------------------------------------------------------------------------
-
-#if defined(_WIN32) && !defined(_MSC_VER)
-#include <windef.h>
-#else
-#define CDECL
-#endif
-
-#if defined(_WIN32)
-#ifdef _MSC_VER
-#define strtok_r strtok_s
-#elif __MINGW32__ && !defined(__WINPTHREADS_VERSION)
-char * strtok_r (char *s, const char *delim, char **save_ptr);
-#endif
-#endif
-
-//------------------------------------------------------------------------
-// Compiler
-//------------------------------------------------------------------------
-
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#ifdef __MINGW_PRINTF_FORMAT
-#define GCC_PRINTF_FORMAT(fmt_index, va_index) \
-	__attribute__((__format__(__MINGW_PRINTF_FORMAT, fmt_index, va_index)))
-#else
-#define GCC_PRINTF_FORMAT(fmt_index, va_index) \
-	__attribute__((__format__(__printf__, fmt_index, va_index)))
-#endif
-#else
-#define GCC_PRINTF_FORMAT(fmt_index, va_index)
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER < 1800
-#define fmax(a, b) std::max(a, b)
-#define fmin(a, b) std::min(a, b)
-#endif
-
-
-#endif /* POPPLER_CONFIG_H */
diff --git a/qt4/Makefile.am b/qt4/Makefile.am
deleted file mode 100644
index 69a10cb1..00000000
--- a/qt4/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = src tests demos
diff --git a/qt4/demos/Makefile.am b/qt4/demos/Makefile.am
deleted file mode 100644
index 7db10453..00000000
--- a/qt4/demos/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-AM_LDFLAGS = @auto_import_flags@
-
-noinst_PROGRAMS = poppler_qt4viewer
-
-BUILT_SOURCES =					\
-	abstractinfodock.moc			\
-	embeddedfiles.moc			\
-	fonts.moc				\
-	info.moc				\
-	metadata.moc				\
-	navigationtoolbar.moc			\
-	optcontent.moc				\
-	pageview.moc				\
-	permissions.moc				\
-	thumbnails.moc				\
-	toc.moc					\
-	viewer.moc
-
-poppler_qt4viewer_SOURCES =			\
-	abstractinfodock.cpp			\
-	abstractinfodock.h			\
-	documentobserver.cpp			\
-	documentobserver.h			\
-	embeddedfiles.cpp			\
-	embeddedfiles.h				\
-	fonts.cpp				\
-	fonts.h					\
-	info.cpp				\
-	info.h					\
-	main_viewer.cpp				\
-	metadata.cpp				\
-	metadata.h				\
-	navigationtoolbar.cpp			\
-	navigationtoolbar.h			\
-	optcontent.cpp				\
-	optcontent.h				\
-	pageview.cpp				\
-	pageview.h				\
-	permissions.cpp				\
-	permissions.h				\
-	thumbnails.cpp				\
-	thumbnails.h				\
-	toc.cpp					\
-	toc.h					\
-	viewer.cpp				\
-	viewer.h
-
-poppler_qt4viewer_CPPFLAGS =			\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/poppler			\
-	-I$(top_srcdir)/qt4/src			\
-	$(POPPLER_QT4_CFLAGS)
-
-poppler_qt4viewer_LDADD =				\
-	$(top_builddir)/poppler/libpoppler.la		\
-	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
-	$(POPPLER_QT4_LIBS)
-
-# This rule lets GNU make create any *.moc from the equivalent *.h
-.h.moc:
-	$(AM_V_GEN) $(MOCQT4) -i $< -o $@
-SUFFIXES: .moc
-
-clean-generic:
-	rm -f *.moc
diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am
deleted file mode 100644
index 6030f28f..00000000
--- a/qt4/src/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-lib_LTLIBRARIES = libpoppler-qt4.la
-
-libpoppler_qt4_includedir = $(includedir)/poppler/qt4
-libpoppler_qt4_include_HEADERS =		\
-	poppler-qt4.h				\
-	poppler-link.h				\
-	poppler-link-private.h			\
-	poppler-annotation.h			\
-	poppler-form.h				\
-	poppler-optcontent.h			\
-	poppler-export.h			\
-	poppler-media.h				\
-	poppler-page-transition.h
-
-libpoppler_qt4_la_SOURCES =			\
-	poppler-document.cc			\
-	poppler-page.cc				\
-	poppler-fontinfo.cc			\
-	poppler-embeddedfile.cc			\
-	poppler-textbox.cc			\
-	poppler-link.cc				\
-	poppler-annotation.cc			\
-	poppler-link-extractor.cc		\
-	poppler-optcontent.cc			\
-	poppler-optcontent.h			\
-	poppler-page-transition.cc		\
-	poppler-sound.cc			\
-	poppler-form.cc				\
-	poppler-base-converter.cc		\
-	poppler-ps-converter.cc			\
-	poppler-pdf-converter.cc		\
-	poppler-qiodeviceoutstream.cc		\
-	poppler-private.cc			\
-	poppler-movie.cc			\
-	poppler-media.cc			\
-	poppler-annotation-helper.h		\
-	poppler-page-private.h			\
-	poppler-link-extractor-private.h	\
-	poppler-annotation-private.h		\
-	poppler-converter-private.h		\
-	poppler-qiodeviceoutstream-private.h	\
-	poppler-optcontent-private.h		\
-	poppler-export.h			\
-	poppler-private.h			\
-	poppler-page-transition-private.h	\
-	poppler-embeddedfile-private.h		\
-	ArthurOutputDev.h			\
-	ArthurOutputDev.cc
-
-libpoppler_qt4_la_CPPFLAGS =			\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/poppler			\
-	$(POPPLER_QT4_CFLAGS)			\
-	$(LCMS_CFLAGS)
-
-libpoppler_qt4_la_CXXFLAGS =			\
-	-Dpoppler_qt4_EXPORTS
-
-libpoppler_qt4_la_LIBADD =			\
-	$(top_builddir)/poppler/libpoppler.la	\
-	$(POPPLER_QT4_LIBS)
-
-libpoppler_qt4_la_LDFLAGS =			\
-	-version-info 15:0:11			\
-	@create_shared_lib@			\
-	@auto_import_flags@
-
-# This rule lets GNU make create any *.moc from the equivalent *.h
-.h.moc:
-	$(AM_V_GEN) $(MOCQT4) -i $< -o $@
-SUFFIXES: .moc
-
-BUILT_SOURCES = poppler-optcontent.moc
-
-clean-generic:
-	rm -f *.moc
diff --git a/qt4/tests/Makefile.am b/qt4/tests/Makefile.am
deleted file mode 100644
index 2f5170ef..00000000
--- a/qt4/tests/Makefile.am
+++ /dev/null
@@ -1,141 +0,0 @@
-AM_LDFLAGS = @auto_import_flags@
-
-AM_CPPFLAGS =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/poppler			\
-	-I$(top_srcdir)/qt4/src			\
-	-DTESTDATADIR=\"$(TESTDATADIR)\"        \
-	$(POPPLER_QT4_CFLAGS)
-
-LDADD =							\
-	$(top_builddir)/poppler/libpoppler.la		\
-	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
-	$(POPPLER_QT4_LIBS)
-
-noinst_PROGRAMS = test-poppler-qt4 stress-poppler-qt4 \
-	poppler-fonts test-password-qt4 stress-poppler-dir \
-	poppler-attachments poppler-texts poppler-forms \
-	stress-threads-qt4 test-render-to-file
-
-test_poppler_qt4_SOURCES =			\
-       test-poppler-qt4.cpp
-
-test_render_to_file_SOURCES =			\
-       test-render-to-file.cpp
-
-test_password_qt4_SOURCES =			\
-       test-password-qt4.cpp
-
-poppler_fonts_SOURCES =				\
-       poppler-fonts.cpp
-
-poppler_attachments_SOURCES =			\
-       poppler-attachments.cpp
-
-poppler_texts_SOURCES =				\
-       poppler-texts.cpp
-
-poppler_forms_SOURCES =				\
-       poppler-forms.cpp
-
-stress_poppler_qt4_SOURCES =			\
-       stress-poppler-qt4.cpp
-
-stress_poppler_dir_SOURCES =			\
-       stress-poppler-dir.cpp
-
-stress_threads_qt4_SOURCES =			\
-       stress-threads-qt4.cpp
-
-if BUILD_POPPLER_QT4
-TESTS = \
-	check_attachments	\
-	check_actualtext	\
-	check_dateConversion	\
-	check_fonts		\
-	check_links		\
-	check_metadata		\
-	check_optcontent	\
-	check_permissions	\
-	check_pagelabelinfo	\
-	check_pagemode		\
-	check_password		\
-	check_pagelayout	\
-	check_search		\
-	check_strings		\
-	check_lexer		\
-	check_goostring
-
-check_PROGRAMS = $(TESTS)
-
-check_attachments_SOURCES = check_attachments.cpp
-check_attachments.$(OBJEXT): check_attachments.moc
-check_attachments_LDADD = $(LDADD) $(POPPLER_QT4_TEST_LIBS)
-
-check_actualtext_SOURCES = check_actualtext.cpp
-check_actualtext.$(OBJEXT): check_actualtext.moc
-check_actualtext_LDADD = $(LDADD) $(POPPLER_QT4_TEST_LIBS)
-
-check_dateConversion_SOURCES = check_dateConversion.cpp
-check_dateConversion.$(OBJEXT): check_dateConversion.moc
-check_dateConversion_LDADD = $(LDADD) $(POPPLER_QT4_TEST_LIBS)
-
-check_fonts_SOURCES = check_fonts.cpp
-check_fonts.$(OBJEXT): check_fonts.moc
-check_fonts_LDADD = $(LDADD) $(POPPLER_QT4_TEST_LIBS)
-
-check_links_SOURCES = check_links.cpp
-check_links.$(OBJEXT): check_links.moc
-check_links_LDADD = $(LDADD) $(POPPLER_QT4_TEST_LIBS)
-
-check_metadata_SOURCES = check_metadata.cpp
-check_metadata.$(OBJEXT): check_metadata.moc
-check_metadata_LDADD = $(LDADD) $(POPPLER_QT4_TEST_LIBS)
-
-check_optcontent_SOURCES = check_optcontent.cpp
-check_optcontent.$(OBJEXT): check_optcontent.moc
-check_optcontent_LDADD = $(LDADD) $(POPPLER_QT4_TEST_LIBS)
-
-check_pagemode_SOURCES = check_pagemode.cpp
-check_pagemode.$(OBJEXT): check_pagemode.moc
-check_pagemode_LDADD = $(LDADD) $(POPPLER_QT4_TEST_LIBS)
-
-check_permissions_SOURCES = check_permissions.cpp
-check_permissions.$(OBJEXT): check_permissions.moc
-check_permissions_LDADD = $(LDADD) $(POPPLER_QT4_TEST_LIBS)
-
-check_pagelayout_SOURCES = check_pagelayout.cpp
-check_pagelayout.$(OBJEXT): check_pagelayout.moc
-check_pagelayout_LDADD = $(LDADD) $(POPPLER_QT4_TEST_LIBS)
-
-check_password_SOURCES = check_password.cpp
-check_password.$(OBJEXT): check_password.moc
-check_password_LDADD = $(LDADD) $(POPPLER_QT4_TEST_LIBS)
-
-check_search_SOURCES = check_search.cpp
-check_search.$(OBJEXT): check_search.moc
-check_search_LDADD = $(LDADD) $(POPPLER_QT4_TEST_LIBS)
-
-check_strings_SOURCES = check_strings.cpp
-check_strings.$(OBJEXT): check_strings.moc
-check_strings_LDADD = $(LDADD) $(POPPLER_QT4_TEST_LIBS)
-
-check_lexer_SOURCES = check_lexer.cpp
-check_lexer.$(OBJEXT): check_lexer.moc
-check_lexer_LDADD = $(LDADD) $(POPPLER_QT4_TEST_LIBS)
-
-check_pagelabelinfo_SOURCES = check_pagelabelinfo.cpp
-check_pagelabelinfo.$(OBJEXT): check_pagelabelinfo.moc
-check_pagelabelinfo_LDADD = $(LDADD) $(POPPLER_QT4_TEST_LIBS)
-
-check_goostring_SOURCES = check_goostring.cpp
-check_goostring.$(OBJEXT): check_goostring.moc
-check_goostring_LDADD = $(LDADD) $(POPPLER_QT4_TEST_LIBS)
-endif
-
-.cpp.moc:
-	$(AM_V_GEN) $(MOCQT4) -i $< -o $@
-SUFFIXES: .moc
-
-clean-generic:
-	rm -f *.moc
diff --git a/qt5/Makefile.am b/qt5/Makefile.am
deleted file mode 100644
index 69a10cb1..00000000
--- a/qt5/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = src tests demos
diff --git a/qt5/demos/Makefile.am b/qt5/demos/Makefile.am
deleted file mode 100644
index f4eba679..00000000
--- a/qt5/demos/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-AM_LDFLAGS = @auto_import_flags@
-
-noinst_PROGRAMS = poppler_qt5viewer
-
-BUILT_SOURCES =					\
-	abstractinfodock.moc			\
-	embeddedfiles.moc			\
-	fonts.moc				\
-	info.moc				\
-	metadata.moc				\
-	navigationtoolbar.moc			\
-	optcontent.moc				\
-	pageview.moc				\
-	permissions.moc				\
-	thumbnails.moc				\
-	toc.moc					\
-	viewer.moc
-
-poppler_qt5viewer_SOURCES =			\
-	abstractinfodock.cpp			\
-	abstractinfodock.h			\
-	documentobserver.cpp			\
-	documentobserver.h			\
-	embeddedfiles.cpp			\
-	embeddedfiles.h				\
-	fonts.cpp				\
-	fonts.h					\
-	info.cpp				\
-	info.h					\
-	main_viewer.cpp				\
-	metadata.cpp				\
-	metadata.h				\
-	navigationtoolbar.cpp			\
-	navigationtoolbar.h			\
-	optcontent.cpp				\
-	optcontent.h				\
-	pageview.cpp				\
-	pageview.h				\
-	permissions.cpp				\
-	permissions.h				\
-	thumbnails.cpp				\
-	thumbnails.h				\
-	toc.cpp					\
-	toc.h					\
-	viewer.cpp				\
-	viewer.h
-
-poppler_qt5viewer_CPPFLAGS =			\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/poppler			\
-	-I$(top_srcdir)/qt5/src			\
-	$(POPPLER_QT5_CFLAGS)
-
-poppler_qt5viewer_LDADD =				\
-	$(top_builddir)/poppler/libpoppler.la		\
-	$(top_builddir)/qt5/src/libpoppler-qt5.la	\
-	$(POPPLER_QT5_LIBS)
-
-# This rule lets GNU make create any *.moc from the equivalent *.h
-.h.moc:
-	$(AM_V_GEN) $(MOCQT5) -i $< -o $@
-SUFFIXES: .moc
-
-clean-generic:
-	rm -f *.moc
diff --git a/qt5/src/Makefile.am b/qt5/src/Makefile.am
deleted file mode 100644
index f0fae5b0..00000000
--- a/qt5/src/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-lib_LTLIBRARIES = libpoppler-qt5.la
-
-poppler_includedir = $(includedir)/poppler/qt5
-poppler_include_HEADERS =			\
-	poppler-qt5.h				\
-	poppler-link.h				\
-	poppler-link-private.h			\
-	poppler-annotation.h			\
-	poppler-form.h				\
-	poppler-optcontent.h			\
-	poppler-export.h			\
-	poppler-media.h				\
-	poppler-page-transition.h
-
-libpoppler_qt5_la_SOURCES =			\
-	poppler-document.cc			\
-	poppler-page.cc				\
-	poppler-fontinfo.cc			\
-	poppler-embeddedfile.cc			\
-	poppler-textbox.cc			\
-	poppler-link.cc				\
-	poppler-annotation.cc			\
-	poppler-link-extractor.cc		\
-	poppler-optcontent.cc			\
-	poppler-optcontent.h			\
-	poppler-page-transition.cc		\
-	poppler-sound.cc			\
-	poppler-form.cc				\
-	poppler-base-converter.cc		\
-	poppler-ps-converter.cc			\
-	poppler-pdf-converter.cc		\
-	poppler-qiodeviceoutstream.cc		\
-	poppler-private.cc			\
-	poppler-movie.cc			\
-	poppler-media.cc			\
-	poppler-annotation-helper.h		\
-	poppler-page-private.h			\
-	poppler-link-extractor-private.h	\
-	poppler-annotation-private.h		\
-	poppler-converter-private.h		\
-	poppler-qiodeviceoutstream-private.h	\
-	poppler-optcontent-private.h		\
-	poppler-export.h			\
-	poppler-private.h			\
-	poppler-page-transition-private.h	\
-	poppler-embeddedfile-private.h		\
-	ArthurOutputDev.h			\
-	ArthurOutputDev.cc
-
-libpoppler_qt5_la_CPPFLAGS =			\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/poppler			\
-	$(POPPLER_QT5_CFLAGS)			\
-	$(NSS3_CFLAGS)                          \
-	$(LCMS_CFLAGS)				\
-	$(FREETYPE_CFLAGS)
-
-libpoppler_qt5_la_CXXFLAGS =			\
-	-Dpoppler_qt5_EXPORTS
-
-libpoppler_qt5_la_LIBADD =			\
-	$(top_builddir)/poppler/libpoppler.la	\
-	$(POPPLER_QT5_LIBS)
-
-libpoppler_qt5_la_LDFLAGS =			\
-	-version-info 11:0:10			\
-	@create_shared_lib@			\
-	@auto_import_flags@
-
-# This rule lets GNU make create any *.moc from the equivalent *.h
-.h.moc:
-	$(AM_V_GEN) $(MOCQT5) -i $< -o $@
-SUFFIXES: .moc
-
-BUILT_SOURCES = poppler-optcontent.moc
-
-clean-generic:
-	rm -f *.moc
diff --git a/qt5/tests/Makefile.am b/qt5/tests/Makefile.am
deleted file mode 100644
index 86cdfca1..00000000
--- a/qt5/tests/Makefile.am
+++ /dev/null
@@ -1,141 +0,0 @@
-AM_LDFLAGS = @auto_import_flags@
-
-AM_CPPFLAGS =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/poppler			\
-	-I$(top_srcdir)/qt5/src			\
-	-DTESTDATADIR=\"$(TESTDATADIR)\"        \
-	$(POPPLER_QT5_CFLAGS)
-
-LDADD =							\
-	$(top_builddir)/poppler/libpoppler.la		\
-	$(top_builddir)/qt5/src/libpoppler-qt5.la	\
-	$(POPPLER_QT5_LIBS)
-
-noinst_PROGRAMS = test-poppler-qt5 stress-poppler-qt5 \
-	poppler-fonts test-password-qt5 stress-poppler-dir \
-	poppler-attachments poppler-texts poppler-forms \
-	stress-threads-qt5 test-render-to-file
-
-test_poppler_qt5_SOURCES =			\
-       test-poppler-qt5.cpp
-
-test_render_to_file_SOURCES =			\
-       test-render-to-file.cpp
-
-test_password_qt5_SOURCES =			\
-       test-password-qt5.cpp
-
-poppler_fonts_SOURCES =				\
-       poppler-fonts.cpp
-
-poppler_attachments_SOURCES =			\
-       poppler-attachments.cpp
-
-poppler_texts_SOURCES =				\
-       poppler-texts.cpp
-
-poppler_forms_SOURCES =				\
-       poppler-forms.cpp
-
-stress_poppler_qt5_SOURCES =			\
-       stress-poppler-qt5.cpp
-
-stress_poppler_dir_SOURCES =			\
-       stress-poppler-dir.cpp
-
-stress_threads_qt5_SOURCES =			\
-       stress-threads-qt5.cpp
-
-if BUILD_POPPLER_QT5
-TESTS = \
-	check_attachments	\
-	check_actualtext	\
-	check_dateConversion	\
-	check_fonts		\
-	check_links		\
-	check_metadata		\
-	check_optcontent	\
-	check_permissions	\
-	check_pagelabelinfo	\
-	check_pagemode		\
-	check_password		\
-	check_pagelayout	\
-	check_search		\
-	check_strings		\
-	check_lexer		\
-	check_goostring
-
-check_PROGRAMS = $(TESTS)
-
-check_attachments_SOURCES = check_attachments.cpp
-check_attachments.$(OBJEXT): check_attachments.moc
-check_attachments_LDADD = $(LDADD) $(POPPLER_QT5_TEST_LIBS)
-
-check_actualtext_SOURCES = check_actualtext.cpp
-check_actualtext.$(OBJEXT): check_actualtext.moc
-check_actualtext_LDADD = $(LDADD) $(POPPLER_QT5_TEST_LIBS)
-
-check_dateConversion_SOURCES = check_dateConversion.cpp
-check_dateConversion.$(OBJEXT): check_dateConversion.moc
-check_dateConversion_LDADD = $(LDADD) $(POPPLER_QT5_TEST_LIBS)
-
-check_fonts_SOURCES = check_fonts.cpp
-check_fonts.$(OBJEXT): check_fonts.moc
-check_fonts_LDADD = $(LDADD) $(POPPLER_QT5_TEST_LIBS)
-
-check_links_SOURCES = check_links.cpp
-check_links.$(OBJEXT): check_links.moc
-check_links_LDADD = $(LDADD) $(POPPLER_QT5_TEST_LIBS)
-
-check_metadata_SOURCES = check_metadata.cpp
-check_metadata.$(OBJEXT): check_metadata.moc
-check_metadata_LDADD = $(LDADD) $(POPPLER_QT5_TEST_LIBS)
-
-check_optcontent_SOURCES = check_optcontent.cpp
-check_optcontent.$(OBJEXT): check_optcontent.moc
-check_optcontent_LDADD = $(LDADD) $(POPPLER_QT5_TEST_LIBS)
-
-check_pagemode_SOURCES = check_pagemode.cpp
-check_pagemode.$(OBJEXT): check_pagemode.moc
-check_pagemode_LDADD = $(LDADD) $(POPPLER_QT5_TEST_LIBS)
-
-check_permissions_SOURCES = check_permissions.cpp
-check_permissions.$(OBJEXT): check_permissions.moc
-check_permissions_LDADD = $(LDADD) $(POPPLER_QT5_TEST_LIBS)
-
-check_pagelayout_SOURCES = check_pagelayout.cpp
-check_pagelayout.$(OBJEXT): check_pagelayout.moc
-check_pagelayout_LDADD = $(LDADD) $(POPPLER_QT5_TEST_LIBS)
-
-check_password_SOURCES = check_password.cpp
-check_password.$(OBJEXT): check_password.moc
-check_password_LDADD = $(LDADD) $(POPPLER_QT5_TEST_LIBS)
-
-check_search_SOURCES = check_search.cpp
-check_search.$(OBJEXT): check_search.moc
-check_search_LDADD = $(LDADD) $(POPPLER_QT5_TEST_LIBS)
-
-check_strings_SOURCES = check_strings.cpp
-check_strings.$(OBJEXT): check_strings.moc
-check_strings_LDADD = $(LDADD) $(POPPLER_QT5_TEST_LIBS)
-
-check_lexer_SOURCES = check_lexer.cpp
-check_lexer.$(OBJEXT): check_lexer.moc
-check_lexer_LDADD = $(LDADD) $(POPPLER_QT5_TEST_LIBS)
-
-check_pagelabelinfo_SOURCES = check_pagelabelinfo.cpp
-check_pagelabelinfo.$(OBJEXT): check_pagelabelinfo.moc
-check_pagelabelinfo_LDADD = $(LDADD) $(POPPLER_QT5_TEST_LIBS)
-
-check_goostring_SOURCES = check_goostring.cpp
-check_goostring.$(OBJEXT): check_goostring.moc
-check_goostring_LDADD = $(LDADD) $(POPPLER_QT5_TEST_LIBS)
-endif
-
-.cpp.moc:
-	$(AM_V_GEN) $(MOCQT5) -i $< -o $@
-SUFFIXES: .moc
-
-clean-generic:
-	rm -f *.moc
diff --git a/splash/Makefile.am b/splash/Makefile.am
deleted file mode 100644
index 5c265d63..00000000
--- a/splash/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-noinst_LTLIBRARIES = libsplash.la
-
-if ENABLE_XPDF_HEADERS
-
-poppler_splash_includedir = $(includedir)/poppler/splash
-poppler_splash_include_HEADERS =		\
-	Splash.h				\
-	SplashBitmap.h				\
-	SplashClip.h				\
-	SplashErrorCodes.h			\
-	SplashFTFont.h				\
-	SplashFTFontEngine.h			\
-	SplashFTFontFile.h			\
-	SplashFont.h				\
-	SplashFontEngine.h			\
-	SplashFontFile.h			\
-	SplashFontFileID.h			\
-	SplashGlyphBitmap.h			\
-	SplashMath.h				\
-	SplashPath.h				\
-	SplashPattern.h				\
-	SplashScreen.h				\
-	SplashState.h				\
-	SplashT1Font.h				\
-	SplashT1FontEngine.h			\
-	SplashT1FontFile.h			\
-	SplashTypes.h				\
-	SplashXPath.h				\
-	SplashXPathScanner.h
-
-endif
-
-libsplash_la_SOURCES =				\
-	Splash.cc				\
-	SplashBitmap.cc				\
-	SplashClip.cc				\
-	SplashFTFont.cc				\
-	SplashFTFontEngine.cc			\
-	SplashFTFontFile.cc			\
-	SplashFont.cc				\
-	SplashFontEngine.cc			\
-	SplashFontFile.cc			\
-	SplashFontFileID.cc			\
-	SplashPath.cc				\
-	SplashPattern.cc			\
-	SplashScreen.cc				\
-	SplashState.cc				\
-	SplashT1Font.cc				\
-	SplashT1FontEngine.cc			\
-	SplashT1FontFile.cc			\
-	SplashXPath.cc				\
-	SplashXPathScanner.cc
-
-# SplashBitmap includes JpegWriter.h, TiffWriter.h, PNGWriter.h
-if BUILD_LIBJPEG
-libjpeg_includes = $(LIBJPEG_CFLAGS)
-endif
-
-if BUILD_LIBTIFF
-libtiff_includes = $(LIBTIFF_CFLAGS)
-endif
-
-if BUILD_LIBPNG
-libpng_includes = $(LIBPNG_CFLAGS)
-endif
-
-libsplash_la_CPPFLAGS =				\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/goo			\
-	$(libjpeg_includes)			\
-	$(libtiff_includes)			\
-	$(libpng_includes)			\
-	$(FREETYPE_CFLAGS)
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index 16f2b1a0..00000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-AM_LDFLAGS = @auto_import_flags@
-
-AM_CPPFLAGS =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/poppler
-
-noinst_PROGRAMS = pdf-fullrewrite
-
-if BUILD_GTK_TEST
-noinst_PROGRAMS += gtk-test
-if BUILD_CAIRO_OUTPUT
-noinst_PROGRAMS += pdf_inspector
-endif
-endif
-
-if BUILD_SPLASH_OUTPUT
-noinst_PROGRAMS += perf-test
-endif
-
-gtk_test_SOURCES =					\
-	gtk-test.cc
-
-gtk_test_CPPFLAGS =					\
-	$(AM_CPPFLAGS)					\
-	-I$(top_srcdir)/glib				\
-	-I$(top_builddir)/glib				\
-	$(GTK_TEST_CFLAGS)
-
-gtk_test_LDADD =					\
-	$(top_builddir)/poppler/libpoppler.la           \
-	$(top_builddir)/glib/libpoppler-glib.la         \
-	$(GTK_TEST_LIBS)				\
-	$(PTHREAD_LIBS)
-
-pdf_inspector_SOURCES =					\
-	pdf-inspector.cc
-
-pdf_inspector_CPPFLAGS =				\
-	$(AM_CPPFLAGS)					\
-	$(GTK_TEST_CFLAGS)
-
-pdf_inspector_LDADD =					\
-	$(top_builddir)/poppler/libpoppler-cairo.la	\
-	$(top_builddir)/poppler/libpoppler.la		\
-	$(GTK_TEST_LIBS)				\
-	$(X_EXTRA_LIBS)					\
-	$(PTHREAD_LIBS)
-
-perf_test_SOURCES =					\
-	perf-test.cc					\
-	perf-test-preview-dummy.cc
-
-perf_test_LDADD =				\
-	$(top_builddir)/poppler/libpoppler.la	\
-	$(FREETYPE_LIBS)					\
-	$(X_EXTRA_LIBS)
-
-pdf_fullrewrite_SOURCES =				\
-	pdf-fullrewrite.cc
-
-pdf_fullrewrite_LDADD =					\
-	$(top_builddir)/utils/libparseargs.la		\
-	$(top_builddir)/poppler/libpoppler.la
-
-EXTRA_DIST =					\
-	pdf-operators.c				\
-	pdf-inspector.ui
diff --git a/utils/Makefile.am b/utils/Makefile.am
deleted file mode 100644
index e7d26385..00000000
--- a/utils/Makefile.am
+++ /dev/null
@@ -1,155 +0,0 @@
-AM_LDFLAGS = @auto_import_flags@
-
-AM_CPPFLAGS =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/goo			\
-	-I$(top_srcdir)/utils			\
-	-I$(top_srcdir)/poppler			\
-	$(UTILS_CFLAGS)
-
-LDADD =						\
-	libparseargs.la				\
-	$(top_builddir)/poppler/libpoppler.la	\
-	$(UTILS_LIBS)
-
-if BUILD_UTILS
-
-bin_PROGRAMS =					\
-	pdfdetach				\
-	pdffonts				\
-	pdfimages				\
-	pdfinfo					\
-	pdftops					\
-	pdftotext				\
-	pdftohtml				\
-	pdfseparate				\
-	pdfunite
-
-if BUILD_NSS
-bin_PROGRAMS += pdfsig
-endif
-
-if BUILD_SPLASH_OUTPUT
-bin_PROGRAMS += pdftoppm
-endif
-
-if BUILD_CAIRO_OUTPUT
-bin_PROGRAMS += pdftocairo
-endif
-
-dist_man1_MANS =				\
-	pdfdetach.1				\
-	pdffonts.1				\
-	pdfimages.1				\
-	pdfinfo.1				\
-	pdftops.1				\
-	pdftotext.1				\
-	pdftohtml.1				\
-	pdfseparate.1				\
-	pdfunite.1
-
-if BUILD_NSS
-dist_man1_MANS += pdfsig.1
-endif
-
-if BUILD_SPLASH_OUTPUT
-dist_man1_MANS += pdftoppm.1
-endif
-
-if BUILD_CAIRO_OUTPUT
-dist_man1_MANS += pdftocairo.1
-endif
-
-endif # if BUILD_UTILS
-
-pdfdetach_SOURCES =				\
-	pdfdetach.cc
-
-pdffonts_SOURCES =				\
-	pdffonts.cc
-
-pdfsig_SOURCES =				\
-	pdfsig.cc
-
-pdfimages_SOURCES =				\
-	pdfimages.cc				\
-	ImageOutputDev.cc			\
-	ImageOutputDev.h			\
-	JSInfo.cc				\
-	JSInfo.h
-
-pdfinfo_SOURCES =				\
-	pdfinfo.cc				\
-	printencodings.cc			\
-	printencodings.h			\
-	JSInfo.cc				\
-	JSInfo.h
-
-pdftops_SOURCES =				\
-	pdftops.cc
-
-pdftotext_SOURCES =				\
-	pdftotext.cc				\
-	printencodings.cc			\
-	printencodings.h
-
-pdftohtml_SOURCES =				\
-	pdftohtml.cc				\
-	HtmlFonts.cc				\
-	HtmlFonts.h				\
-	HtmlLinks.cc				\
-	HtmlLinks.h				\
-	HtmlOutputDev.cc			\
-	HtmlOutputDev.h				\
-	HtmlUtils.h
-
-# HtmlOutputDev uses goo/PNGWriter.h that may depend on libpng header
-if BUILD_LIBPNG
-pdftohtml_CXXFLAGS = $(AM_CXXFLAGS) $(LIBPNG_CFLAGS)
-endif
-
-pdfseparate_SOURCES =				\
-	pdfseparate.cc
-
-pdfunite_SOURCES =				\
-	pdfunite.cc
-
-pdftoppm_SOURCES =				\
-	pdftoppm.cc
-
-pdftocairo_SOURCES =				\
-	pdftocairo.cc				\
-	pdftocairo-win32.cc			\
-	pdftocairo-win32.h
-
-if BUILD_CAIRO_OUTPUT
-if USE_CMS
-PDFTOCAIRO_CFLAGS += $(LCMS_CFLAGS)
-PDFTOCAIRO_LIBS += $(LCMS_LIBS)
-endif
-endif
-
-if BUILD_NSS
-pdfsig_CXXFLAGS = $(NSS3_CFLAGS)
-endif
-
-pdftocairo_LDADD =					\
-	$(top_builddir)/poppler/libpoppler-cairo.la	\
-	$(LDADD)					\
-	$(PDFTOCAIRO_LIBS)				\
-	$(PTHREAD_LIBS)
-
-pdftocairo_CPPFLAGS =				\
-	$(AM_CPPFLAGS)				\
-	$(PDFTOCAIRO_CFLAGS)
-
-noinst_LTLIBRARIES = libparseargs.la
-
-libparseargs_la_SOURCES =			\
-	parseargs.cc				\
-	parseargs.h
-
-# Yay, automake!  It should be able to figure out that it has to dist
-# pdftoppm.1, but nooo.  So we just add it here.
-
-EXTRA_DIST = pdf2xml.dtd pdftoppm.1
