Correctly use pkg-config and now enlightenment-config is really deprecated !

SVN revision: 36668
master
Cedric BAIL 14 years ago
parent 9cf030636d
commit 2733bc5269
  1. 2
      Makefile.am
  2. 18
      configure.in

@ -1,4 +1,4 @@
MAINTAINERCLEANFILES = Makefile.in
MAINTAINERCLEANFILES = Makefile.in forecasts.edj
SUBDIRS = images po

@ -29,11 +29,25 @@ MODULE_ARCH="$host_os-$host_cpu"
AC_SUBST(MODULE_ARCH)
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})
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}" ]

Loading…
Cancel
Save