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

8 files changed, 127 insertions, 28 deletions

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 8ac42c18d..736339aab 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -51,7 +51,12 @@ libgnunetfs_la_SOURCES = \
 libgnunetfs_la_LIBADD = \
   $(top_builddir)/src/datastore/libgnunetdatastore.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(GN_LIBINTL) $(XLIB) $(LIBGCRYPT_LIBS) -lunistring -lextractor
+  $(GN_LIBINTL) $(XLIB) $(LIBGCRYPT_LIBS) -lunistring
+
+if HAVE_LIBEXTRACTOR
+libgnunetfs_la_LIBADD += \
+  -lextractor
+endif
 
 libgnunetfs_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
@@ -92,9 +97,13 @@ gnunet_directory_SOURCES = \
 gnunet_directory_LDADD = \
   libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  -lextractor \
   $(GN_LIBINTL)
 
+if HAVE_LIBEXTRACTOR
+gnunet_directory_LDADD += \
+  -lextractor
+endif
+
 gnunet_fs_profiler_SOURCES = \
  gnunet-fs-profiler.c
 gnunet_fs_profiler_LDADD = \
@@ -107,9 +116,13 @@ gnunet_fs_SOURCES = \
 gnunet_fs_LDADD = \
   libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  -lextractor \
   $(GN_LIBINTL)
 
+if HAVE_LIBEXTRACTOR
+gnunet_fs_LDADD += \
+  -lextractor
+endif
+
 gnunet_download_SOURCES =  \
  gnunet-download.c
 gnunet_download_LDADD =  \
@@ -123,31 +136,48 @@ gnunet_publish_LDADD =  \
  $(top_builddir)/src/identity/libgnunetidentity.la \
  libgnunetfs.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- -lextractor \
  $(GN_LIBINTL)
 
+if HAVE_LIBEXTRACTOR
+gnunet_publish_LDADD += \
+  -lextractor
+endif
+
 gnunet_auto_share_SOURCES =  \
  gnunet-auto-share.c
 gnunet_auto_share_LDADD =  \
  $(top_builddir)/src/util/libgnunetutil.la \
- -lextractor \
  $(GN_LIBINTL)
 
+if HAVE_LIBEXTRACTOR
+gnunet_auto_share_LDADD += \
+  -lextractor
+endif
+
 gnunet_helper_fs_publish_SOURCES =  \
  gnunet-helper-fs-publish.c
 gnunet_helper_fs_publish_LDADD =  \
  $(top_builddir)/src/util/libgnunetutil.la \
- -lextractor \
  $(GN_LIBINTL)
 
+if HAVE_LIBEXTRACTOR
+gnunet_helper_fs_publish_LDADD += \
+  -lextractor
+endif
+
 gnunet_search_SOURCES = \
  gnunet-search.c
 gnunet_search_LDADD = \
   libgnunetfs.la \
   $(top_builddir)/src/util/libgnunetutil.la \
- -lextractor \
   $(GN_LIBINTL)
 
+if HAVE_LIBEXTRACTOR
+gnunet_search_LDADD += \
+  -lextractor
+endif
+
+
 gnunet_daemon_fsprofiler_SOURCES =  \
  gnunet-daemon-fsprofiler.c
 gnunet_daemon_fsprofiler_LDADD = \
@@ -243,9 +273,13 @@ test_plugin_block_fs_LDADD = \
 
 if HAVE_PYTHON
 check_SCRIPTS = \
- test_gnunet_fs_psd.py \
  test_gnunet_fs_rec.py \
  test_gnunet_fs_idx.py
+
+if HAVE_LIBEXTRACTOR
+check_SCRIPTS += \
+ test_gnunet_fs_psd.py
+endif
 endif
 
 if ENABLE_MONKEY
@@ -289,10 +323,15 @@ endif
 test_fs_directory_SOURCES = \
  test_fs_directory.c
 test_fs_directory_LDADD = \
-  -lextractor \
   libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
+if HAVE_LIBEXTRACTOR
+test_fs_directory_LDADD += \
+  -lextractor
+endif
+
+
 test_fs_download_SOURCES = \
  test_fs_download.c
 test_fs_download_LDADD = \
@@ -324,10 +363,15 @@ test_fs_download_persistence_LDADD = \
 test_fs_file_information_SOURCES = \
  test_fs_file_information.c
 test_fs_file_information_LDADD = \
-  -lextractor \
   libgnunetfs.la  \
   $(top_builddir)/src/util/libgnunetutil.la
 
+if HAVE_LIBEXTRACTOR
+test_fs_file_information_LDADD += \
+  -lextractor
+endif
+
+
 test_fs_getopt_SOURCES = \
  test_fs_getopt.c
 test_fs_getopt_LDADD = \
diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c
index ffe2d191d..b787ca8fd 100644
--- a/src/fs/fs_file_information.c
+++ b/src/fs/fs_file_information.c
@@ -24,7 +24,9 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#if HAVE_EXTRACTOR_H
 #include <extractor.h>
+#endif
 #include "gnunet_fs_service.h"
 #include "fs_api.h"
 #include "fs_tree.h"
