diff --git a/legacy/edje/configure.in b/legacy/edje/configure.in
index d208cc78d0..9152ab5d00 100644
--- a/legacy/edje/configure.in
+++ b/legacy/edje/configure.in
@@ -136,20 +136,6 @@ if test "x$have_fb_only" = "xyes"; then
fi
AC_SUBST(edje_def)
-EDJE_CC_PRG=""
-EDJE_DECC_PRG=""
-if test "x$have_edje_cc" = "xyes"; then
- AM_CONDITIONAL(BUILD_EDJE_CC, true)
- AM_CONDITIONAL(BUILD_EDJE_DECC, true)
- EDJE_CC_PRG="edje_cc"
- EDJE_DECC_PRG="edje_decc"
-else
- AM_CONDITIONAL(BUILD_EDJE_CC, false)
- AM_CONDITIONAL(BUILD_EDJE_DECC, false)
-fi
-AC_SUBST(EDJE_CC_PRG)
-AC_SUBST(EDJE_DECC_PRG)
-
AC_ARG_WITH(eet,
[ --with-eet=DIR use eet in
],
[CFLAGS="$CFLAGS -I$withval/include"
@@ -170,13 +156,18 @@ if test "x$have_edje_cc" = "xyes"; then
AC_ARG_WITH(imlib2,
[ --with-imlib2=DIR use imlib2 in ],
[CFLAGS="$CFLAGS -I$withval/include"
- LIBS="-L$withval/lib $LIBS"])
-
- AC_PATH_GENERIC(imlib2, ,
- AC_DEFINE(HAVE_IMLIB, 1, [Define to 1 if you have Imlib2]), [
- have_imlib2="no"
+ LIBS="-L$withval/lib $LIBS"
+ IMLIB2_CONFIG="$withval/bin/imlib2-config"])
+ if [ test -z "$IMLIB2_CONFIG" ]; then IMLIB2_CONFIG="imlib2-config"; fi
+ imlib2_libs=`$IMLIB2_CONFIG --libs`
+ imlib2_cflags=`$IMLIB2_CONFIG --cflags`
+ V=`$IMLIB2_CONFIG --version`
+ if [ test -z "$V" ]; then
+ have_edje_cc="no";
AC_MSG_WARN(Cannot find imlib2: Is imlib2-config in path?)
- ])
+ else
+ AC_DEFINE(HAVE_IMLIB, 1, [Define to 1 if you have Imlib2])
+ fi
fi
AC_ARG_WITH(evas,
@@ -235,6 +226,26 @@ else
AC_MSG_RESULT([Not found, EDC syntax file will not be installed])
fi
+EDJE_CC_PRG=""
+EDJE_DECC_PRG=""
+if test "x$have_edje_cc" = "xyes"; then
+ AM_CONDITIONAL(BUILD_EDJE_CC, true)
+ AM_CONDITIONAL(BUILD_EDJE_DECC, true)
+ EDJE_CC_PRG="edje_cc"
+ EDJE_DECC_PRG="edje_decc"
+ EDJE_RECC_PRG="edje_recc"
+ IMLIB2_CFLAGS=$imlib2_cflags
+ IMLIB2_LIBS=$imlib2_libs
+else
+ AM_CONDITIONAL(BUILD_EDJE_CC, false)
+ AM_CONDITIONAL(BUILD_EDJE_DECC, false)
+fi
+AC_SUBST(EDJE_CC_PRG)
+AC_SUBST(EDJE_DECC_PRG)
+AC_SUBST(EDJE_RECC_PRG)
+AC_SUBST(IMLIB2_CFLAGS)
+AC_SUBST(IMLIB2_LIBS)
+
AC_SUBST(vimdir)
AC_OUTPUT([
diff --git a/legacy/edje/src/bin/Makefile.am b/legacy/edje/src/bin/Makefile.am
index 37228863c6..bc24c1f1a9 100644
--- a/legacy/edje/src/bin/Makefile.am
+++ b/legacy/edje/src/bin/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = \
@IMLIB2_CFLAGS@
bin_SCRIPTS = \
-edje_recc
+@EDJE_RECC_PRG@
bin_PROGRAMS = \
edje \
@@ -87,4 +87,4 @@ edje_ls_LDFLAGS =
edje_ls_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
-EXTRA_DIST = edje_recc
+EXTRA_SCRIPTS = edje_recc
diff --git a/legacy/edje/src/lib/Makefile.am b/legacy/edje/src/lib/Makefile.am
index 37c4d811f0..92bb0ccaaa 100644
--- a/legacy/edje/src/lib/Makefile.am
+++ b/legacy/edje/src/lib/Makefile.am
@@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
-LDFLAGS =
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \