commit 6b6b11e3598c79c015a010fae5a35cee000a8dd8
parent 7e93648c27b64f01990b7f4ff10ce48d2b397c39
Author: Christian Grothoff <christian@grothoff.org>
Date: Wed, 13 Jan 2010 15:34:11 +0000
updates
Diffstat:
12 files changed, 77 insertions(+), 107 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -221,6 +221,26 @@ AC_CHECK_LIB(poppler, _ZTI9MemStream,
AM_CONDITIONAL(HAVE_POPPLER, false))],
AM_CONDITIONAL(HAVE_POPPLER, false))
+AC_MSG_CHECKING(for ImageFactory::iptcData in -lexiv2)
+AC_LANG_PUSH(C++)
+SAVED_LDFLAGS=$LDFLAGS
+LDFLAGS="$LDFLAGS -lexiv2"
+AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[#include <iostream>
+#include <exiv2/exif.hpp>
+#include <exiv2/image.hpp>
+#include <exiv2/futils.hpp>]],
+ [[Exiv2::Image *foo = NULL; foo->iptcData(); ]])],
+ [AC_MSG_RESULT(yes)
+ AM_CONDITIONAL(HAVE_EXIV2, true)
+ AC_DEFINE(HAVE_EXIV2,1,[Have exifData in libexiv2])],
+ [AC_MSG_RESULT(no)
+ AM_CONDITIONAL(HAVE_EXIV2, false)])
+LDFLAGS=$SAVED_LDFLAGS
+AC_LANG_POP(C++)
+
+
+
AC_MSG_CHECKING(for getPDFMajorVersion in -lpoppler)
AC_LANG_PUSH(C++)
SAVED_LDFLAGS=$LDFLAGS
@@ -329,7 +349,6 @@ else
fi
# check for all C++ dependencies...
-exiv2=0
qt=0
qt4=0
@@ -423,22 +442,6 @@ QT_LDFLAGS=$LDFLAGS
LDFLAGS=$SAVED_LDFLAGS
CPPFLAGS=$SAVED_CPPFLAGS
-exiv2=1
-AC_MSG_CHECKING([whether to enable exiv2 extractor])
-AC_ARG_ENABLE(exiv2,
- [AC_HELP_STRING([--enable-exiv2],[Enable exiv2 support])
- AC_HELP_STRING([--disable-exiv2],[Disable exiv2 support])],
- [case "$enableval" in
- no) AC_MSG_RESULT(no)
- exiv2=0
- ;;
- *) AC_MSG_RESULT(yes)
- exiv2=1
- ;;
- esac],
- [ AC_MSG_RESULT(yes)
- exiv2=1])
-AC_LANG_POP([C++])
# end C++ checks
fi
@@ -465,11 +468,10 @@ fi
AM_CONDITIONAL(HAVE_QT_SVG, test x$qt_svg != x0)
AM_CONDITIONAL(HAVE_QT_SVG4, test x$qt_svg4 != x0)
-AM_CONDITIONAL(HAVE_EXIV2, test x$exiv2 != x0)
-AC_DEFINE_UNQUOTED([HAVE_EXIV2], $exiv2, [We use EXIV2])
-
ABI_GSF
+AM_CONDITIONAL(WITH_GSF, test "x$have_gsf" = "xtrue")
+
# produce new line
echo ""
AC_CHECK_LIB(gsf-1, gsf_init, AC_DEFINE(HAVE_GSF_INIT,1,[gsf_init supported]))
@@ -572,7 +574,7 @@ then
AC_MSG_ERROR([FATAL: zlib not found (headers not installed?)])
fi
-if test "x$exiv2" = "x0"
+if test "x$HAVE_EXIV2" = "x#"
then
AC_MSG_NOTICE([NOTICE: exiv2 disabled])
fi
diff --git a/po/de.po b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.14\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-01-13 15:34+0100\n"
+"POT-Creation-Date: 2010-01-13 15:36+0100\n"
"PO-Revision-Date: 2007-03-23 23:16+0100\n"
"Last-Translator: Nils Durner <durner@gnunet.org>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -985,29 +985,29 @@ msgstr ""
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binär)\n"
-#: src/main/extract.c:604 src/main/extract.c:614
+#: src/main/extract.c:603 src/main/extract.c:613
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:641
+#: src/main/extract.c:640
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr ""
"Sie müssen ein Argument für die Option »%s« angeben (Option wird ignoriert).\n"
-#: src/main/extract.c:706
+#: src/main/extract.c:705
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr "Verwenden Sie --help, um eine Liste aller Optionen zu sehen.\n"
-#: src/main/extract.c:738
+#: src/main/extract.c:737
#, c-format
msgid "%% BiBTeX file\n"
msgstr "%% BibTeX Datei\n"
-#: src/main/extract.c:745
+#: src/main/extract.c:744
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Schlüsserwörter für die Datei %s:\n"
diff --git a/po/fr.po b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor-0.5.20a\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-01-13 15:34+0100\n"
+"POT-Creation-Date: 2010-01-13 15:36+0100\n"
"PO-Revision-Date: 2008-08-24 19:08+0100\n"
"Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -1007,28 +1007,28 @@ msgstr ""
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binaire)\n"
-#: src/main/extract.c:604 src/main/extract.c:614
+#: src/main/extract.c:603 src/main/extract.c:613
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:641
+#: src/main/extract.c:640
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr "Vous devez préciser un argument pour l'option `%s' (option ignorée).\n"
-#: src/main/extract.c:706
+#: src/main/extract.c:705
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr "Utilisez --help pour obtenir une liste d'options.\n"
-#: src/main/extract.c:738
+#: src/main/extract.c:737
#, c-format
msgid "%% BiBTeX file\n"
msgstr "%% fichier BiBTeX\n"
-#: src/main/extract.c:745
+#: src/main/extract.c:744
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Mots-clés pour le fichier %s:\n"
diff --git a/po/ga.po b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.20\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-01-13 15:34+0100\n"
+"POT-Creation-Date: 2010-01-13 15:36+0100\n"
"PO-Revision-Date: 2008-03-21 20:46-0700\n"
"Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -983,29 +983,29 @@ msgstr ""
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (dnrtha)\n"
-#: src/main/extract.c:604 src/main/extract.c:614
+#: src/main/extract.c:603 src/main/extract.c:613
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:641
+#: src/main/extract.c:640
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr ""
"N mr duit argint a thabhairt i ndiaidh na rogha `%s' ( ligean thart).\n"
-#: src/main/extract.c:706
+#: src/main/extract.c:705
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr "Bain sid as '--help' le haghaidh nos m roghanna.\n"
-#: src/main/extract.c:738
+#: src/main/extract.c:737
#, c-format
msgid "%% BiBTeX file\n"
msgstr "%% Comhad BiBTeX\n"
-#: src/main/extract.c:745
+#: src/main/extract.c:744
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Lorgfhocail do chomhad %s:\n"
diff --git a/po/libextractor.pot b/po/libextractor.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-01-13 15:34+0100\n"
+"POT-Creation-Date: 2010-01-13 15:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -971,28 +971,28 @@ msgstr ""
msgid "%s - (binary, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:604 src/main/extract.c:614
+#: src/main/extract.c:603 src/main/extract.c:613
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:641
+#: src/main/extract.c:640
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr ""
-#: src/main/extract.c:706
+#: src/main/extract.c:705
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr ""
-#: src/main/extract.c:738
+#: src/main/extract.c:737
#, c-format
msgid "%% BiBTeX file\n"
msgstr ""
-#: src/main/extract.c:745
+#: src/main/extract.c:744
#, c-format
msgid "Keywords for file %s:\n"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor-0.5.20a\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-01-13 15:34+0100\n"
+"POT-Creation-Date: 2010-01-13 15:36+0100\n"
"PO-Revision-Date: 2009-03-08 16:59+0100\n"
"Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -985,28 +985,28 @@ msgstr ""
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binair)\n"
-#: src/main/extract.c:604 src/main/extract.c:614
+#: src/main/extract.c:603 src/main/extract.c:613
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:641
+#: src/main/extract.c:640
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr "Optie '%s' vereist een argument -- optie is genegeerd.\n"
-#: src/main/extract.c:706
+#: src/main/extract.c:705
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr "Gebruik '--help' voor een lijst met mogelijke opties.\n"
-#: src/main/extract.c:738
+#: src/main/extract.c:737
#, c-format
msgid "%% BiBTeX file\n"
msgstr "%% BiBTeX-bestand\n"
-#: src/main/extract.c:745
+#: src/main/extract.c:744
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Trefwoorden voor bestand %s:\n"
diff --git a/po/ro.po b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.3\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-01-13 15:34+0100\n"
+"POT-Creation-Date: 2010-01-13 15:36+0100\n"
"PO-Revision-Date: 2005-08-16 12:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -986,29 +986,29 @@ msgstr ""
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binar)\n"
-#: src/main/extract.c:604 src/main/extract.c:614
+#: src/main/extract.c:603 src/main/extract.c:613
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:641
+#: src/main/extract.c:640
#, fuzzy, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr ""
"Trebuie s specificai un argument pentru opiunea '%s' (opiune ignorat).\n"
-#: src/main/extract.c:706
+#: src/main/extract.c:705
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr "Folosii --help pentru a obine o list de opiuni.\n"
-#: src/main/extract.c:738
+#: src/main/extract.c:737
#, c-format
msgid "%% BiBTeX file\n"
msgstr "%% BiBTeX file\n"
-#: src/main/extract.c:745
+#: src/main/extract.c:744
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Cuvinte cheie pentru fiier %s:\n"
diff --git a/po/rw.po b/po/rw.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.4.2\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-01-13 15:34+0100\n"
+"POT-Creation-Date: 2010-01-13 15:36+0100\n"
"PO-Revision-Date: 2005-04-04 10:55-0700\n"
"Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -1050,28 +1050,28 @@ msgstr ""
msgid "%s - (binary, %u bytes)\n"
msgstr "%s-(Nyabibiri"
-#: src/main/extract.c:604 src/main/extract.c:614
+#: src/main/extract.c:603 src/main/extract.c:613
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:641
+#: src/main/extract.c:640
#, fuzzy, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr "kugirango i Ihitamo Ihitamo"
-#: src/main/extract.c:706
+#: src/main/extract.c:705
#, fuzzy, c-format
msgid "Use --help to get a list of options.\n"
msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
-#: src/main/extract.c:738
+#: src/main/extract.c:737
#, c-format
msgid "%% BiBTeX file\n"
msgstr ""
-#: src/main/extract.c:745
+#: src/main/extract.c:744
#, fuzzy, c-format
msgid "Keywords for file %s:\n"
msgstr "kugirango IDOSIYE"
diff --git a/po/sv.po b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.22\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-01-13 15:34+0100\n"
+"POT-Creation-Date: 2010-01-13 15:36+0100\n"
"PO-Revision-Date: 2009-05-12 17:45+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -979,28 +979,28 @@ msgstr ""
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binär)\n"
-#: src/main/extract.c:604 src/main/extract.c:614
+#: src/main/extract.c:603 src/main/extract.c:613
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:641
+#: src/main/extract.c:640
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr "Du måste ange ett argument för flaggan \"%s\" (flagga ignoreras).\n"
-#: src/main/extract.c:706
+#: src/main/extract.c:705
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr "Använd --help för att få en lista på flaggor.\n"
-#: src/main/extract.c:738
+#: src/main/extract.c:737
#, c-format
msgid "%% BiBTeX file\n"
msgstr "%% BiBTeX-fil\n"
-#: src/main/extract.c:745
+#: src/main/extract.c:744
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Nyckelord för filen %s:\n"
diff --git a/po/vi.po b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.22\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-01-13 15:34+0100\n"
+"POT-Creation-Date: 2010-01-13 15:36+0100\n"
"PO-Revision-Date: 2009-05-12 22:57+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -986,29 +986,29 @@ msgstr ""
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (nhị phân)\n"
-#: src/main/extract.c:604 src/main/extract.c:614
+#: src/main/extract.c:603 src/main/extract.c:613
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:641
+#: src/main/extract.c:640
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr "Bạn phải ghi rõ một đối số cho tùy chọn « %s » (tùy chọn bị bỏ qua).\n"
-#: src/main/extract.c:706
+#: src/main/extract.c:705
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr ""
"Hãy sử dụng lệnh « --help » (trợ giúp) để xem một danh sách các tùy chọn.\n"
-#: src/main/extract.c:738
+#: src/main/extract.c:737
#, c-format
msgid "%% BiBTeX file\n"
msgstr "%% tập tin BiBTeX\n"
-#: src/main/extract.c:745
+#: src/main/extract.c:744
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Từ khoá cho tập tin %s:\n"
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
@@ -46,10 +46,6 @@ extract_SOURCES = \
getopt1.c
-
-
-ELIBDIR = $(libdir)
-
LDADD = \
$(top_builddir)/src/main/libextractor.la
@@ -65,12 +61,6 @@ check_PROGRAMS = \
test_plugin_loading \
test_plugin_load_multi
-nocheck = \
- mt_plugintest1 \
- mt_plugintest2 \
- mt_extracttest1 \
- mt_extracttest2
-
TESTS = $(check_PROGRAMS) $(fuzz_tests)
test_trivial_SOURCES = \
@@ -82,24 +72,3 @@ test_plugin_loading_SOURCES = \
test_plugin_load_multi_SOURCES = \
test_plugin_load_multi.c
-mt_plugintest1_SOURCES = \
- mt_plugintest1.c
-mt_plugintest1_LDFLAGS = \
- -lpthread
-
-mt_plugintest2_SOURCES = \
- mt_plugintest2.c
-mt_plugintest2_LDFLAGS = \
- -lpthread
-
-mt_extracttest1_SOURCES = \
- mt_extracttest1.c
-mt_extracttest1_LDFLAGS = \
- -lpthread
-
-mt_extracttest2_SOURCES = \
- mt_extracttest2.c
-mt_extracttest2_LDFLAGS = \
- -lpthread
-
-
diff --git a/src/main/extract.c b/src/main/extract.c
@@ -554,7 +554,6 @@ main (int argc, char *argv[])
int defaultAll = YES;
int bibtex = NO;
int grepfriendly = NO;
- char * name;
int ret = 0;
EXTRACTOR_MetaDataProcessor processor = NULL;
