Use pkg-config instead of enlightenment-config.
SVN revision: 36670
This commit is contained in:
parent
15e5463fa0
commit
98a64c88a1
|
@ -24,7 +24,7 @@ EXTRA_DIST = $(files_DATA) \
|
||||||
INCLUDES = -I. \
|
INCLUDES = -I. \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
-I$(includedir) \
|
-I$(includedir) \
|
||||||
@e_cflags@
|
@E_CFLAGS@
|
||||||
|
|
||||||
pkgdir = $(datadir)/$(MODULE_ARCH)
|
pkgdir = $(datadir)/$(MODULE_ARCH)
|
||||||
pkg_LTLIBRARIES = module.la
|
pkg_LTLIBRARIES = module.la
|
||||||
|
@ -41,8 +41,8 @@ module_la_SOURCES += imap2.h imap2.c
|
||||||
else
|
else
|
||||||
module_la_SOURCES += imap.h imap.c
|
module_la_SOURCES += imap.h imap.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
module_la_LIBADD = @e_libs@
|
module_la_LIBADD = @E_LIBS@
|
||||||
module_la_LDFLAGS = -module -avoid-version
|
module_la_LDFLAGS = -module -avoid-version
|
||||||
module_la_DEPENDENCIES = $(top_builddir)/config.h $(top_builddir)/mail.edj
|
module_la_DEPENDENCIES = $(top_builddir)/config.h $(top_builddir)/mail.edj
|
||||||
|
|
||||||
|
|
24
configure.in
24
configure.in
|
@ -26,16 +26,24 @@ MODULE_ARCH="$host_os-$host_cpu"
|
||||||
AC_SUBST(MODULE_ARCH)
|
AC_SUBST(MODULE_ARCH)
|
||||||
AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
|
AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
|
||||||
|
|
||||||
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})
|
||||||
|
|
||||||
AC_PATH_PROG(E_CONFIG, "enlightenment-config", "", $PATH)
|
PKG_CHECK_MODULES(E, [enlightenment])
|
||||||
e_cflags=`$E_CONFIG --cflags`
|
|
||||||
e_libs=`$E_CONFIG --libs`
|
|
||||||
e_modules=`$E_CONFIG --module-dir`
|
|
||||||
AC_SUBST(e_cflags)
|
|
||||||
AC_SUBST(e_libs)
|
|
||||||
|
|
||||||
datadir="${e_modules}/${PACKAGE}"
|
datadir=$(pkg-config --variable=modules enlightenment)/${PACKAGE}
|
||||||
AC_ARG_ENABLE(homedir-install,
|
AC_ARG_ENABLE(homedir-install,
|
||||||
AS_HELP_STRING([--enable-homedir-install], [Install module in homedir]),
|
AS_HELP_STRING([--enable-homedir-install], [Install module in homedir]),
|
||||||
[ datadir="${HOME}/.e/e/modules/${PACKAGE}" ]
|
[ datadir="${HOME}/.e/e/modules/${PACKAGE}" ]
|
||||||
|
|
Loading…
Reference in New Issue