summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-07-09 10:20:21 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-07-09 10:20:21 +0000
commit5c9c0852bb6a346d3baadd38d828c089cc6095db (patch)
tree3f68fc60d1083a97dc703ce07d8d3b1ebf03dd5f /legacy/emotion
parent54e0eb0c8b78b78b0189ccdab26b1040cfc57715 (diff)
update all versions in @sincs, README's and configure.ac's etc. to
reflect a unified release version, for now 1.6.99. SVN revision: 73498
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/README2
-rw-r--r--legacy/emotion/configure.ac30
2 files changed, 16 insertions, 16 deletions
diff --git a/legacy/emotion/README b/legacy/emotion/README
index 65a06385f2..b652358b15 100644
--- a/legacy/emotion/README
+++ b/legacy/emotion/README
@@ -1,4 +1,4 @@
1Emotion 1.0.0 1Emotion 1.7.0
2 2
3****************************************************************************** 3******************************************************************************
4 4
diff --git a/legacy/emotion/configure.ac b/legacy/emotion/configure.ac
index 0277df1ff0..ceea6410a8 100644
--- a/legacy/emotion/configure.ac
+++ b/legacy/emotion/configure.ac
@@ -1,7 +1,7 @@
1##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 1##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
3m4_define([v_maj], [1]) 3m4_define([v_maj], [1])
4m4_define([v_min], [0]) 4m4_define([v_min], [6])
5m4_define([v_mic], [99]) 5m4_define([v_mic], [99])
6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) 7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
@@ -108,17 +108,17 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
108 108
109### Checks for libraries 109### Checks for libraries
110 110
111requirement_emotion="ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0" 111requirement_emotion="ecore >= 1.6.99 evas >= 1.6.99 eet >= 1.6.99 eina >= 1.6.99"
112PKG_CHECK_MODULES(EMOTION, [${requirement_emotion}]) 112PKG_CHECK_MODULES(EMOTION, [${requirement_emotion}])
113 113
114 114
115if test "x${have_emotion_test}" = "xyes" ; then 115if test "x${have_emotion_test}" = "xyes" ; then
116 PKG_CHECK_MODULES(EMOTION_BIN, [eina >= 1.2.0 evas >= 1.2.0 ecore >= 1.2.0 ecore-evas >= 1.2.0 edje >= 1.2.0]) 116 PKG_CHECK_MODULES(EMOTION_BIN, [eina >= 1.6.99 evas >= 1.6.99 ecore >= 1.6.99 ecore-evas >= 1.6.99 edje >= 1.6.99])
117fi 117fi
118 118
119PKG_CHECK_MODULES(ECORE_X, [ecore-x >= 1.2.0 ecore-evas >= 1.2.0], [have_ecore_x="yes"], [have_ecore_x="no"]) 119PKG_CHECK_MODULES(ECORE_X, [ecore-x >= 1.6.99 ecore-evas >= 1.6.99], [have_ecore_x="yes"], [have_ecore_x="no"])
120 120
121PKG_CHECK_MODULES(ECORE_FB, [ecore-fb >= 1.2.0], [have_ecore_fb="yes"], [have_ecore_fb="no"]) 121PKG_CHECK_MODULES(ECORE_FB, [ecore-fb >= 1.6.99], [have_ecore_fb="yes"], [have_ecore_fb="no"])
122 122
123if test "x${have_ecore_x}" = "xyes" ; then 123if test "x${have_ecore_x}" = "xyes" ; then
124 AC_DEFINE(EMOTION_HAVE_ECORE_X, 1, [Define to 1 if Ecore_X is enabled]) 124 AC_DEFINE(EMOTION_HAVE_ECORE_X, 1, [Define to 1 if Ecore_X is enabled])
@@ -128,27 +128,27 @@ if test "x${have_ecore_fb}" = "xyes" ; then
128 AC_DEFINE(EMOTION_HAVE_ECORE_FB, 1, [Define to 1 if Ecore_Fb is enabled]) 128 AC_DEFINE(EMOTION_HAVE_ECORE_FB, 1, [Define to 1 if Ecore_Fb is enabled])
129fi 129fi
130 130
131PKG_CHECK_EXISTS([evas-software-x11 >= 1.2.0], [AC_DEFINE(HAVE_EVAS_SOFWARE_X11, 1, [Evas Software Xlib Engine Support])]) 131PKG_CHECK_EXISTS([evas-software-x11 >= 1.6.99], [AC_DEFINE(HAVE_EVAS_SOFWARE_X11, 1, [Evas Software Xlib Engine Support])])
132 132
133PKG_CHECK_EXISTS([evas-xrender-x11 >= 1.2.0], [AC_DEFINE(HAVE_EVAS_XRENDER_X11, 1, [Evas Software Xlib Engine Support])]) 133PKG_CHECK_EXISTS([evas-xrender-x11 >= 1.6.99], [AC_DEFINE(HAVE_EVAS_XRENDER_X11, 1, [Evas Software Xlib Engine Support])])
134 134
135PKG_CHECK_EXISTS([evas-opengl-x11 >= 1.2.0], [AC_DEFINE(HAVE_EVAS_OPENGL_X11, 1, [Evas OpenGL Xlib Engine Support])]) 135PKG_CHECK_EXISTS([evas-opengl-x11 >= 1.6.99], [AC_DEFINE(HAVE_EVAS_OPENGL_X11, 1, [Evas OpenGL Xlib Engine Support])])
136 136
137PKG_CHECK_EXISTS([evas-fb >= 1.2.0], [AC_DEFINE(HAVE_EVAS_FB, 1, [Evas Framebuffer Engine Support])]) 137PKG_CHECK_EXISTS([evas-fb >= 1.6.99], [AC_DEFINE(HAVE_EVAS_FB, 1, [Evas Framebuffer Engine Support])])
138 138
139EFL_EDJE_EXTERNAL([have_edje_external="yes"], [have_edje_external="no"]) 139EFL_EDJE_EXTERNAL([have_edje_external="yes"], [have_edje_external="no"])
140 140
141PKG_CHECK_MODULES(EEZE, [eeze >= 1.0.99], [have_eeze="yes"], [have_eeze="no"]) 141PKG_CHECK_MODULES(EEZE, [eeze >= 1.6.99], [have_eeze="yes"], [have_eeze="no"])
142 142
143if test "x${have_eeze}" = "xyes"; then 143if test "x${have_eeze}" = "xyes"; then
144 AC_DEFINE(EMOTION_HAVE_EEZE, 1, [Define to 1 if Eeze is available]) 144 AC_DEFINE(EMOTION_HAVE_EEZE, 1, [Define to 1 if Eeze is available])
145 requirement_emotion="${requirement_emotion} eeze >= 1.0.99" 145 requirement_emotion="${requirement_emotion} eeze >= 1.6.99"
146fi 146fi
147 147
148PKG_CHECK_MODULES([EIO], [eio >= 1.0.0], [have_eio="yes"], [have_eio="no"]) 148PKG_CHECK_MODULES([EIO], [eio >= 1.6.99], [have_eio="yes"], [have_eio="no"])
149if test "x${have_eio}" = "xyes"; then 149if test "x${have_eio}" = "xyes"; then
150 AC_DEFINE(HAVE_EIO, 1, [Use EIO for asynchronous file access]) 150 AC_DEFINE(HAVE_EIO, 1, [Use EIO for asynchronous file access])
151 requirement_emotion="eio >= 1.0.0 ${requirement_emotion}" 151 requirement_emotion="eio >= 1.6.99 ${requirement_emotion}"
152fi 152fi
153 153
154AM_CONDITIONAL([HAVE_EIO], [test "x${have_eio}" = "xyes"]) 154AM_CONDITIONAL([HAVE_EIO], [test "x${have_eio}" = "xyes"])
@@ -169,11 +169,11 @@ AC_ARG_ENABLE([ecore-x],
169 169
170if ! test "x$want_ecore_x" = "xno" ; then 170if ! test "x$want_ecore_x" = "xno" ; then
171 PKG_CHECK_MODULES([ECORE_X], 171 PKG_CHECK_MODULES([ECORE_X],
172 [ecore-x >= 1.2.0], 172 [ecore-x >= 1.6.99],
173 [ 173 [
174 AC_DEFINE(HAVE_ECORE_X, 1, [X11 support for Ecore]) 174 AC_DEFINE(HAVE_ECORE_X, 1, [X11 support for Ecore])
175 have_ecore_x="yes" 175 have_ecore_x="yes"
176 requirement_elm="ecore-x >= 1.2.0 ${requirement_elm}" 176 requirement_elm="ecore-x >= 1.6.99 ${requirement_elm}"
177 ], 177 ],
178 [have_ecore_x="no"] 178 [have_ecore_x="no"]
179 ) 179 )