summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac32
1 files changed, 29 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 1a1ea7e..945f6d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,10 @@ AC_PROG_LN_S
AC_PROG_MAKE_SET
AM_PROG_CC_C_O
+dnl Propagate constants
+AC_DEFINE_UNQUOTED(APP_BUILD_DATE, ["$APP_BUILD_DATE"], [build date])
+AC_DEFINE_UNQUOTED(APP_COPYRIGHT_STRING, ["$APP_COPYRIGHT_STRING"], [copyright string])
+
dnl Check for pkgconfig first
AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -60,11 +64,22 @@ WARN_CFLAGS="-Wall"
AC_SUBST(WARN_CFLAGS)
+dnl **************************************************
+dnl *** Check for EXIV2 version ***
+dnl **************************************************
+AC_MSG_CHECKING(for EXIV2 - version >= $EXIV2_REQUIRED)
+exiv2_config_major_version=`$PKG_CONFIG --modversion exiv2 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+exiv2_config_minor_version=`$PKG_CONFIG --modversion exiv2 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+exiv2_config_micro_version=`$PKG_CONFIG --modversion exiv2 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+AC_MSG_RESULT(yes (version $exiv2_config_major_version.$exiv2_config_minor_version.$exiv2_config_micro_version))
+
dnl **************************************************
dnl *** Check for new exiv2 thumbnailing API ***
dnl **************************************************
-
AC_DEFUN([EXIV2_HAVE_NEW_THUMBNAILING_API],
[AC_CACHE_CHECK(for new Exiv2::ExifThumb API,
ac_cv_exiv2_have_new_exifthumb,
@@ -90,8 +105,19 @@ fi
EXIV2_HAVE_NEW_THUMBNAILING_API
-AC_DEFINE_UNQUOTED(APP_BUILD_DATE, ["$APP_BUILD_DATE"], [build date])
-AC_DEFINE_UNQUOTED(APP_COPYRIGHT_STRING, ["$APP_COPYRIGHT_STRING"], [copyright string])
+
+dnl **************************************************
+dnl *** Check for MagickWand version ***
+dnl **************************************************
+AC_MSG_CHECKING(for MagickWand)
+magick_wand_config_major_version=`$PKG_CONFIG --modversion MagickWand | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+magick_wand_config_minor_version=`$PKG_CONFIG --modversion MagickWand | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+magick_wand_config_micro_version=`$PKG_CONFIG --modversion MagickWand | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+AC_MSG_RESULT(yes (version $magick_wand_config_major_version.$magick_wand_config_minor_version.$magick_wand_config_micro_version))
+