Switch to pkg-config instead of enlightenment-config.

SVN revision: 36688
enlightenment-0.18
Cedric BAIL 14 years ago
parent ab2dd491cb
commit fef74ffdb4
  1. 2
      Makefile.am
  2. 25
      configure.in
  3. 6
      src/Makefile.am

@ -25,4 +25,4 @@ clean-local:
rm -rf e-module-diskio.edj module.desktop *~
uninstall:
rm -rf $(DESTDIR)$(datadir)

@ -30,16 +30,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])
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)
datadir=$(pkg-config --variable=modules enlightenment)/${PACKAGE}
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}" ]

@ -3,15 +3,15 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir) \
-I$(includedir) \
@e_cflags@
@E_CFLAGS@
pkgdir = $(datadir)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.h \
e_mod_main.c \
e_mod_config.c
module_la_LIBADD = @e_libs@
module_la_LIBADD = @E_LIBS@
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h

Loading…
Cancel
Save