jpeg-utils: Port to gexiv2

The gexiv2 library is just a GObject wrapper around exiv2 library. It's
a healthy project that continually keeps up with exiv2 API changes.
Adopted by e.g. GIMP there's certain guarantee of future maintenance.

This allows us to get rid of C++ code, making it more readable and
predictable.

1 files changed, 11 insertions, 37 deletions

diff --git a/configure.ac b/configure.ac
index adeac72..e99d6be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,14 +12,10 @@ AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz tar-ustar])
 AM_CONFIG_HEADER(config.h)
 
 GLIB_REQUIRED=2.16.0
-EXIV2_REQUIRED=0.17
 
 AC_C_CONST
 AC_SEARCH_LIBS([strerror],[cposix])
 AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_CXX
-AC_PROG_CXXCPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
@@ -67,39 +63,6 @@ PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
 
 
 dnl **************************************************
-dnl *** Check for EXIV2 version                    ***
-dnl **************************************************
-PKG_CHECK_MODULES(EXIV2, exiv2 >= $EXIV2_REQUIRED)
-AC_MSG_CHECKING(for EXIV2 - version >= $EXIV2_REQUIRED)
-exiv2_version=`$PKG_CONFIG --modversion exiv2`
-AC_MSG_RESULT(yes (version $exiv2_version))
-
-dnl Check for new exiv2 thumbnailing API
-AC_DEFUN([EXIV2_HAVE_NEW_THUMBNAILING_API],
-[AC_CACHE_CHECK(for new Exiv2::ExifThumb API,
-ac_cv_exiv2_have_new_exifthumb,
-[AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
-
-void test () {
-    Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open("");
-    Exiv2::ExifData &exifData = image->exifData();
-    Exiv2::ExifThumb exifThumb(image->exifData());
-    exifThumb.erase();
-}
-]], [[return 0;]])],[ac_cv_exiv2_have_new_exifthumb=yes],[ac_cv_exiv2_have_new_exifthumb=no])
- AC_LANG_POP([])
-])
-if test "$ac_cv_exiv2_have_new_exifthumb" = yes; then
-  AC_DEFINE(HAVE_EXIFTHUMB,1,[new Exiv2::ExifThumb API])
-fi
-])
-
-EXIV2_HAVE_NEW_THUMBNAILING_API
-
-
-dnl **************************************************
 dnl *** Check for ImageMagick                      ***
 dnl **************************************************
 PKG_CHECK_MODULES(MAGICKWAND, MagickWand)
@@ -114,6 +77,17 @@ PKG_CHECK_EXISTS([MagickWand >= 7],
                            [Define to 1 if ImageMagick 7 is available]))
 
 
+dnl **************************************************
+dnl *** Check for gexiv2 library                   ***
+dnl **************************************************
+PKG_CHECK_MODULES(GEXIV2, gexiv2)
+
+dnl Check for gexiv2 version
+AC_MSG_CHECKING(for gexiv2)
+gexiv2_version=`$PKG_CONFIG --modversion gexiv2`
+AC_MSG_RESULT(yes (version $gexiv2_version))
+
+
 
 
 AC_CONFIG_FILES([