Use pkg-config instead of enlightenment-config.
SVN revision: 36670
This commit is contained in:
parent
072f7f46b9
commit
8c1cf06df3
24
configure.in
24
configure.in
|
@ -27,16 +27,24 @@ AC_SUBST(MODULE_ARCH)
|
|||
AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
|
||||
AC_DEFINE_UNQUOTED(MODULE_VERSION, "$VERSION", "Module version")
|
||||
|
||||
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)
|
||||
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="${e_modules}/${PACKAGE}"
|
||||
datadir=$(pkg-config --variable=modules enlightenment)/${PACKAGE}
|
||||
AC_ARG_ENABLE(homedir-install,
|
||||
AS_HELP_STRING([--enable-homedir-install], [Install module in homedir]),
|
||||
[ datadir="${HOME}/.e/e/modules/${PACKAGE}" ]
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
INCLUDES = -I. \
|
||||
-I$(top_srcdir) \
|
||||
-I$(includedir) \
|
||||
@e_cflags@
|
||||
@E_CFLAGS@
|
||||
pkgdir = $(datadir)/$(MODULE_ARCH)
|
||||
|
||||
pkg_LTLIBRARIES = module.la
|
||||
|
@ -35,6 +35,6 @@ module_la_SOURCES = e_mod_main.c \
|
|||
photo_utils.h \
|
||||
Photo.h \
|
||||
Photo_includes.h
|
||||
module_la_LIBADD = @e_libs@
|
||||
module_la_LIBADD = @E_LIBS@
|
||||
module_la_LDFLAGS = -module -avoid-version -s
|
||||
module_la_DEPENDENCIES = $(top_builddir)/config.h
|
||||
|
|
Loading…
Reference in New Issue