Use pkg-config instead of enlightenment-config.

SVN revision: 36670
This commit is contained in:
Cedric BAIL 2008-10-15 12:39:06 +00:00
parent 5320f217ab
commit 61e2f6e922
2 changed files with 21 additions and 18 deletions

View File

@ -22,7 +22,7 @@ CONFIG_CLEAN_FILES = e_modules-mpdule.spec mpdule.edj
INCLUDES = -I. \
-I$(top_srcdir) \
-I$(includedir) \
@e_cflags@ @MPD_CFLAGS@
@E_CFLAGS@ @MPD_CFLAGS@
pkgdir = $(datadir)/$(MODULE_ARCH)
@ -30,7 +30,7 @@ pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \
e_mod_main.h \
e_mod_config.c
module_la_LIBADD = @e_libs@ @MPD_LIBS@
module_la_LIBADD = @E_LIBS@ @MPD_LIBS@
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h $(top_builddir)/mpdule.edj

View File

@ -32,27 +32,30 @@ AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
uname=`uname`
#
# Check EFL Libs
#
AC_PATH_PROG(EDJE_CC, "edje_cc", "", $PATH)
# Find edje_cc
PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
AC_ARG_WITH(edje-cc,
AC_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc]),
[
v=$withval;
EDJE_CC=$v
],[
EDJE_CC=$(pkg-config --variable=prefix edje)/bin/edje_cc
]
)
AC_SUBST(EDJE_CC)
AC_MSG_CHECKING([Which edje_cc to use])
AC_MSG_RESULT(${EDJE_CC})
#
# Check Enlightenment
#
AC_PATH_PROG(E_CONFIG, "enlightenment-config", "", $PATH)
e_cflags=`$E_CONFIG --cflags`
e_libs=`$E_CONFIG --libs`
e_modules=`$E_CONFIG --module-dir`
AC_SUBST(e_cflags)
AC_SUBST(e_libs)
PKG_CHECK_MODULES(E, [enlightenment])
datadir=$(pkg-config --variable=modules enlightenment)/${PACKAGE}
#
# Check MPD
#
PKG_CHECK_MODULES(MPD, libmpd)
datadir="${e_modules}/${PACKAGE}"
AC_ARG_ENABLE(homedir-install,
AS_HELP_STRING([--enable-homedir-install], [Install module in homedir]),
[ datadir="${HOME}/.e/e/modules/${PACKAGE}" ]