make libextractor actually optional, both for GNUnet and GNUnet-taler builds

6 files changed, 41 insertions, 4 deletions

diff --git a/src/fs/gnunet-fs-gtk.h b/src/fs/gnunet-fs-gtk.h
index 78f4fb47..78d795f9 100644
--- a/src/fs/gnunet-fs-gtk.h
+++ b/src/fs/gnunet-fs-gtk.h
@@ -31,7 +31,9 @@
 #include <gnunet/gnunet_gns_service.h>
 #include <gnunet/gnunet_identity_service.h>
 #include <gnunet/gnunet_namestore_service.h>
+#if HAVE_EXTRACTOR_H
 #include <extractor.h>
+#endif
 
 
 /**
diff --git a/src/fs/gnunet-fs-gtk_common.c b/src/fs/gnunet-fs-gtk_common.c
index f4cb65ee..eba63e62 100644
--- a/src/fs/gnunet-fs-gtk_common.c
+++ b/src/fs/gnunet-fs-gtk_common.c
@@ -112,8 +112,10 @@ GNUNET_FS_GTK_add_meta_data_to_list_store (void *cls, const char *plugin_name,
                                      type,
                                      GNUNET_GTK_FS_MAIN_WINDOW_META_DATA_MC_META_FORMAT,
                                      format,
+#if HAVE_EXTRACTOR
                                      GNUNET_GTK_FS_MAIN_WINDOW_META_DATA_MC_META_TYPE_STRING,
                                      EXTRACTOR_metatype_to_string (type),
+#endif
                                      GNUNET_GTK_FS_MAIN_WINDOW_META_DATA_MC_META_VALUE,
                                      data_to_insert,
                                      -1);
@@ -237,7 +239,6 @@ GNUNET_FS_GTK_get_description_from_metadata (const struct GNUNET_CONTAINER_MetaD
                                                      EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
                                                      EXTRACTOR_METATYPE_FILENAME,
                                                      EXTRACTOR_METATYPE_DESCRIPTION,
-                                                     EXTRACTOR_METATYPE_SUMMARY,
                                                      EXTRACTOR_METATYPE_ALBUM,
                                                      EXTRACTOR_METATYPE_COMMENT,
                                                      EXTRACTOR_METATYPE_SUBJECT,
diff --git a/src/fs/gnunet-fs-gtk_common.h b/src/fs/gnunet-fs-gtk_common.h
index 2cb24d62..d90a7307 100644
--- a/src/fs/gnunet-fs-gtk_common.h
+++ b/src/fs/gnunet-fs-gtk_common.h
@@ -28,7 +28,9 @@
 
 #include "gnunet_gtk.h"
 #include <gnunet/gnunet_fs_service.h>
+#if HAVE_EXTRACTOR_H
 #include <extractor.h>
+#endif
 
 
 /**
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index bfb8645a..fc256184 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -2096,7 +2096,9 @@ get_mimetype_from_metadata (const struct GNUNET_CONTAINER_MetaData *meta)
 {
   return GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
                                                         EXTRACTOR_METATYPE_MIMETYPE,
+#if HAVE_EXTRACTOR_H
                                                         EXTRACTOR_METATYPE_FORMAT,
+#endif
                                                         -1);
 }
 
diff --git a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
index efa9a587..3102d016 100644
--- a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
@@ -293,9 +293,11 @@ static void
 change_metatypes (struct EditPublicationDialogContext *ctx, gint code)
 {
   gint pubtype_count;
+#if HAVE_EXTRACTOR
   gint max_type;
   gint i;
   GtkTreeIter iter;
+#endif
 
   /* double-check that 'code' is valid */
   for (pubtype_count = 0; NULL != types[pubtype_count]; pubtype_count++) ;
@@ -303,6 +305,7 @@ change_metatypes (struct EditPublicationDialogContext *ctx, gint code)
 
   /* clear existing selection of metatypes */
   gtk_list_store_clear (ctx->metatypes_liststore);