diff --git a/src/fs/fs_getopt.c b/src/fs/fs_getopt.c
index d2ee34a94..86fc9578c 100644
--- a/src/fs/fs_getopt.c
+++ b/src/fs/fs_getopt.c
@@ -118,17 +118,20 @@ GNUNET_FS_getopt_set_keywords (struct GNUNET_GETOPT_CommandLineProcessorContext
  * @param scls must be of type "struct GNUNET_MetaData **"
  * @param option name of the option (typically 'k')
  * @param value command line argument given
- * @return GNUNET_OK on success
+ * @return #GNUNET_OK on success
  */
 int
-GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext
-                               *ctx, void *scls, const char *option,
+GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
+                               void *scls,
+                               const char *option,
                                const char *value)
 {
   struct GNUNET_CONTAINER_MetaData **mm = scls;
+#if HAVE_EXTRACTOR_H
   enum EXTRACTOR_MetaType type;
   const char *typename;
   const char *typename_i18n;
+#endif
   struct GNUNET_CONTAINER_MetaData *meta;
   char *tmp;
 
@@ -144,7 +147,7 @@ GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext
    */
   /*tmp = GNUNET_STRINGS_to_utf8 (value, strlen (value), locale_charset ());*/
   tmp = GNUNET_strdup (value);
-
+#if HAVE_EXTRACTOR_H
   type = EXTRACTOR_metatype_get_max ();
   while (type > 0)
   {
@@ -181,7 +184,9 @@ GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext
       break;
     }
   }
-  if (tmp != NULL)
+#endif
+
+  if (NULL != tmp)
   {
     GNUNET_CONTAINER_meta_data_insert (meta, "<gnunet>",
                                        EXTRACTOR_METATYPE_UNKNOWN,
diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c
index 536766abb..c06e1aca2 100644
--- a/src/fs/gnunet-directory.c
+++ b/src/fs/gnunet-directory.c
@@ -36,13 +36,17 @@ static int ret;
  * @param format format of data
  * @param data_mime_type mime type of data
  * @param data value of the meta data
- * @param data_size number of bytes in data
+ * @param data_size number of bytes in @a data
  * @return always 0 (to continue iterating)
  */
 static int
-item_printer (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type,
-              enum EXTRACTOR_MetaFormat format, const char *data_mime_type,
-              const char *data, size_t data_size)
+item_printer (void *cls,
+              const char *plugin_name,
+              enum EXTRACTOR_MetaType type,
+              enum EXTRACTOR_MetaFormat format,
+              const char *data_mime_type,
+              const char *data,
+              size_t data_size)
 {
   if (type == EXTRACTOR_METATYPE_GNUNET_FULL_DATA)
   {
@@ -55,9 +59,16 @@ item_printer (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type,
     return 0;
   if (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME)
     return 0;
+#if HAVE_LIBEXTRACTOR
   printf ("\t%20s: %s\n",
           dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN,
-                    EXTRACTOR_metatype_to_string (type)), data);
+                    EXTRACTOR_metatype_to_string (type)),
+    data);
+#else
+  printf ("\t%20d: %s\n",
+          type,
+          data);
+#endif
   return 0;
 }
 
diff --git a/src/fs/gnunet-helper-fs-publish.c b/src/fs/gnunet-helper-fs-publish.c
index 2e63b12a8..6c2c76fe9 100644
--- a/src/fs/gnunet-helper-fs-publish.c
+++ b/src/fs/gnunet-helper-fs-publish.c
@@ -82,10 +82,12 @@ struct ScanTreeNode
 };
 
 
+#if HAVE_LIBEXTRACTOR
 /**
  * List of libextractor plugins to use for extracting.
  */
 static struct EXTRACTOR_PluginList *plugins;
+#endif
 
 /**
  * File descriptor we use for IPC with the parent.
@@ -93,6 +95,7 @@ static struct EXTRACTOR_PluginList *plugins;
 static int output_stream;
 
 
+#if HAVE_LIBEXTRACTOR
 /**
  * Add meta data that libextractor finds to our meta data
  * container.
@@ -111,9 +114,13 @@ static int output_stream;
  * @return always 0 to continue extracting
  */
 static int
-add_to_md (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type,
-           enum EXTRACTOR_MetaFormat format, const char *data_mime_type,
-           const char *data, size_t data_len)
+add_to_md (void *cls,
+           const char *plugin_name,
+           enum EXTRACTOR_MetaType type,
+           enum EXTRACTOR_MetaFormat format,
+           const char *data_mime_type,
+           const char *data,
+           size_t data_len)
 {
   struct GNUNET_CONTAINER_MetaData *md = cls;
 
@@ -134,6 +141,7 @@ add_to_md (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type,
   }
   return 0;
 }
+#endif
 
 
 /**
@@ -151,7 +159,7 @@ free_tree (struct ScanTreeNode *tree)
   if (NULL != tree->parent)
     GNUNET_CONTAINER_DLL_remove (tree->parent->children_head,
                                  tree->parent->children_tail,
-                                 tree);                         
+                                 tree);
   GNUNET_free (tree->filename);
   GNUNET_free (tree);
 }
@@ -383,7 +391,13 @@ extract_files (struct ScanTreeNode *item)
 
   /* this is the expensive operation, *afterwards* we'll check for aborts */
   meta = GNUNET_CONTAINER_meta_data_create ();
