Commit 311dcf85 authored by Nate Summers's avatar Nate Summers

Changes in preparation for integrating gimp-poppler.


	Changes in preparation for integrating gimp-poppler.

 	* configure.in: check for libpoppler.

	* plug-ins/common/postscript.c (query): don't register file_load_pdf
	if HAVE_POPPLER is defined
parent 6ed5d64c
......@@ -54,6 +54,7 @@ m4_define([alsa_required_version], [1.0.0])
m4_define([rsvg_required_version], [2.8.0])
m4_define([wmf_required_version], [0.2.8])
m4_define([pygtk_required_version], [1.99.15])
m4_define([poppler_required_version], [0.3.1])
AC_INIT([GIMP], [gimp_version],
[http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP],
......@@ -1149,6 +1150,22 @@ PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version,
AC_SUBST(SVG)
AC_SUBST(LIBSVG)
###################
# Check for librsvg
###################
PKG_CHECK_MODULES(POPPLER, poppler-glib >= poppler_required_version,
POPPLER='poppler$(EXEEXT)'
LIBPOPPLER=$POPPLER_LIBS
AC_DEFINE(HAVE_POPPLER, 1, "Define to 1 if libpoppler is available")
have_poppler=yes,
AC_MSG_WARN([*** PDF import will be by the postscript plugin (libpoppler not found) ***]))
AC_SUBST(POPPLER)
AC_SUBST(LIBPOPPLER)
AM_CONDITIONAL(HAVE_POPPLER, test x$have_poppler = xyes)
#####################
# Check for gnome-vfs
......
......@@ -604,6 +604,7 @@ query (void)
"",
"0,string,%!,0,long,0xc5d0d3c6");
#ifndef HAVE_POPPLER
gimp_install_procedure ("file_pdf_load",
"load PDF documents",
"load PDF documents",
......@@ -622,6 +623,7 @@ query (void)
"pdf",
"",
"0,string,%PDF");
#endif
gimp_install_procedure ("file_ps_load_setargs",
"set additional parameters for procedure file_ps_load",
......@@ -650,7 +652,10 @@ query (void)
gimp_register_thumbnail_loader ("file_ps_load", "file_ps_load_thumb");
gimp_register_thumbnail_loader ("file_eps_load", "file_ps_load_thumb");
#ifndef HAVE_POPPLER
gimp_register_thumbnail_loader ("file_pdf_load", "file_ps_load_thumb");
#endif
gimp_install_procedure ("file_ps_save",
"save image as PostScript docuement",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment