check for libwmf >= 0.2.8 and build the WMF plug-in conditionally.

2003-11-09  Sven Neumann  <sven@gimp.org>

	* configure.in: check for libwmf >= 0.2.8 and build the WMF
	plug-in conditionally.

	* plug-ins/common/Makefile.am
	* plug-ins/common/mkgen.pl
	* plug-ins/common/plugin-defs.pl
	* plug-ins/common/wmf.c: replaced the WMF plug-in with a plug-in
	using libwmf written by Dom Lachowicz and Francis James
	Franklin. Converted the plug-in to to new GimpDialog API and GIMP
	coding style. Fixes bug #108653.

ChangeLog

@@ -1,3 +1,16 @@
+2003-11-09  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: check for libwmf >= 0.2.8 and build the WMF
+	plug-in conditionally.
+
+	* plug-ins/common/Makefile.am
+	* plug-ins/common/mkgen.pl
+	* plug-ins/common/plugin-defs.pl
+	* plug-ins/common/wmf.c: replaced the WMF plug-in with a plug-in
+	using libwmf written by Dom Lachowicz and Francis James
+	Franklin. Converted the plug-in to to new GimpDialog API and GIMP
+	coding style. Fixes bug #108653.
+
 2003-11-08  Sven Neumann  <sven@gimp.org>
 
 	* app/widgets/gimphistogrameditor.c: (hopefully) fixed bug #126151.

INSTALL

@@ -36,7 +36,7 @@ need to deinstall the 1.2 version.
   5. You may want to install other third party libraries or programs that
      are needed for some of the available plugins. We recommend to check
      that the following libraries are installed: libpng, libjpeg,
-     libtiff, gimp-print (4.2.x), gtkhtml-2, libmng, librsvg.
+     libtiff, gimp-print (4.2.x), gtkhtml-2, libmng, librsvg, libwmf.
 
   6. Configure the GIMP by running the `configure' script. You may want
      to pass some options to it, see below.

configure.in

@@ -24,6 +24,7 @@ GTKHTML2_REQUIRED_VERSION=2.0.0
 GIMPPRINT_REQUIRED_VERSION=4.2.0
 GIMPPRINT_TOONEW_VERSION=4.3.0
 RSVG_REQUIRED_VERSION=2.2.0
+WMF_REQUIRED_VERSION=0.2.8
 
 AC_SUBST(GLIB_REQUIRED_VERSION)
 AC_SUBST(GTK_REQUIRED_VERSION)
@@ -33,6 +34,7 @@ AC_SUBST(GTKHTML2_REQUIRED_VERSION)
 AC_SUBST(GIMPPRINT_REQUIRED_VERSION)
 AC_SUBST(GIMPPRINT_TOONEW_VERSION)
 AC_SUBST(RSVG_REQUIRED_VERSION)
+AC_SUBST(WMF_REQUIRED_VERSION)
 
 #
 # Making releases:
@@ -985,6 +987,29 @@ AM_CONDITIONAL(BUILD_PRINT,
                test x$enable_print != xno && test x$have_gimp_print = xyes)
 
 
+###################
+# Check for libwmf2
+###################
+
+AC_PATH_PROG(WMF_CONFIG, libwmf-config, no)
+if test "x$WMF_CONFIG" != "xno" ; then
+  AC_MSG_CHECKING(for libwmf >= $WMF_REQUIRED_VERSION)
+  wmf_version=`$WMF_CONFIG --version`
+  if expr $wmf_version \>= $WMF_REQUIRED_VERSION >/dev/null; then
+    AC_MSG_RESULT([yes (version $wmf_version)])
+    WMF=wmf
+    LIBWMF=`$WMF_CONFIG --libs`
+    WMF_CFLAGS=`$WMF_CONFIG --cflags`
+  else
+    AC_MSG_WARN([*** WMF plug-in will not be built (libwmf is too old)])
+  fi
+else
+  AC_MSG_WARN([*** WMF plug-in will not be built (libwmf not found) ***])
+fi
+AC_SUBST(LIBWMF)
+AC_SUBST(WMF_CFLAGS)
+
+
 ############################################################
 # GIF compression: Allow builder to specify at compile time
 # which compression style she wants to use for GIFs.
@@ -1083,6 +1108,7 @@ AC_SUBST(SCREENSHOT)
 AC_SUBST(URL)
 AC_SUBST(WINCLIPBOARD)
 AC_SUBST(WINPRINT)
+AC_SUBST(WMF)
 
 
 ##########################################################

plug-ins/common/Makefile.am

@@ -18,6 +18,7 @@ INCLUDES = \
 	@X_CFLAGS@	\
 	@EXIF_CFLAGS@	\
 	@SVG_CFLAGS@	\
+	@WMF_CFLAGS@	\
 	-I$(includedir)
 
 libexec_PROGRAMS = \
@@ -152,7 +153,7 @@ libexec_PROGRAMS = \
 	$(WINCLIPBOARD) \
 	wind \
 	$(WINPRINT) \
-	wmf \
+	$(WMF) \
 	xbm \
 	$(XPM) \
 	xwd \
@@ -172,6 +173,7 @@ EXTRA_PROGRAMS = \
 	url \
 	winclipboard \
 	winprint \
+	wmf \
 	xpm
 
 install-%: %
@@ -1743,6 +1745,7 @@ wmf_LDADD = \
 	$(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la		\
 	$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la	\
 	$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la	\
+	$(LIBWMF)							\
 	@GTK_LIBS@							\
 	@INTLLIBS@
 

plug-ins/common/mkgen.pl

@@ -58,6 +58,7 @@ INCLUDES = \\
 	\@X_CFLAGS\@	\\
 	\@EXIF_CFLAGS\@	\\
 	\@SVG_CFLAGS\@	\\
+	\@WMF_CFLAGS\@	\\
 	-I\$(includedir)
 
 libexec_PROGRAMS = \\

plug-ins/common/plugin-defs.pl

@@ -130,7 +130,7 @@
     'winclipboard' => { libdep => 'glib', ui => 1, optional => 1 },
     'wind' => { libdep => 'gtk', ui => 1 },
     'winprint' => { libdep => 'glib', ui => 1, optional => 1 },
-    'wmf' => { libdep => 'gtk', ui => 1 },
+    'wmf' => { libdep => 'gtk', ui => 1, optional => 1 },
     'xbm' => { libdep => 'gtk', ui => 1 },
     'xpm' => { libdep => 'gtk', ui => 1, optional => 1 },
     'xwd' => { libdep => 'gtk', ui => 1 },