+#if HAVE_EXTRACTOR
   max_type = EXTRACTOR_metatype_get_max ();
   /* add new types based on selection */
   for (i = 0; types[code][i] != EXTRACTOR_METATYPE_RESERVED; i++)
@@ -320,6 +323,7 @@ change_metatypes (struct EditPublicationDialogContext *ctx, gint code)
                                          EXTRACTOR_metatype_to_description
                                          (types[code][i]),
                                          -1);
+#endif
 }
 
 
@@ -403,10 +407,12 @@ GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_edited_cb (GtkCellR
   gtk_list_store_set (ctx->meta_liststore, &iter,
                       PUBLISH_METADATA_MC_TYPE, type_id,
                       PUBLISH_METADATA_MC_FORMAT, EXTRACTOR_METAFORMAT_UTF8,
+#if HAVE_EXTRACTOR
                       PUBLISH_METADATA_MC_TYPE_NAME,
                       EXTRACTOR_metatype_to_string (type_id),
                       PUBLISH_METADATA_MC_DESCRIPTION,
                       EXTRACTOR_metatype_to_description (type_id),
+#endif
                       -1);
 }
 
@@ -920,16 +926,26 @@ static char *
 get_mime_type (const void *data,
                gsize data_size)
 {
+#if HAVE_EXTRACTOR
   char *ret;
   struct EXTRACTOR_PluginList *pl;
 
-  pl = EXTRACTOR_plugin_add (NULL, "mime", NULL, EXTRACTOR_OPTION_DEFAULT_POLICY);
+  pl = EXTRACTOR_plugin_add (NULL,
+                             "mime",
+                             NULL,
+                             EXTRACTOR_OPTION_DEFAULT_POLICY);
   if (NULL == pl)
     return NULL;
   ret = NULL;
-  EXTRACTOR_extract (pl, NULL, data, data_size, &le_callback, &ret);
+  EXTRACTOR_extract (pl,
+                     NULL,
+                     data, data_size,
+                     &le_callback, &ret);
   EXTRACTOR_plugin_remove_all (pl);
   return ret;
+#else
+  return NULL;
+#endif
 }
 
 
@@ -945,7 +961,7 @@ get_mime_type (const void *data,
  * @param bo block options (can be modified)
  * @param do_index should we index (can be modified)
  * @param client_info pointer to client context set upon creation (can be modified)
- * @return GNUNET_SYSERR (aborts after first call)
+ * @return #GNUNET_SYSERR (aborts after first call)
  */
 static int
 file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
diff --git a/src/fs/metatypes.c b/src/fs/metatypes.c
index c722aef2..1c1ae6fc 100644
--- a/src/fs/metatypes.c
+++ b/src/fs/metatypes.c
@@ -8,10 +8,12 @@ gint types_generic[] = {
   EXTRACTOR_METATYPE_SUBJECT,
   EXTRACTOR_METATYPE_DESCRIPTION,
   EXTRACTOR_METATYPE_COMMENT,
+#if HAVE_EXTRACTOR_H
   EXTRACTOR_METATYPE_COPYRIGHT,
   EXTRACTOR_METATYPE_URI,
   EXTRACTOR_METATYPE_CREATOR,
   EXTRACTOR_METATYPE_CREATION_DATE,
+#endif
   EXTRACTOR_METATYPE_RESERVED
 };
 
@@ -22,6 +24,7 @@ gint types_text[] =
   EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
   EXTRACTOR_METATYPE_TITLE,
   EXTRACTOR_METATYPE_KEYWORDS,
+#if HAVE_EXTRACTOR_H
   EXTRACTOR_METATYPE_ABSTRACT,
   EXTRACTOR_METATYPE_SUMMARY,
   EXTRACTOR_METATYPE_SUBJECT,
@@ -58,6 +61,7 @@ gint types_text[] =
   EXTRACTOR_METATYPE_TEMPLATE,
   EXTRACTOR_METATYPE_REVISION_HISTORY,
   EXTRACTOR_METATYPE_REVISION_NUMBER,
+#endif
   EXTRACTOR_METATYPE_RESERVED
 };
 
