forked from enlightenment/efl
switched edje over to pkg-config. almost. ecore is still detected by ecore-config, cause that one's gonna be pain.
SVN revision: 28842
This commit is contained in:
parent
3b036332c6
commit
d39dbeefa2
|
@ -78,27 +78,15 @@ AC_ARG_ENABLE(edje-cc, [ --disable-edje-cc disable building of edje_cc ],
|
|||
]
|
||||
)
|
||||
|
||||
AC_PATH_GENERIC(evas, 0.9.9,
|
||||
[ ],
|
||||
[ AC_MSG_ERROR(Evas isn't installed) ],
|
||||
)
|
||||
|
||||
AC_PATH_GENERIC(ecore, 0.9.9,
|
||||
[ ],
|
||||
[ AC_MSG_ERROR(Ecore isn't installed) ],
|
||||
)
|
||||
|
||||
AC_PATH_GENERIC(eet, 0.9.10,
|
||||
[ ],
|
||||
[ AC_MSG_ERROR(Eet isn't installed) ],
|
||||
)
|
||||
PKG_CHECK_MODULES(EDJE, [evas >= 0.9.9 eet >= 0.9.10 embryo >= 0.9.1])
|
||||
|
||||
AC_PATH_GENERIC(embryo, 0.9.1,
|
||||
[ ],
|
||||
[ AC_MSG_ERROR(Embryo isn't installed) ],
|
||||
)
|
||||
EMBRYO_PREFIX=`$EMBRYO_CONFIG --prefix`
|
||||
AC_DEFINE_UNQUOTED(EMBRYO_PREFIX, "${EMBRYO_PREFIX}", [Embryo prefix])
|
||||
embryoincludedir=$(pkg-config --variable=embryoincludedir embryo)
|
||||
AC_SUBST(embryoincludedir)
|
||||
|
||||
AC_MSG_CHECKING([for location of Vim data files])
|
||||
install_vim="yes";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
FILES = edje.inc
|
||||
|
||||
incdir = $(pkgdatadir)/include
|
||||
incdir = $(embryoincludedir)
|
||||
inc_DATA = $(FILES)
|
||||
|
||||
EXTRA_DIST = $(FILES)
|
||||
|
|
|
@ -42,11 +42,11 @@ while test $# -gt 0; do
|
|||
if test @prefix@/include != /usr/include ; then
|
||||
includes="-I@prefix@/include"
|
||||
fi
|
||||
echo $includes @EVAS_CFLAGS@
|
||||
echo $includes @EDJE_CFLAGS@
|
||||
;;
|
||||
--libs)
|
||||
libdirs=-L@libdir@
|
||||
echo $libdirs -ledje @EVAS_LIBS@ @ECORE_LIBS@ @EET_LIBS@ @EMBRYO_LIBS@ @fnmatch_libs@ -lm
|
||||
echo $libdirs -ledje @EDJE_LIBS@ @ECORE_LIBS@ @fnmatch_libs@ -lm
|
||||
;;
|
||||
--datadir)
|
||||
echo @prefix@/share/edje
|
||||
|
|
|
@ -4,10 +4,8 @@ INCLUDES = \
|
|||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/bin \
|
||||
-I$(top_srcdir)/src/lib \
|
||||
@EET_CFLAGS@ \
|
||||
@EVAS_CFLAGS@ \
|
||||
@EDJE_CFLAGS@ \
|
||||
@ECORE_CFLAGS@ \
|
||||
@EMBRYO_CFLAGS@ \
|
||||
-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
|
||||
-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
|
||||
-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\"
|
||||
|
|
|
@ -8,9 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
INCLUDES = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_builddir) \
|
||||
@EET_CFLAGS@ \
|
||||
@EMBRYO_CFLAGS@ \
|
||||
@EVAS_CFLAGS@ \
|
||||
@EDJE_CFLAGS@ \
|
||||
@ECORE_CFLAGS@
|
||||
|
||||
lib_LTLIBRARIES = \
|
||||
|
@ -39,7 +37,7 @@ edje_private.h \
|
|||
edje_cache.c \
|
||||
edje_textblock_styles.c
|
||||
|
||||
libedje_la_LIBADD = -lm @EVAS_LIBS@ @ECORE_LIBS@ @EET_LIBS@ @EMBRYO_LIBS@ @fnmatch_libs@
|
||||
libedje_la_LIBADD = -lm @ECORE_LIBS@ @EDJE_LIBS@ @fnmatch_libs@
|
||||
libedje_la_CPPFLAGS =
|
||||
libedje_la_DEPENDENCIES = $(top_builddir)/config.h
|
||||
libedje_la_LDFLAGS = -version-info 5:0:5
|
||||
|
|
Loading…
Reference in New Issue