summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Felipe Strano Moraes <lfelipe@profusion.mobi>2013-01-04 14:54:07 +0000
committerLuis Felipe Strano Moraes <lfelipe@profusion.mobi>2013-01-04 14:54:07 +0000
commitab87611e41fde80cd3a1c4b412551d7b771523c0 (patch)
tree2a61960109e0e4453eae7e2c2fa9f3ac95617558
parentb865d41e11dc992efc7ba67557eeac2e95a9ed9e (diff)
Bumping stable efl to 1.7.5.v1.7.5
SVN revision: 82180
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac46
2 files changed, 27 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index ea531d7..b836dfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -109,3 +109,7 @@
1092013-01-04 Luis Felipe Strano Moraes 1092013-01-04 Luis Felipe Strano Moraes
110 110
111 * API consistency fix from Jérémy Zurcher 111 * API consistency fix from Jérémy Zurcher
112
1132013-01-04 Luis Felipe Strano Moraes
114
115 * 1.7.5 release
diff --git a/configure.ac b/configure.ac
index 925edce..d3d2274 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
3m4_define([v_maj], [1]) 3m4_define([v_maj], [1])
4m4_define([v_min], [7]) 4m4_define([v_min], [7])
5m4_define([v_mic], [4]) 5m4_define([v_mic], [5])
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']))])
8##-- When released, remove the dnl on the below line 8##-- When released, remove the dnl on the below line
@@ -81,13 +81,13 @@ case "$host_os" in
81 ;; 81 ;;
82esac 82esac
83 83
84requirement_ebluez="edbus >= 1.6.99" 84requirement_ebluez="edbus >= 1.7.5"
85requirement_econnman0_7x="edbus >= 1.6.99" 85requirement_econnman0_7x="edbus >= 1.7.5"
86requirement_edbus="ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62" 86requirement_edbus="ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62"
87requirement_ehal="edbus >= 1.6.99" 87requirement_ehal="edbus >= 1.7.5"
88requirement_enotify="edbus >= 1.6.99" 88requirement_enotify="edbus >= 1.7.5"
89requirement_eofono="edbus >= 1.6.99" 89requirement_eofono="edbus >= 1.7.5"
90requirement_eukit="edbus >= 1.6.99" 90requirement_eukit="edbus >= 1.7.5"
91 91
92### Additional options to configure 92### Additional options to configure
93 93
@@ -149,9 +149,9 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
149 149
150case "$host_os" in 150case "$host_os" in
151 mingw*) 151 mingw*)
152 PKG_CHECK_EXISTS([evil >= 1.6.99]) 152 PKG_CHECK_EXISTS([evil >= 1.7.5])
153 AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed]) 153 AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed])
154 requirement_edbus="${requirement_edbus} evil >= 1.6.99" 154 requirement_edbus="${requirement_edbus} evil >= 1.7.5"
155 ;; 155 ;;
156esac 156esac
157 157
@@ -185,8 +185,8 @@ AC_SUBST(DBUS_VERSION_CFLAGS)
185# Dependencies for the libraries 185# Dependencies for the libraries
186if test "x${enable_enotify}" = "xyes" ; then 186if test "x${enable_enotify}" = "xyes" ; then
187 PKG_CHECK_MODULES([EVAS], 187 PKG_CHECK_MODULES([EVAS],
188 [evas >= 1.6.99], 188 [evas >= 1.7.5],
189 [requirement_enotify="evas >= 1.6.99 ${requirement_enotify}"], 189 [requirement_enotify="evas >= 1.7.5 ${requirement_enotify}"],
190 [enable_enotify="no"]) 190 [enable_enotify="no"])
191fi 191fi
192 192
@@ -213,70 +213,70 @@ EFL_ENABLE_BIN([edbus-async-test], ["yes"])
213 213
214if test "x${have_edbus_test}" = "xyes" ; then 214if test "x${have_edbus_test}" = "xyes" ; then
215 PKG_CHECK_MODULES([EDBUS_TEST], 215 PKG_CHECK_MODULES([EDBUS_TEST],
216 [ecore >= 1.6.99 dbus-1 >= 0.62], 216 [ecore >= 1.7.5 dbus-1 >= 0.62],
217 [have_edbus_test="yes"], 217 [have_edbus_test="yes"],
218 [have_edbus_test="no"]) 218 [have_edbus_test="no"])
219fi 219fi
220 220
221if test "x${have_edbus_test_client}" = "xyes" ; then 221if test "x${have_edbus_test_client}" = "xyes" ; then
222 PKG_CHECK_MODULES([EDBUS_TEST_CLIENT], 222 PKG_CHECK_MODULES([EDBUS_TEST_CLIENT],
223 [ecore >= 1.6.99 dbus-1 >= 0.62], 223 [ecore >= 1.7.5 dbus-1 >= 0.62],
224 [have_edbus_test_client="yes"], 224 [have_edbus_test_client="yes"],
225 [have_edbus_test_client="no"]) 225 [have_edbus_test_client="no"])
226fi 226fi
227 227
228if test "x${have_edbus_bluez_test}" = "xyes" ; then 228if test "x${have_edbus_bluez_test}" = "xyes" ; then
229 PKG_CHECK_MODULES([EDBUS_BLUEZ_TEST], 229 PKG_CHECK_MODULES([EDBUS_BLUEZ_TEST],
230 [ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62], 230 [ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62],
231 [have_edbus_bluez_test="yes"], 231 [have_edbus_bluez_test="yes"],
232 [have_edbus_bluez_test="no"]) 232 [have_edbus_bluez_test="no"])
233fi 233fi
234 234
235if test "x${have_edbus_connman0_7x_test}" = "xyes" ; then 235if test "x${have_edbus_connman0_7x_test}" = "xyes" ; then
236 PKG_CHECK_MODULES([EDBUS_CONNMAN0_7X_TEST], 236 PKG_CHECK_MODULES([EDBUS_CONNMAN0_7X_TEST],
237 [ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62], 237 [ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62],
238 [have_edbus_connman0_7x_test="yes"], 238 [have_edbus_connman0_7x_test="yes"],
239 [have_edbus_connman0_7x_test="no"]) 239 [have_edbus_connman0_7x_test="no"])
240fi 240fi
241 241
242if test "x${have_edbus_notification_daemon_test}" = "xyes" ; then 242if test "x${have_edbus_notification_daemon_test}" = "xyes" ; then
243 PKG_CHECK_MODULES([EDBUS_NOTIFICATION_DAEMON_TEST], 243 PKG_CHECK_MODULES([EDBUS_NOTIFICATION_DAEMON_TEST],
244 [ecore >= 1.6.99 evas >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62], 244 [ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62],
245 [have_edbus_notification_daemon_test="yes"], 245 [have_edbus_notification_daemon_test="yes"],
246 [have_edbus_notification_daemon_test="no"]) 246 [have_edbus_notification_daemon_test="no"])
247fi 247fi
248 248
249if test "x${have_edbus_notify_send}" = "xyes" ; then 249if test "x${have_edbus_notify_send}" = "xyes" ; then
250 PKG_CHECK_MODULES([EDBUS_NOTIFY_SEND], 250 PKG_CHECK_MODULES([EDBUS_NOTIFY_SEND],
251 [ecore >= 1.6.99 evas >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62], 251 [ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62],
252 [have_edbus_notify_send="yes"], 252 [have_edbus_notify_send="yes"],
253 [have_edbus_notify_send="no"]) 253 [have_edbus_notify_send="no"])
254fi 254fi
255 255
256if test "x${have_edbus_notify_test}" = "xyes" ; then 256if test "x${have_edbus_notify_test}" = "xyes" ; then
257 PKG_CHECK_MODULES([EDBUS_NOTIFY_TEST], 257 PKG_CHECK_MODULES([EDBUS_NOTIFY_TEST],
258 [ecore >= 1.6.99 ecore-evas >= 1.6.99 evas >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62], 258 [ecore >= 1.7.5 ecore-evas >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62],
259 [have_edbus_notify_test="yes"], 259 [have_edbus_notify_test="yes"],
260 [have_edbus_notify_test="no"]) 260 [have_edbus_notify_test="no"])
261fi 261fi
262 262
263if test "x${have_edbus_ofono_test}" = "xyes" ; then 263if test "x${have_edbus_ofono_test}" = "xyes" ; then
264 PKG_CHECK_MODULES([EDBUS_OFONO_TEST], 264 PKG_CHECK_MODULES([EDBUS_OFONO_TEST],
265 [ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62], 265 [ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62],
266 [have_edbus_ofono_test="yes"], 266 [have_edbus_ofono_test="yes"],
267 [have_edbus_ofono_test="no"]) 267 [have_edbus_ofono_test="no"])
268fi 268fi
269 269
270if test "x${have_edbus_ukit_test}" = "xyes" ; then 270if test "x${have_edbus_ukit_test}" = "xyes" ; then
271 PKG_CHECK_MODULES([EDBUS_UKIT_TEST], 271 PKG_CHECK_MODULES([EDBUS_UKIT_TEST],
272 [ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62], 272 [ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62],
273 [have_edbus_ukit_test="yes"], 273 [have_edbus_ukit_test="yes"],
274 [have_edbus_ukit_test="no"]) 274 [have_edbus_ukit_test="no"])
275fi 275fi
276 276
277if test "x${have_edbus_performance_test}" = "xyes" ; then 277if test "x${have_edbus_performance_test}" = "xyes" ; then
278 PKG_CHECK_MODULES([EDBUS_PERFORMANCE_TEST], 278 PKG_CHECK_MODULES([EDBUS_PERFORMANCE_TEST],
279 [ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62 ecore-evas >= 1.6.99 elementary >= 1.6.99 evas >= 1.6.99], 279 [ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62 ecore-evas >= 1.7.5 elementary >= 1.7.5 evas >= 1.7.5],
280 [have_edbus_performance_test="yes"], 280 [have_edbus_performance_test="yes"],
281 [have_edbus_performance_test="no"]) 281 [have_edbus_performance_test="no"])
282fi 282fi
@@ -285,7 +285,7 @@ AM_CONDITIONAL([BUILD_EDBUS_PERFORMANCE_TEST], [test "x${have_edbus_performance_
285 285
286if test "x${have_edbus_async_test}" = "xyes" ; then 286if test "x${have_edbus_async_test}" = "xyes" ; then
287 PKG_CHECK_MODULES([EDBUS_ASYNC_TEST], 287 PKG_CHECK_MODULES([EDBUS_ASYNC_TEST],
288 [ecore >= 1.6.99 dbus-1 >= 0.62], 288 [ecore >= 1.7.5 dbus-1 >= 0.62],
289 [have_edbus_async_test="yes"], 289 [have_edbus_async_test="yes"],
290 [have_edbus_async_test="no"]) 290 [have_edbus_async_test="no"])
291fi 291fi