@@ -68,6 +72,7 @@ gint types_music[] =
   EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
   EXTRACTOR_METATYPE_TITLE,
   EXTRACTOR_METATYPE_ARTIST,
+#if HAVE_EXTRACTOR_H
   EXTRACTOR_METATYPE_COMPOSER,
   EXTRACTOR_METATYPE_CONDUCTOR,
   EXTRACTOR_METATYPE_ALBUM,
@@ -101,6 +106,7 @@ gint types_music[] =
   EXTRACTOR_METATYPE_ORIGINAL_PERFORMER,
   EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST,
   EXTRACTOR_METATYPE_SUBTITLE,
+#endif
   EXTRACTOR_METATYPE_RESERVED
 };
 
@@ -110,6 +116,7 @@ gint types_video[] =
   EXTRACTOR_METATYPE_MIMETYPE,
   EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
   EXTRACTOR_METATYPE_TITLE,
+#if HAVE_EXTRACTOR_H
   EXTRACTOR_METATYPE_GENRE,
   EXTRACTOR_METATYPE_KEYWORDS,
   EXTRACTOR_METATYPE_SUMMARY,
@@ -133,6 +140,7 @@ gint types_video[] =
   EXTRACTOR_METATYPE_LOCATION_COUNTRY_CODE,
   EXTRACTOR_METATYPE_CREATION_DATE,
   EXTRACTOR_METATYPE_PERFORMER,
+#endif
   EXTRACTOR_METATYPE_RESERVED
 };
 
@@ -144,6 +152,7 @@ gint types_image[] =
   EXTRACTOR_METATYPE_TITLE,
   EXTRACTOR_METATYPE_KEYWORDS,
   EXTRACTOR_METATYPE_DESCRIPTION,
+#if HAVE_EXTRACTOR_H
   EXTRACTOR_METATYPE_IMAGE_DIMENSIONS,
   EXTRACTOR_METATYPE_IMAGE_RESOLUTION,
   EXTRACTOR_METATYPE_COMMENT,
@@ -156,6 +165,7 @@ gint types_image[] =
   EXTRACTOR_METATYPE_LOCATION_COUNTRY,
   EXTRACTOR_METATYPE_LOCATION_COUNTRY_CODE,
   EXTRACTOR_METATYPE_ORGANIZATION,
+#endif
   EXTRACTOR_METATYPE_RESERVED
 };
 
@@ -167,6 +177,7 @@ gint types_namespace[] =
   EXTRACTOR_METATYPE_COMMENT,
   EXTRACTOR_METATYPE_TITLE,
   EXTRACTOR_METATYPE_DESCRIPTION,
+#if HAVE_EXTRACTOR_H
   EXTRACTOR_METATYPE_COPYRIGHT,
   EXTRACTOR_METATYPE_RIGHTS,
   EXTRACTOR_METATYPE_KEYWORDS,
@@ -179,6 +190,7 @@ gint types_namespace[] =
   EXTRACTOR_METATYPE_RIPPER,
   EXTRACTOR_METATYPE_PRODUCER,
   EXTRACTOR_METATYPE_GROUP,
+#endif
   EXTRACTOR_METATYPE_RESERVED
 };
 
@@ -188,6 +200,7 @@ gint types_software[] =
   EXTRACTOR_METATYPE_MIMETYPE,
   EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
   EXTRACTOR_METATYPE_PACKAGE_NAME,
+#if HAVE_EXTRACTOR_H
   EXTRACTOR_METATYPE_PACKAGE_VERSION,
   EXTRACTOR_METATYPE_TARGET_ARCHITECTURE,
   EXTRACTOR_METATYPE_LICENSE,
@@ -214,6 +227,7 @@ gint types_software[] =
   EXTRACTOR_METATYPE_LIBRARY_SEARCH_PATH,
   EXTRACTOR_METATYPE_LIBRARY_DEPENDENCY,
   EXTRACTOR_METATYPE_UPLOAD_PRIORITY,
+#endif
   EXTRACTOR_METATYPE_RESERVED
 };