From 02eb16fef45712a91e24f6471b9e2f31249c888e Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Tue, 01 Mar 2005 22:24:10 +0000 Subject: Use poppler instead of including xpdf source code. Poppler is a fork of 2005-03-01 Kristian Høgsberg Use poppler instead of including xpdf source code. Poppler is a fork of xpdf to build it as a shared library. See http://freedesktop.org/wiki/Software/poppler. * pdf/xpdf/*, pdf/goo/*, pdf/splash/*, pdf/fofi/*: Remove included xpdf fork. * pdf/Makefile.am: Build libpdfdocument.a here. * pdf/GDKSplashOutputDev.cc: * pdf/GDKSplashOutputDev.h: * pdf/GnomeVFSStream.cc: * pdf/GnomeVFSStream.h: * pdf-document.cc: * pdf-document.h: * test-gdk-output-dev.cc * Thumb.cc: * Thumb.h: Pull these files out of pdf/xpdf and adjust to compile against poppler. --- (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c3a8fe7..f31edb4 100644 --- a/configure.ac +++ b/configure.ac @@ -33,10 +33,11 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) PKG_CHECK_MODULES(LIBEVPRIVATE, gtk+-2.0 >= 2.4.0) PKG_CHECK_MODULES(RECENT_FILES, gtk+-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.4.0) -PKG_CHECK_MODULES(SHELL, gtk+-2.0 >= 2.6.0 libgnomeui-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 gconf-2.0) +PKG_CHECK_MODULES(SHELL, gtk+-2.0 >= 2.6.0 libgnomeui-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libglade-2.0 gconf-2.0 poppler >= 0.1.1) PKG_CHECK_MODULES(DVI, gtk+-2.0 >= 2.6.0) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0) PKG_CHECK_MODULES(PS, gtk+-2.0 >= 2.6.0 gnome-vfs-2.0 libgnomeui-2.0) +PKG_CHECK_MODULES(POPPLER, poppler >= 0.1.1) GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) @@ -71,226 +72,6 @@ if test "x$GCONFTOOL" = "xno"; then AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) fi -dnl ================== Xpdf aconf.h.in checks ================================== - -AH_TEMPLATE([HAVE_LIBSM], [Define to 1 if you have session management.]) -AH_TEMPLATE([ENABLE_NLS], [Use Native Language Support.]) -AH_TEMPLATE([HAVE_CATGETS], [Use catgets functions.]) -AH_TEMPLATE([HAVE_GETTEXT], [Use gettext functions.]) - -dnl Optional features. -AH_TEMPLATE([A4_PAPER], - [Use A4 paper size instead of Letter for PostScript output.]) -AC_ARG_ENABLE(a4-paper, - AC_HELP_STRING([--enable-a4-paper], - [use A4 paper size instead of Letter for - PostScript output]), - AC_DEFINE(A4_PAPER)) - -dnl never define NO_TEXT_SELECT, just remember this Xpdf setting. -AH_TEMPLATE([NO_TEXT_SELECT], [Do not allow text selection.]) - -AH_TEMPLATE([OPI_SUPPORT], - [Include support for OPI comments.]) -AC_ARG_ENABLE(opi, - AC_HELP_STRING([--enable-opi], - [include support for OPI comments]), - AC_DEFINE(OPI_SUPPORT)) - -dnl enable these unconditionally. -AC_DEFINE([MULTITHREADED], [1], [Enable multithreading support.]) -AC_DEFINE([TEXTOUT_WORD_LIST], [1], [Enable word list support.]) - -AH_TEMPLATE([APPDEFDIR], - [Directory with the Xpdf app-defaults file.]) -AC_ARG_WITH(appdef-dir, - AC_HELP_STRING([--with-appdef-dir], - [set app-defaults directory]), - AC_DEFINE_UNQUOTED(APPDEFDIR, "$with_appdef_dir")) - -dnl Path to xpdfrc. -dnl This ugly kludge to get the sysconfdir path is needed because -dnl autoconf doesn't actually set the prefix variable until later. -if test "$sysconfdir" = '${prefix}/etc'; then - if test "x$prefix" = xNONE; then - system_xpdfrc="$ac_default_prefix/etc/xpdfrc" - else - system_xpdfrc="$prefix/etc/xpdfrc" - fi -else - system_xpdfrc="$sysconfdir/xpdfrc" -fi -AC_DEFINE_UNQUOTED(SYSTEM_XPDFRC, "$system_xpdfrc", - [Full path for the system-wide xpdfrc file.]) - -dnl Checks for header files. -AC_HEADER_DIRENT - -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 - -dnl Look for header that defines select() and fd_set. -AC_MSG_CHECKING([select() and fd_set in sys/select.h and sys/bsdtypes.h]) -AC_TRY_COMPILE([#include -#include -#include -#include ], - [fd_set fds; -select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no) -if test $xpdf_ok = yes; then - AC_MSG_RESULT([not needed]) -else - AC_TRY_COMPILE([#include -#include -#include -#include -#include ], - [fd_set fds; -select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no) - if test $xpdf_ok = yes; then - AC_DEFINE(HAVE_SYS_SELECT_H, 1, [Have sys/select.h.]) - AC_MSG_RESULT([need sys/select.h]) - else - AC_TRY_COMPILE([#include -#include -#include -#include -#include ], - [fd_set fds; -select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no) - if test $xpdf_ok = yes; then - AC_DEFINE(HAVE_SYS_BSDTYPES_H, 1, [Have sys/bsdtypes.h.]) - AC_MSG_RESULT([need sys/bsdtypes.h]) - else - AC_MSG_RESULT([problem]) - fi - fi -fi - -dnl Look for header that defines FD_ZERO. -AC_MSG_CHECKING([FD_ZERO and strings.h or bstring.h]) -AC_TRY_COMPILE([#include -#include -#ifdef HAVE_SYS_SELECT_H -#include -#endif], -[fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no) -if test $xpdf_ok = yes; then - AC_MSG_RESULT([not needed]) -else - AC_TRY_COMPILE([#include -#include -#include -#ifdef HAVE_SYS_SELECT_H -#include -#endif], - [fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no) - if test $xpdf_ok = yes; then - AC_DEFINE(HAVE_STRINGS_H, 1, [Have strings.h.]) - AC_MSG_RESULT([need strings.h]) - else - AC_TRY_COMPILE([#include -#include -#include -#ifdef HAVE_SYS_SELECT_H -#include -#endif], - [fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no) - if test $xpdf_ok = yes; then - AC_DEFINE(HAVE_BSTRING_H, 1, [Have bstring.h.]) - AC_MSG_RESULT([need bstring.h]) - else - AC_MSG_RESULT([problem]) - fi - fi -fi - -dnl Look for rewinddir. -AC_CHECK_FUNCS(rewinddir) -if test $ac_cv_func_rewinddir = no; then - AC_CHECK_LIB(cposix, rewinddir) -fi - -dnl Checks for library functions. -AC_CHECK_FUNCS(popen) -dnl # This should use 'AC_CHECK_FUNCS(mkstemp)' but that fails if -dnl # the mkstemp exists in the library but isn't declared in the -dnl # include file (e.g., in cygwin 1.1.2). -AC_CACHE_CHECK([for mkstemp], -xpdf_cv_func_mkstemp, -[AC_TRY_LINK([#include -#include ], -[mkstemp("foo");], -xpdf_cv_func_mkstemp=yes, xpdf_cv_func_mkstemp=no)]) -if test "$xpdf_cv_func_mkstemp" = yes; then - AC_DEFINE(HAVE_MKSTEMP, 1, [Have mkstemp().]) -fi -dnl Check for mkstemps, just like mkstemp. -AC_CACHE_CHECK([for mkstemps], -xpdf_cv_func_mkstemps, -[AC_TRY_LINK([#include -#include ], -[mkstemps("foo", 0);], -xpdf_cv_func_mkstemps=yes, xpdf_cv_func_mkstemps=no)]) -if test "$xpdf_cv_func_mkstemps" = yes; then - AC_DEFINE(HAVE_MKSTEMPS, 1, [Have mkstemps().]) -fi - -dnl Check select argument type: on HP-UX before version 10, select -dnl takes (int *) instead of (fd_set *). -AC_CACHE_CHECK([whether select takes fd_set arguments], -xpdf_cv_func_select_arg, -[AC_TRY_COMPILE([#include -#include -#include -#ifdef HAVE_SYS_SELECT_H -#include -#endif], -[fd_set fds; -select(1, &fds, &fds, &fds, 0);], -xpdf_cv_func_select_arg=yes, xpdf_cv_func_select_arg=no)]) -if test "$xpdf_cv_func_select_arg" != yes; then - AC_DEFINE(SELECT_TAKES_INT, 1, [select() takes int, not fd_set arguments.]) -fi - -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, 1, [Have fseek64().]) -fi - -dnl Check for freetype headers -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]) - - vers=`$FREETYPE_CONFIG --version 2>/dev/null | sed -e 's/libfreetype //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - if test -n "$vers" && test "$vers" -le 9005003; then - AC_DEFINE_UNQUOTED(HAVE_FREETYPE_217_OR_OLDER, 1, [Defines if your system has the freetype library 2.1.7 or older]) - else - AC_DEFINE_UNQUOTED(HAVE_FREETYPE_217_OR_OLDER, 0, [Defines if your system has the freetype library 2.1.7 or older]) - fi - -fi - -AC_SUBST(FREETYPE_CFLAGS) -AC_SUBST(FREETYPE_LIBS) - -dnl ================== End of xpdf checks =========================================== - dnl ================== ggv checks =================================================== AC_ARG_WITH(gs-pkg, [ --with-gs=dir Directory Where GhostScript package is installed.]) @@ -380,10 +161,6 @@ cut-n-paste/recent-files/Makefile data/Makefile lib/Makefile pdf/Makefile -pdf/goo/Makefile -pdf/fofi/Makefile -pdf/splash/Makefile -pdf/xpdf/Makefile pixbuf/Makefile ps/Makefile po/Makefile.in -- cgit v0.9.1