From e0ed9aef1aa10d6bd6db27e5a1795ec76433174f Mon Sep 17 00:00:00 2001 From: tilman Date: Wed, 21 Mar 2007 15:36:26 +0000 Subject: [PATCH] use pkg-config to detect ecore SVN revision: 28854 --- legacy/edje/configure.in | 12 ++++++------ legacy/edje/src/bin/Makefile.am | 1 - legacy/edje/src/lib/Makefile.am | 5 ++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/legacy/edje/configure.in b/legacy/edje/configure.in index 4bedbdd546..c111951940 100644 --- a/legacy/edje/configure.in +++ b/legacy/edje/configure.in @@ -78,12 +78,12 @@ AC_ARG_ENABLE(edje-cc, [ --disable-edje-cc disable building of edje_cc ], ] ) -AC_PATH_GENERIC(ecore, 0.9.9, - [ ], - [ AC_MSG_ERROR(Ecore isn't installed) ], -) - -PKG_CHECK_MODULES(EDJE, [evas >= 0.9.9 eet >= 0.9.10 embryo >= 0.9.1]) +PKG_CHECK_MODULES(EDJE, [ + evas >= 0.9.9 + ecore-evas >= 0.9.9 + eet >= 0.9.10 + embryo >= 0.9.1 +]) embryoincludedir=$(pkg-config --variable=embryoincludedir embryo) AC_SUBST(embryoincludedir) diff --git a/legacy/edje/src/bin/Makefile.am b/legacy/edje/src/bin/Makefile.am index a2943f45f5..2ba16f8ebb 100644 --- a/legacy/edje/src/bin/Makefile.am +++ b/legacy/edje/src/bin/Makefile.am @@ -5,7 +5,6 @@ INCLUDES = \ -I$(top_srcdir)/bin \ -I$(top_srcdir)/src/lib \ @EDJE_CFLAGS@ \ -@ECORE_CFLAGS@ \ -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \ -DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" diff --git a/legacy/edje/src/lib/Makefile.am b/legacy/edje/src/lib/Makefile.am index c3bf24161f..62641e3786 100644 --- a/legacy/edje/src/lib/Makefile.am +++ b/legacy/edje/src/lib/Makefile.am @@ -8,8 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ -@EDJE_CFLAGS@ \ -@ECORE_CFLAGS@ +@EDJE_CFLAGS@ lib_LTLIBRARIES = \ libedje.la @@ -37,7 +36,7 @@ edje_private.h \ edje_cache.c \ edje_textblock_styles.c -libedje_la_LIBADD = -lm @ECORE_LIBS@ @EDJE_LIBS@ @fnmatch_libs@ +libedje_la_LIBADD = -lm @EDJE_LIBS@ @fnmatch_libs@ libedje_la_CPPFLAGS = libedje_la_DEPENDENCIES = $(top_builddir)/config.h libedje_la_LDFLAGS = -version-info 5:0:5