From a083e1cd7f50c4f7e57347aa81d80ce1a1cccc7b Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 8 Nov 2011 06:52:05 +0000 Subject: [PATCH] require remix 0.2.4 and use remix pkgconfig libdir for plugins SVN revision: 64934 --- legacy/edje/configure.ac | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/legacy/edje/configure.ac b/legacy/edje/configure.ac index 698fcb71f5..e1d7ad4956 100644 --- a/legacy/edje/configure.ac +++ b/legacy/edje/configure.ac @@ -335,19 +335,14 @@ AC_ARG_ENABLE([remix], if test "x${want_multisense}" = "xyes" -a "x$want_libremix" != "xno"; then PKG_CHECK_MODULES([REMIX], - [remix >= 0.2.3], + [remix >= 0.2.4], [ AC_DEFINE(HAVE_LIBREMIX, 1, [remix support for Edje]) have_libremix="yes" - requirement_edje="remix >= 0.2.3 ${requirement_edje}" + requirement_edje="remix >= 0.2.4 ${requirement_edje}" AC_DEFINE(__REMIX_PLUGIN__, 1, "Set to REMIX Plugin type") - REMIX_PLUGIN_DIR="${libdir}/remix" + REMIX_PLUGIN_DIR=`pkg-config --variable=libdir remix`"/remix" AC_SUBST(REMIX_PLUGIN_DIR) - if test "x${prefix}" = "xNONE"; then - REMIX_PLUGIN_DIR="${ac_default_prefix}/lib/remix" - else - REMIX_PLUGIN_DIR="${prefix}/lib/remix" - fi AC_DEFINE_UNQUOTED(REMIX_PLUGIN_DIR, "$REMIX_PLUGIN_DIR", [Set the remix plugin directory]) ], [have_libremix="no"; want_multisense="no"]