From ce2f237b3fd29cb9691b1b7bfc2524fac717ea52 Mon Sep 17 00:00:00 2001 From: antognolli Date: Tue, 2 Aug 2011 19:24:53 +0000 Subject: [PATCH] ethumb/exif - Disable libexif module if it is not present in the system. This way it won't break the build, but just disable support for libexif. git-svn-id: https://svn.enlightenment.org/svn/e/trunk/ethumb@62018 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.ac | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index c08646a..39873ad 100644 --- a/configure.ac +++ b/configure.ac @@ -171,29 +171,18 @@ if $USE_MODULE_ETHUMBD ; then ] ) fi -AC_ARG_ENABLE([libexif], - [AC_HELP_STRING([--disable-libexif], [disable libexif support. Default is enabled.])], - [ - if test "x${enableval}" = "xyes" ; then - _iv_enable_libexif="yes" - else - _iv_enable_libexif="no" - fi - ], - [_iv_enable_libexif="yes"] -) - -AC_MSG_CHECKING([whether libexif is built]) -AC_MSG_RESULT([${_iv_enable_libexif}]) - -HAVE_LIBEXIF="no" - -if test "x${_iv_enable_libexif}" = "xyes" ; then - AC_ETH_CHECK_PKG(LIBEXIF, libexif) -fi -AM_CONDITIONAL(HAVE_LIBEXIF, test $HAVE_LIBEXIF = yes) -AC_SUBST(HAVE_LIBEXIF) + +AM_CONDITIONAL(HAVE_LIBEXIF, false) +define([CHECK_MODULE_LIBEXIF], +[ + AC_ETH_CHECK_PKG(LIBEXIF, libexif, [], [HAVE_LIBEXIF=false]) +]) + +AC_ETH_OPTIONAL_MODULE([libexif], true, [CHECK_MODULE_LIBEXIF]) +if $USE_MODULE_LIBEXIF ; then + requirement_ethumb="$requirement_ethumb libexif" +fi AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( -- 2.7.4