summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2011-01-30 10:03:05 +0000
committerVincent Torri <vincent.torri@gmail.com>2011-01-30 10:03:05 +0000
commit05d52f18e40a0de872c45a48f2fafceb1e2bd2d0 (patch)
tree5f4b903bd9acb5d2cd40a2869fc7138394da6315 /legacy/emotion
parentfd424475c28c76a9b39c31ff4610fee56cddd5b4 (diff)
set MODULE_EDJE when edje external module is enabled and when edje is found
SVN revision: 56402
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/configure.ac9
-rw-r--r--legacy/emotion/m4/efl_edje_external.m412
2 files changed, 13 insertions, 8 deletions
diff --git a/legacy/emotion/configure.ac b/legacy/emotion/configure.ac
index 5f94b6f9db..c4fd975e5e 100644
--- a/legacy/emotion/configure.ac
+++ b/legacy/emotion/configure.ac
@@ -53,19 +53,13 @@ AC_SUBST(release_info)
53VMAJ=v_maj 53VMAJ=v_maj
54AC_SUBST(VMAJ) 54AC_SUBST(VMAJ)
55 55
56# pkg-config
57PKG_PROG_PKG_CONFIG
58EDJE_VERSION=`$PKG_CONFIG edje --modversion | awk -F . '{printf("%s.0.0", \$1);}'`
59
60want_vlc="no" 56want_vlc="no"
61case "$host_os" in 57case "$host_os" in
62 mingw* | cegcc*) 58 mingw* | cegcc*)
63 MODULE_EDJE="$host_os-$host_cpu"
64 want_xine="no" 59 want_xine="no"
65 want_gstreamer="yes" 60 want_gstreamer="yes"
66 ;; 61 ;;
67 *) 62 *)
68 MODULE_EDJE="$host_os-$host_cpu-${EDJE_VERSION}"
69 want_xine="yes" 63 want_xine="yes"
70 want_gstreamer="yes" 64 want_gstreamer="yes"
71 ;; 65 ;;
@@ -96,6 +90,9 @@ AC_SUBST(edje_cc)
96### Checks for programs 90### Checks for programs
97AC_PROG_CC 91AC_PROG_CC
98 92
93# pkg-config
94PKG_PROG_PKG_CONFIG
95
99# Check whether pkg-config supports Requires.private 96# Check whether pkg-config supports Requires.private
100if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then 97if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
101 pkgconfig_requires_private="Requires.private" 98 pkgconfig_requires_private="Requires.private"
diff --git a/legacy/emotion/m4/efl_edje_external.m4 b/legacy/emotion/m4/efl_edje_external.m4
index 35b74457de..703f83ed00 100644
--- a/legacy/emotion/m4/efl_edje_external.m4
+++ b/legacy/emotion/m4/efl_edje_external.m4
@@ -1,4 +1,4 @@
1dnl Copyright (C) 2010 Vincent Torri <vtorri at univ-evry dot fr> 1dnl Copyright (C) 2010-2011 Vincent Torri <vtorri at univ-evry dot fr>
2dnl That code is public domain and can be freely used or copied. 2dnl That code is public domain and can be freely used or copied.
3 3
4dnl Macro that check if edje external should be enabled or not 4dnl Macro that check if edje external should be enabled or not
@@ -29,7 +29,7 @@ AC_MSG_RESULT([${_efl_want_edje_external}])
29_efl_enable_edje_external="no" 29_efl_enable_edje_external="no"
30if ! test "x${_efl_want_edje_external}" = "xno" ; then 30if ! test "x${_efl_want_edje_external}" = "xno" ; then
31 PKG_CHECK_MODULES([EDJE_EXTERNAL], 31 PKG_CHECK_MODULES([EDJE_EXTERNAL],
32 [edje], 32 [edje >= 1.0.0],
33 [_efl_enable_edje_external="yes"], 33 [_efl_enable_edje_external="yes"],
34 [_efl_enable_edje_external="no"]) 34 [_efl_enable_edje_external="no"])
35fi 35fi
@@ -41,6 +41,14 @@ if test "x${_efl_want_edje_external}" = "xyes" && test "x${_efl_enable_edje_exte
41 AC_MSG_ERROR([Edje EXTERNAL support requested, but Edje not found by pkg-config.]) 41 AC_MSG_ERROR([Edje EXTERNAL support requested, but Edje not found by pkg-config.])
42fi 42fi
43 43
44if test "x${_efl_enable_edje_external}" = "xyes" ; then
45 EDJE_VERSION=`${PKG_CONFIG} edje --modversion | awk -F . '{printf("%s.0.0", $[]1);}'`
46 MODULE_EDJE="$host_os-$host_cpu-${EDJE_VERSION}"
47 AC_DEFINE_UNQUOTED(MODULE_EDJE, "$MODULE_EDJE", "Edje module architecture")
48fi
49
50AC_SUBST(MODULE_EDJE)
51
44AM_CONDITIONAL([ENABLE_EDJE_EXTERNAL], [test "x${_efl_enable_edje_external}" = "xyes"]) 52AM_CONDITIONAL([ENABLE_EDJE_EXTERNAL], [test "x${_efl_enable_edje_external}" = "xyes"])
45 53
46AS_IF([test "x${_efl_enable_edje_external}" = "xyes"], [$1], [$2]) 54AS_IF([test "x${_efl_enable_edje_external}" = "xyes"], [$1], [$2])