From 8a9bcd4f54f9474c886102e252245d8de6891954 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Mon, 15 Mar 2010 18:46:27 +0000 Subject: [PATCH] packaging ethumb support for elementary. SVN revision: 47241 --- legacy/elementary/configure.ac | 36 ++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/legacy/elementary/configure.ac b/legacy/elementary/configure.ac index 25d9dcc98b..26748a7321 100644 --- a/legacy/elementary/configure.ac +++ b/legacy/elementary/configure.ac @@ -365,18 +365,30 @@ AC_SUBST(ELM_EWEATHER_DEF) ELM_ETHUMB_DEF="#undef" have_elementary_ethumb="no" -PKG_CHECK_MODULES([ELEMENTARY_ETHUMB], - [ - ethumb_client - ], - [ - AC_DEFINE(HAVE_ELEMENTARY_ETHUMB, 1, [Ethumb support for Elementary]) - have_elementary_ethumb="yes" - ELM_ETHUMB_DEF="#define" - requirement_elm="ethumb ${requirement_elm}" - ], - [have_elementary_ethumb="no"] -) +want_elementary_ethumb="auto" +AC_ARG_ENABLE([ethumb], + [AC_HELP_STRING([--disable-ethumb], [disable ethumb support. @<:@default=detect@:>@])], + [want_elementary_ethumb=$enableval], []) + +if test "x$want_elementary_ethumb" != "xno"; then + PKG_CHECK_MODULES([ELEMENTARY_ETHUMB], + [ + ethumb_client + ], + [ + AC_DEFINE(HAVE_ELEMENTARY_ETHUMB, 1, [Ethumb support for Elementary]) + have_elementary_ethumb="yes" + ELM_ETHUMB_DEF="#define" + requirement_elm="ethumb ${requirement_elm}" + ], + [have_elementary_ethumb="no"] + ) +else + have_elementary_ethumb="no" +fi +if test "x$want_elementary_ethumb" = "xyes" -a "x$have_elementary_ethumb" = "xno"; then + AC_MSG_ERROR([Ethumb support requested, but no ethumb found by pkg-config.]) +fi AC_SUBST(ELM_ETHUMB_DEF) ELM_ALLOCA_H_DEF="#undef"