From 27fb95dafd712f6bbf9e15bac310b046948f9689 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Tue, 20 Jun 2006 19:39:25 +0000 Subject: [PATCH] INSTALL configure.in plug-ins/Makefile.am added build infrastructure for 2006-06-20 Sven Neumann * INSTALL * configure.in * plug-ins/Makefile.am * plug-ins/print/Makefile.am: added build infrastructure for new print plug-in. --- ChangeLog | 8 ++++++++ INSTALL | 3 +++ configure.in | 18 ++++++++++++++++++ plug-ins/Makefile.am | 5 +++++ plug-ins/print/.cvsignore | 3 +++ plug-ins/print/Makefile.am | 36 ++++++++++++++++++++++++++++++++++++ 6 files changed, 73 insertions(+) create mode 100644 plug-ins/print/.cvsignore create mode 100644 plug-ins/print/Makefile.am diff --git a/ChangeLog b/ChangeLog index 53125d8bd7..a610a6c3e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-06-20 Sven Neumann + + * INSTALL + * configure.in + * plug-ins/Makefile.am + * plug-ins/print/Makefile.am: added build infrastructure for new + print plug-in. + 2006-06-20 Sven Neumann * INSTALL diff --git a/INSTALL b/INSTALL index b8aaced5fc..b680d693c5 100644 --- a/INSTALL +++ b/INSTALL @@ -144,6 +144,9 @@ These are: --without-poppler. If for some reason you don't want to build the PDF import plug-in that uses libpoppler, you can use --without-poppler. + --without-print. If for some reason you don't want to build the Print + plug-in based on the GtkPrint API, you can build with --without-print. + --with-gif-compression=[lzw|rle|none]. Allows to tune the compression algorithm used by the GIF plug-in. If you are afraid of Unisys' LZW patent (which should have expired in most countries by now), you diff --git a/configure.in b/configure.in index 44fea7a78b..c0d58c85ae 100644 --- a/configure.in +++ b/configure.in @@ -1176,6 +1176,22 @@ AC_SUBST(SVG) AC_SUBST(LIBSVG) +#################################### +# Check for gtk+ 2.10 (for GtkPrint) +#################################### + +enable_print=no +AC_ARG_WITH(print,[ --without-print build without print support]) + +if test "x$with_print" != xno; then + PKG_CHECK_MODULES(PRINT, gtk+-2.0 >= 2.10.0, + enable_print="yes", enable_print="no (gtk+ >= 2.10.0 not available)") +else + enable_print="no (print support disabled)" +fi +AM_CONDITIONAL(BUILD_PRINT, test "x$enable_print" == xyes) + + ###################### # Check for libpoppler ###################### @@ -1276,6 +1292,7 @@ else fi AC_SUBST(LIBWMF) AC_SUBST(WMF_CFLAGS) +AC_SUBST(WMF) ################ @@ -1830,6 +1847,7 @@ Optional Plug-Ins: MNG: $have_libmng PDF: $have_poppler PNG: $have_libpng + Print: $enable_print PSP: $have_zlib SVG: $have_librsvg TIFF: $have_libtiff diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am index a451c2314e..e94e164256 100644 --- a/plug-ins/Makefile.am +++ b/plug-ins/Makefile.am @@ -8,6 +8,10 @@ if BUILD_HELPBROWSER helpbrowser = helpbrowser endif +if BUILD_PRINT +print = print +endif + if BUILD_PYTHON pygimp = pygimp endif @@ -49,6 +53,7 @@ SUBDIRS = \ maze \ metadata \ pagecurl \ + $(print) \ $(pygimp) \ rcm \ sgi \ diff --git a/plug-ins/print/.cvsignore b/plug-ins/print/.cvsignore new file mode 100644 index 0000000000..74e673728e --- /dev/null +++ b/plug-ins/print/.cvsignore @@ -0,0 +1,3 @@ +Makefile.in +Makefile +print diff --git a/plug-ins/print/Makefile.am b/plug-ins/print/Makefile.am new file mode 100644 index 0000000000..1d28c5621f --- /dev/null +++ b/plug-ins/print/Makefile.am @@ -0,0 +1,36 @@ +## Process this file with automake to produce Makefile.in + +libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la +libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la +libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la +libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la +libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la +libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la +libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la + +if OS_WIN32 +mwindows = -mwindows +endif + +AM_LDFLAGS = $(mwindows) + +INCLUDES = \ + -I$(top_srcdir) \ + $(PRINT_CFLAGS) \ + -I$(includedir) + +LDADD = \ + $(libgimpui) \ + $(libgimpwidgets) \ + $(libgimpconfig) \ + $(libgimp) \ + $(libgimpcolor) \ + $(libgimpmath) \ + $(libgimpbase) \ + $(PRINT_LIBS) \ + $(RT_LIBS) \ + $(INTLLIBS) + +libexecdir = $(gimpplugindir)/plug-ins + +libexec_PROGRAMS =