summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-18 14:17:13 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-18 14:17:13 +0000
commit1503ecb655b31d27ff0ce528ba2af98798dfb14a (patch)
treee78676513081f4b225bba41a8cd9a582d9dcc777 /configure.ac
parent9430d8930ebb52c4c235416147c9eabcd5d6ef13 (diff)
elm: use edje's provided module arch for externals.
SVN revision: 82978
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac21
1 files changed, 16 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 8d207f7bf..b685b2197 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,23 +75,34 @@ AC_SUBST(VMIN)
75 75
76# pkg-config 76# pkg-config
77PKG_PROG_PKG_CONFIG 77PKG_PROG_PKG_CONFIG
78EDJE_VERSION=`$PKG_CONFIG edje --modversion | awk -F . '{printf("%s.%s.%s", $1, $2, $3);}'` 78
79MODULE_EDJE=`pkg-config --variable=module_arch edje`
80if test -z "$MODULE_EDJE"; then
81 # Backward compatibility -- TODO: remove when EFL 1.8 is released.
82 EDJE_VERSION=`$PKG_CONFIG edje --modversion | awk -F . '{printf("%s.%s.%s", $1, $2, $3);}'`
83 case "$host_os" in
84 mingw32ce* | cegcc*)
85 MODULE_EDJE="$host_os-$host_cpu"
86 ;;
87 *)
88 MODULE_EDJE="$host_os-$host_cpu-${EDJE_VERSION}"
89 ;;
90 esac
91fi
92AC_SUBST(MODULE_EDJE)
93AC_DEFINE_UNQUOTED(MODULE_EDJE, "$MODULE_EDJE", "Edje module architecture")
79 94
80case "$host_os" in 95case "$host_os" in
81 mingw32ce* | cegcc*) 96 mingw32ce* | cegcc*)
82 MODULE_ARCH="$host_os-$host_cpu" 97 MODULE_ARCH="$host_os-$host_cpu"
83 MODULE_EDJE="$host_os-$host_cpu"
84 ;; 98 ;;
85 *) 99 *)
86 MODULE_ARCH="$host_os-$host_cpu-v_maj.v_min.v_mic" 100 MODULE_ARCH="$host_os-$host_cpu-v_maj.v_min.v_mic"
87 MODULE_EDJE="$host_os-$host_cpu-${EDJE_VERSION}"
88 ;; 101 ;;
89esac 102esac
90AC_SUBST(release_info) 103AC_SUBST(release_info)
91AC_SUBST(MODULE_ARCH) 104AC_SUBST(MODULE_ARCH)
92AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") 105AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
93AC_SUBST(MODULE_EDJE)
94AC_DEFINE_UNQUOTED(MODULE_EDJE, "$MODULE_EDJE", "Edje module architecture")
95 106
96EFL_SHARED_EXTENSION="${shrext_cmds}" 107EFL_SHARED_EXTENSION="${shrext_cmds}"
97AC_DEFINE_UNQUOTED(EFL_SHARED_EXTENSION, "${EFL_SHARED_EXTENSION}", "Shared extension") 108AC_DEFINE_UNQUOTED(EFL_SHARED_EXTENSION, "${EFL_SHARED_EXTENSION}", "Shared extension")