forked from enlightenment/efl
set MODULE_EDJE when edje external module is enabled and when edje is found
SVN revision: 56402
This commit is contained in:
parent
fd424475c2
commit
05d52f18e4
|
@ -53,19 +53,13 @@ AC_SUBST(release_info)
|
|||
VMAJ=v_maj
|
||||
AC_SUBST(VMAJ)
|
||||
|
||||
# pkg-config
|
||||
PKG_PROG_PKG_CONFIG
|
||||
EDJE_VERSION=`$PKG_CONFIG edje --modversion | awk -F . '{printf("%s.0.0", \$1);}'`
|
||||
|
||||
want_vlc="no"
|
||||
case "$host_os" in
|
||||
mingw* | cegcc*)
|
||||
MODULE_EDJE="$host_os-$host_cpu"
|
||||
want_xine="no"
|
||||
want_gstreamer="yes"
|
||||
;;
|
||||
*)
|
||||
MODULE_EDJE="$host_os-$host_cpu-${EDJE_VERSION}"
|
||||
want_xine="yes"
|
||||
want_gstreamer="yes"
|
||||
;;
|
||||
|
@ -96,6 +90,9 @@ AC_SUBST(edje_cc)
|
|||
### Checks for programs
|
||||
AC_PROG_CC
|
||||
|
||||
# pkg-config
|
||||
PKG_PROG_PKG_CONFIG
|
||||
|
||||
# Check whether pkg-config supports Requires.private
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
|
||||
pkgconfig_requires_private="Requires.private"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
dnl Copyright (C) 2010 Vincent Torri <vtorri at univ-evry dot fr>
|
||||
dnl Copyright (C) 2010-2011 Vincent Torri <vtorri at univ-evry dot fr>
|
||||
dnl That code is public domain and can be freely used or copied.
|
||||
|
||||
dnl Macro that check if edje external should be enabled or not
|
||||
|
@ -29,7 +29,7 @@ AC_MSG_RESULT([${_efl_want_edje_external}])
|
|||
_efl_enable_edje_external="no"
|
||||
if ! test "x${_efl_want_edje_external}" = "xno" ; then
|
||||
PKG_CHECK_MODULES([EDJE_EXTERNAL],
|
||||
[edje],
|
||||
[edje >= 1.0.0],
|
||||
[_efl_enable_edje_external="yes"],
|
||||
[_efl_enable_edje_external="no"])
|
||||
fi
|
||||
|
@ -41,6 +41,14 @@ if test "x${_efl_want_edje_external}" = "xyes" && test "x${_efl_enable_edje_exte
|
|||
AC_MSG_ERROR([Edje EXTERNAL support requested, but Edje not found by pkg-config.])
|
||||
fi
|
||||
|
||||
if test "x${_efl_enable_edje_external}" = "xyes" ; then
|
||||
EDJE_VERSION=`${PKG_CONFIG} edje --modversion | awk -F . '{printf("%s.0.0", $[]1);}'`
|
||||
MODULE_EDJE="$host_os-$host_cpu-${EDJE_VERSION}"
|
||||
AC_DEFINE_UNQUOTED(MODULE_EDJE, "$MODULE_EDJE", "Edje module architecture")
|
||||
fi
|
||||
|
||||
AC_SUBST(MODULE_EDJE)
|
||||
|
||||
AM_CONDITIONAL([ENABLE_EDJE_EXTERNAL], [test "x${_efl_enable_edje_external}" = "xyes"])
|
||||
|
||||
AS_IF([test "x${_efl_enable_edje_external}" = "xyes"], [$1], [$2])
|
||||
|
|
Loading…
Reference in New Issue