-  EXTRACTOR_extract (plugins, item->filename, NULL, 0, &add_to_md, meta);
+#if HAVE_LIBEXTRACTOR
+  EXTRACTOR_extract (plugins,
+                     item->filename,
+                     NULL, 0,
+                     &add_to_md,
+                     meta);
+#endif
   slen = strlen (item->filename) + 1;
   size = GNUNET_CONTAINER_meta_data_get_serialized_size (meta);
   if (-1 == size)
@@ -525,10 +539,12 @@ main (int argc,
   if ( (NULL == ex) ||
        (0 != strcmp (ex, "-")) )
   {
+#if HAVE_LIBEXTRACTOR
     plugins = EXTRACTOR_plugin_add_defaults (EXTRACTOR_OPTION_DEFAULT_POLICY);
     if (NULL != ex)
       plugins = EXTRACTOR_plugin_add_config (plugins, ex,
                                              EXTRACTOR_OPTION_DEFAULT_POLICY);
+#endif
   }
 
   /* scan tree to find out how much work there is to be done */
@@ -536,7 +552,9 @@ main (int argc,
                                     &root))
   {
     (void) write_message (GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_ERROR, NULL, 0);
+#if HAVE_LIBEXTRACTOR
     EXTRACTOR_plugin_remove_all (plugins);
+#endif
 #if WINDOWS
     GNUNET_free ((void*) argv);
 #endif
@@ -547,7 +565,9 @@ main (int argc,
   if (GNUNET_OK !=
       write_message (GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_COUNTING_DONE, NULL, 0))
   {
+#if HAVE_LIBEXTRACTOR
     EXTRACTOR_plugin_remove_all (plugins);
+#endif
 #if WINDOWS
     GNUNET_free ((void*) argv);
 #endif
@@ -560,7 +580,9 @@ main (int argc,
     {
       (void) write_message (GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_ERROR, NULL, 0);
       free_tree (root);
+#if HAVE_LIBEXTRACTOR
       EXTRACTOR_plugin_remove_all (plugins);
+#endif
 #if WINDOWS
       GNUNET_free ((void*) argv);
 #endif
@@ -570,7 +592,9 @@ main (int argc,
   }
   /* enable "clean" shutdown by telling parent that we are done */
   (void) write_message (GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_FINISHED, NULL, 0);
+#if HAVE_LIBEXTRACTOR
   EXTRACTOR_plugin_remove_all (plugins);
+#endif
 #if WINDOWS
   GNUNET_free ((void*) argv);
 #endif
@@ -578,4 +602,3 @@ main (int argc,
 }
 
 /* end of gnunet-helper-fs-publish.c */
-
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index b213218e4..7844acd96 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -348,7 +348,11 @@ meta_printer (void *cls,
     return 0;
   if (EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME == type)
     return 0;
+#if HAVE_LIBEXTRACTOR
   FPRINTF (stdout, "\t%s - %s\n", EXTRACTOR_metatype_to_string (type), data);
+#else
+  FPRINTF (stdout, "\t%d - %s\n", type, data);
+#endif
   return 0;
 }
 
diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c
index 395fb9ffe..9065922e1 100644
--- a/src/fs/gnunet-search.c
+++ b/src/fs/gnunet-search.c
@@ -82,9 +82,15 @@ item_printer (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type,
     return 0;
   if (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME)
     return 0;
+#if HAVE_LIBEXTRACTOR
   printf ("\t%20s: %s\n",
           dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN,
                     EXTRACTOR_metatype_to_string (type)), data);
+#else
+  printf ("\t%20d: %s\n",
+          type,
+          data);
+#endif
   return 0;
 }
 
diff --git a/src/fs/test_fs_directory.c b/src/fs/test_fs_directory.c
index bdbaf906f..4960b8922 100644
--- a/src/fs/test_fs_directory.c
+++ b/src/fs/test_fs_directory.c
@@ -17,15 +17,15 @@
      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
      Boston, MA 02111-1307, USA.
 */
-
 /**
  * @file fs/test_fs_directory.c
  * @brief Test for fs_directory.c
  * @author Christian Grothoff
  */
-
 #include "platform.h"
+#if HAVE_EXTRACTOR_H
 #include <extractor.h>
+#endif
 #include "gnunet_util_lib.h"
 #include "gnunet_fs_service.h"
 #include "fs_api.h"
@@ -99,7 +99,11 @@ testDirectory (unsigned int i)
     {
       GNUNET_snprintf (txt, sizeof (txt), "%u -- %u\n", p, q);
       GNUNET_CONTAINER_meta_data_insert (mds[p], "<test>",
+#if HAVE_EXTRACTOR_H
                                          q % EXTRACTOR_metatype_get_max (),
+#else
+                                         q % 128,
+#endif
                                          EXTRACTOR_METAFORMAT_UTF8,
                                          "text/plain", txt, strlen (txt) + 1);
     }