Commit 75484699 authored by Roman Joost's avatar Roman Joost

Disabled the build of the metadata plugin if libexif is disabled.

Relates to Bug 587172 - Merge Exif data with XMP model.
parent 7a4b05d9
......@@ -1188,6 +1188,8 @@ fi
AC_SUBST(EXIF_CFLAGS)
AC_SUBST(EXIF_LIBS)
AM_CONDITIONAL(BUILD_METADATA, test "x$have_libexif" = xyes)
#################
# Check for libaa
......
......@@ -47,6 +47,10 @@ if BUILD_XJT
file_xjt = file-xjt
endif
if BUILD_METADATA
metadata = metadata
endif
SUBDIRS = \
$(script_fu) \
......@@ -74,7 +78,7 @@ SUBDIRS = \
lighting \
map-object \
maze \
metadata \
$(metadata) \
pagecurl \
$(print) \
selection-to-path \
......
......@@ -30,15 +30,11 @@
#include "xmp-model.h"
#include "xmp-schemas.h"
#include "exif-decode.h"
/* local function prototypes */
gboolean xmp_merge_from_exifbuffer (XMPModel *xmp_model,
gint32 image_ID,
GError **error);
static void exif_foreach_content_cb (ExifContent *content,
XMPModel *xmp_model);
static void exif_foreach_entry_cb (ExifEntry *entry,
......
......@@ -29,7 +29,6 @@
#include "metadata.h"
#include "xmp-encode.h"
#include "interface.h"
#include "exif-decode.h"
/* FIXME: uncomment when these are working
......@@ -438,17 +437,13 @@ run (const gchar *name,
}
else if (! strcmp (name, DECODE_EXIF_PROC))
{
#ifdef HAVE_EXIF
GError *error = NULL;
if (! xmp_merge_from_exifbuffer (xmp_model,
image_ID,
&error))
if (! xmp_merge_from_exifbuffer (xmp_model, image_ID, &error))
{
status = GIMP_PDB_EXECUTION_ERROR;
g_printerr ("\nExif to XMP merge failed.\n");
}
#endif
}
else if (! strcmp (name, GET_PROC))
{
......
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