dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use pkg-config to detect ecore 

SVN revision: 28854
This commit is contained in:
tilman 2007-03-21 15:36:26 +00:00 committed by tilman
parent 40ca2f85d8
commit e0ed9aef1a
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/edje/configure.in
View File

@ -78,12 +78,12 @@ AC_ARG_ENABLE(edje-cc, [ --disable-edje-cc disable building of edje_cc ],
] ]
) )
AC_PATH_GENERIC(ecore, 0.9.9, PKG_CHECK_MODULES(EDJE, [
[ ], evas >= 0.9.9
[ AC_MSG_ERROR(Ecore isn't installed) ], ecore-evas >= 0.9.9
) eet >= 0.9.10
embryo >= 0.9.1
PKG_CHECK_MODULES(EDJE, [evas >= 0.9.9 eet >= 0.9.10 embryo >= 0.9.1]) ])
embryoincludedir=$(pkg-config --variable=embryoincludedir embryo) embryoincludedir=$(pkg-config --variable=embryoincludedir embryo)
AC_SUBST(embryoincludedir) AC_SUBST(embryoincludedir)

1
legacy/edje/src/bin/Makefile.am
View File

@ -5,7 +5,6 @@ INCLUDES = \
-I$(top_srcdir)/bin \ -I$(top_srcdir)/bin \
-I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib \
@EDJE_CFLAGS@ \ @EDJE_CFLAGS@ \
@ECORE_CFLAGS@ \
-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \ -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" -DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\"

5
legacy/edje/src/lib/Makefile.am
View File

@ -8,8 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) \ -I$(top_builddir) \
@EDJE_CFLAGS@ \ @EDJE_CFLAGS@
@ECORE_CFLAGS@
lib_LTLIBRARIES = \ lib_LTLIBRARIES = \
libedje.la libedje.la
@ -37,7 +36,7 @@ edje_private.h \
edje_cache.c \ edje_cache.c \
edje_textblock_styles.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_CPPFLAGS =
libedje_la_DEPENDENCIES = $(top_builddir)/config.h libedje_la_DEPENDENCIES = $(top_builddir)/config.h
libedje_la_LDFLAGS = -version-info 5:0:5 libedje_la_LDFLAGS = -version-info 5:0:5