summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2011-01-30 09:50:48 +0000
committerCarsten Haitzler <raster@rasterman.com>2011-01-30 09:50:48 +0000
commit6e070e2935eec8ef258e367a1c25f81994edf7b5 (patch)
tree1461a6b100d9c95f2607511a580efe295dcf61f4 /legacy/emotion
parentb5df3392df0fbea65867e2b6f0b9d2e707325577 (diff)
tnx vtorri -> cleaner module thing. more minimal changes.
SVN revision: 56399
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/configure.ac9
1 files changed, 4 insertions, 5 deletions
diff --git a/legacy/emotion/configure.ac b/legacy/emotion/configure.ac
index 96b80916dd..60bc4e153f 100644
--- a/legacy/emotion/configure.ac
+++ b/legacy/emotion/configure.ac
@@ -53,8 +53,10 @@ 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
56### Needed information 58### Needed information
57EDJE_VERSION=`pkg-config edje --modversion | awk -F . '{printf("%s.0.0", $1);}'` 59EDJE_VERSION=`$PKG_CONFIG edje --modversion | awk -F . '{printf("%s.0.0", \$1);}'`
58 60
59want_vlc="no" 61want_vlc="no"
60case "$host_os" in 62case "$host_os" in
@@ -95,9 +97,6 @@ AC_SUBST(edje_cc)
95### Checks for programs 97### Checks for programs
96AC_PROG_CC 98AC_PROG_CC
97 99
98# pkg-config
99PKG_PROG_PKG_CONFIG
100
101# Check whether pkg-config supports Requires.private 100# Check whether pkg-config supports Requires.private
102if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then 101if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
103 pkgconfig_requires_private="Requires.private" 102 pkgconfig_requires_private="Requires.private"
@@ -117,7 +116,7 @@ PKG_CHECK_MODULES(EMOTION, [eina >= 1.0.0 evas >= 1.0.0 ecore >= 1.0.0])
117requirement_emotion="ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0" 116requirement_emotion="ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0"
118 117
119if test "x${have_emotion_test}" = "xyes" ; then 118if test "x${have_emotion_test}" = "xyes" ; then
120 PKG_CHECK_MODULES(EMOTION_BIN, [evas >= 1.0.0 ecore >= 1.0.0 ecore-evas >= 1.0.0 edje >= ${EDJE_VERSION}]) 119 PKG_CHECK_MODULES(EMOTION_BIN, [evas >= 1.0.0 ecore >= 1.0.0 ecore-evas >= 1.0.0 edje >= 1.0.0])
121fi 120fi
122 121
123PKG_CHECK_MODULES(ECORE_X, [ecore-x >= 1.0.0], [have_ecore_x="yes"], [have_ecore_x="no"]) 122PKG_CHECK_MODULES(ECORE_X, [ecore-x >= 1.0.0], [have_ecore_x="yes"], [have_ecore_x="no"])