diff options
author | Carsten Haitzler <raster@rasterman.com> | 2012-07-09 10:20:21 +0000 |
---|---|---|
committer | Carsten Haitzler <raster@rasterman.com> | 2012-07-09 10:20:21 +0000 |
commit | 9c8978eb767b84c1b655e7ea4df6702abdd32dc5 (patch) | |
tree | 2e722245c34138df0de429fcf1ad1a536965a7b8 /configure.ac | |
parent | f446f262bb04b12bec1f7a118e6321522bae4825 (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 'configure.ac')
-rw-r--r-- | configure.ac | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/configure.ac b/configure.ac index a3e4fb406..a7f8e6ed5 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,7 +1,7 @@ | |||
1 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 1 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
2 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 2 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
3 | m4_define([v_maj], [1]) | 3 | m4_define([v_maj], [1]) |
4 | m4_define([v_min], [0]) | 4 | m4_define([v_min], [6]) |
5 | m4_define([v_mic], [99]) | 5 | m4_define([v_mic], [99]) |
6 | m4_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'])) | 6 | m4_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'])) |
7 | m4_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']))]) | 7 | m4_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']))]) |
@@ -214,25 +214,25 @@ AM_CONDITIONAL([ELEMENTARY_WINDOWS_BUILD], [test "x${have_windows}" = "xyes"]) | |||
214 | 214 | ||
215 | PKG_CHECK_MODULES([ELEMENTARY], | 215 | PKG_CHECK_MODULES([ELEMENTARY], |
216 | [ | 216 | [ |
217 | eina >= 1.2.0 | 217 | eina >= 1.6.99 |
218 | eet >= 1.6.0 | 218 | eet >= 1.6.99 |
219 | evas >= 1.2.0 | 219 | evas >= 1.6.99 |
220 | ecore >= 1.2.0 | 220 | ecore >= 1.6.99 |
221 | ecore-evas >= 1.2.0 | 221 | ecore-evas >= 1.6.99 |
222 | ecore-file >= 1.2.0 | 222 | ecore-file >= 1.6.99 |
223 | edje >= 1.2.0 | 223 | edje >= 1.6.99 |
224 | ] | 224 | ] |
225 | ) | 225 | ) |
226 | 226 | ||
227 | requirement_elm="edje >= 1.2.0 ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0 ${requirement_elm}" | 227 | requirement_elm="edje >= 1.6.99 ecore-file >= 1.6.99 ecore-evas >= 1.6.99 ecore >= 1.6.99 evas >= 1.6.99 eet >= 1.6.99 eina >= 1.6.99 ${requirement_elm}" |
228 | 228 | ||
229 | PKG_CHECK_MODULES([ELEMENTARY_ECORE_IMF], | 229 | PKG_CHECK_MODULES([ELEMENTARY_ECORE_IMF], |
230 | [ecore-imf >= 1.2.0], | 230 | [ecore-imf >= 1.6.99], |
231 | [ | 231 | [ |
232 | ELEMENTARY_ECORE_IMF_INC="#include <Ecore_IMF.h>" | 232 | ELEMENTARY_ECORE_IMF_INC="#include <Ecore_IMF.h>" |
233 | AC_DEFINE(HAVE_ELEMENTARY_ECORE_IMF, 1, [Have Ecore_IMF support]) | 233 | AC_DEFINE(HAVE_ELEMENTARY_ECORE_IMF, 1, [Have Ecore_IMF support]) |
234 | have_ecore_imf="yes" | 234 | have_ecore_imf="yes" |
235 | requirement_elm="ecore-imf >= 1.2.0 ${requirement_elm}" | 235 | requirement_elm="ecore-imf >= 1.6.99 ${requirement_elm}" |
236 | ], | 236 | ], |
237 | [have_ecore_imf="no"]) | 237 | [have_ecore_imf="no"]) |
238 | AC_SUBST(ELEMENTARY_ECORE_IMF_INC) | 238 | AC_SUBST(ELEMENTARY_ECORE_IMF_INC) |
@@ -240,12 +240,12 @@ AC_SUBST(ELEMENTARY_ECORE_IMF_INC) | |||
240 | AM_CONDITIONAL([HAVE_ECORE_IMF], [test "x${have_ecore_imf}" = "xyes"]) | 240 | AM_CONDITIONAL([HAVE_ECORE_IMF], [test "x${have_ecore_imf}" = "xyes"]) |
241 | 241 | ||
242 | PKG_CHECK_MODULES([ELEMENTARY_ECORE_CON], | 242 | PKG_CHECK_MODULES([ELEMENTARY_ECORE_CON], |
243 | [ecore-con >= 1.2.0], | 243 | [ecore-con >= 1.6.99], |
244 | [ | 244 | [ |
245 | ELEMENTARY_ECORE_CON_INC="#include <Ecore_Con.h>" | 245 | ELEMENTARY_ECORE_CON_INC="#include <Ecore_Con.h>" |
246 | AC_DEFINE(HAVE_ELEMENTARY_ECORE_CON, 1, [Have Ecore_Con support]) | 246 | AC_DEFINE(HAVE_ELEMENTARY_ECORE_CON, 1, [Have Ecore_Con support]) |
247 | have_ecore_con="yes" | 247 | have_ecore_con="yes" |
248 | requirement_elm="ecore-con >= 1.2.0 ${requirement_elm}" | 248 | requirement_elm="ecore-con >= 1.6.99 ${requirement_elm}" |
249 | ], | 249 | ], |
250 | [have_ecore_con="no"]) | 250 | [have_ecore_con="no"]) |
251 | AC_SUBST(ELEMENTARY_ECORE_CON_INC) | 251 | AC_SUBST(ELEMENTARY_ECORE_CON_INC) |
@@ -290,11 +290,11 @@ AC_ARG_ENABLE([ecore-x], | |||
290 | 290 | ||
291 | if test "x$want_elementary_x" != "xno"; then | 291 | if test "x$want_elementary_x" != "xno"; then |
292 | PKG_CHECK_MODULES([ELEMENTARY_X], | 292 | PKG_CHECK_MODULES([ELEMENTARY_X], |
293 | [ecore-x >= 1.2.0], | 293 | [ecore-x >= 1.6.99], |
294 | [ | 294 | [ |
295 | AC_DEFINE(HAVE_ELEMENTARY_X, 1, [X11 support for Elementary]) | 295 | AC_DEFINE(HAVE_ELEMENTARY_X, 1, [X11 support for Elementary]) |
296 | have_elementary_x="yes" | 296 | have_elementary_x="yes" |
297 | requirement_elm="ecore-x >= 1.2.0 ${requirement_elm}" | 297 | requirement_elm="ecore-x >= 1.6.99 ${requirement_elm}" |
298 | ], | 298 | ], |
299 | [have_elementary_x="no"] | 299 | [have_elementary_x="no"] |
300 | ) | 300 | ) |
@@ -314,11 +314,11 @@ AC_ARG_ENABLE([ecore-fb], | |||
314 | 314 | ||
315 | if test "x$want_elementary_fb" != "xno"; then | 315 | if test "x$want_elementary_fb" != "xno"; then |
316 | PKG_CHECK_MODULES([ELEMENTARY_FB], | 316 | PKG_CHECK_MODULES([ELEMENTARY_FB], |
317 | [ecore-fb >= 1.2.0], | 317 | [ecore-fb >= 1.6.99], |
318 | [ | 318 | [ |
319 | AC_DEFINE(HAVE_ELEMENTARY_FB, 1, [FB support for Elementary]) | 319 | AC_DEFINE(HAVE_ELEMENTARY_FB, 1, [FB support for Elementary]) |
320 | have_elementary_fb="yes" | 320 | have_elementary_fb="yes" |
321 | requirement_elm="ecore-fb >= 1.2.0 ${requirement_elm}" | 321 | requirement_elm="ecore-fb >= 1.6.99 ${requirement_elm}" |
322 | ], | 322 | ], |
323 | [have_elementary_fb="no"] | 323 | [have_elementary_fb="no"] |
324 | ) | 324 | ) |
@@ -337,11 +337,11 @@ AC_ARG_ENABLE([ecore-psl1ght], | |||
337 | 337 | ||
338 | if test "x$want_elementary_psl1ght" != "xno"; then | 338 | if test "x$want_elementary_psl1ght" != "xno"; then |
339 | PKG_CHECK_MODULES([ELEMENTARY_PSL1GHT], | 339 | PKG_CHECK_MODULES([ELEMENTARY_PSL1GHT], |
340 | [ecore-psl1ght >= 1.2.0], | 340 | [ecore-psl1ght >= 1.6.99], |
341 | [ | 341 | [ |
342 | AC_DEFINE(HAVE_ELEMENTARY_PSL1GHT, 1, [PSL1GHT support for Elementary]) | 342 | AC_DEFINE(HAVE_ELEMENTARY_PSL1GHT, 1, [PSL1GHT support for Elementary]) |
343 | have_elementary_psl1ght="yes" | 343 | have_elementary_psl1ght="yes" |
344 | requirement_elm="ecore-psl1ght >= 1.2.0 ${requirement_elm}" | 344 | requirement_elm="ecore-psl1ght >= 1.6.99 ${requirement_elm}" |
345 | ], | 345 | ], |
346 | [have_elementary_psl1ght="no"] | 346 | [have_elementary_psl1ght="no"] |
347 | ) | 347 | ) |
@@ -360,11 +360,11 @@ AC_ARG_ENABLE([ecore-sdl], | |||
360 | 360 | ||
361 | if test "x$want_elementary_sdl" != "xno"; then | 361 | if test "x$want_elementary_sdl" != "xno"; then |
362 | PKG_CHECK_MODULES([ELEMENTARY_SDL], | 362 | PKG_CHECK_MODULES([ELEMENTARY_SDL], |
363 | [ecore-sdl >= 1.2.0], | 363 | [ecore-sdl >= 1.6.99], |
364 | [ | 364 | [ |
365 | AC_DEFINE(HAVE_ELEMENTARY_SDL, 1, [SDL support for Elementary]) | 365 | AC_DEFINE(HAVE_ELEMENTARY_SDL, 1, [SDL support for Elementary]) |
366 | have_elementary_sdl="yes" | 366 | have_elementary_sdl="yes" |
367 | requirement_elm="ecore-sdl >= 1.2.0 ${requirement_elm}" | 367 | requirement_elm="ecore-sdl >= 1.6.99 ${requirement_elm}" |
368 | ], | 368 | ], |
369 | [have_elementary_sdl="no"] | 369 | [have_elementary_sdl="no"] |
370 | ) | 370 | ) |
@@ -383,11 +383,11 @@ AC_ARG_ENABLE([ecore-cocoa], | |||
383 | 383 | ||
384 | if test "x$want_elementary_cocoa" != "xno"; then | 384 | if test "x$want_elementary_cocoa" != "xno"; then |
385 | PKG_CHECK_MODULES([ELEMENTARY_COCOA], | 385 | PKG_CHECK_MODULES([ELEMENTARY_COCOA], |
386 | [ecore-cocoa >= 1.2.0], | 386 | [ecore-cocoa >= 1.6.99], |
387 | [ | 387 | [ |
388 | AC_DEFINE(HAVE_ELEMENTARY_COCOA, 1, [COCOA support for Elementary]) | 388 | AC_DEFINE(HAVE_ELEMENTARY_COCOA, 1, [COCOA support for Elementary]) |
389 | have_elementary_cocoa="yes" | 389 | have_elementary_cocoa="yes" |
390 | requirement_elm="ecore-cocoa >= 1.2.0 ${requirement_elm}" | 390 | requirement_elm="ecore-cocoa >= 1.6.99 ${requirement_elm}" |
391 | ], | 391 | ], |
392 | [have_elementary_cocoa="no"] | 392 | [have_elementary_cocoa="no"] |
393 | ) | 393 | ) |
@@ -406,11 +406,11 @@ AC_ARG_ENABLE([ecore-win32], | |||
406 | 406 | ||
407 | if test "x$want_elementary_win32" != "xno"; then | 407 | if test "x$want_elementary_win32" != "xno"; then |
408 | PKG_CHECK_MODULES([ELEMENTARY_WIN32], | 408 | PKG_CHECK_MODULES([ELEMENTARY_WIN32], |
409 | [ecore-win32 >= 1.2.0], | 409 | [ecore-win32 >= 1.6.99], |
410 | [ | 410 | [ |
411 | AC_DEFINE(HAVE_ELEMENTARY_WIN32, 1, [Windows XP support for Elementary]) | 411 | AC_DEFINE(HAVE_ELEMENTARY_WIN32, 1, [Windows XP support for Elementary]) |
412 | have_elementary_win32="yes" | 412 | have_elementary_win32="yes" |
413 | requirement_elm="ecore-win32 >= 1.2.0 ${requirement_elm}" | 413 | requirement_elm="ecore-win32 >= 1.6.99 ${requirement_elm}" |
414 | ], | 414 | ], |
415 | [have_elementary_win32="no"] | 415 | [have_elementary_win32="no"] |
416 | ) | 416 | ) |
@@ -429,11 +429,11 @@ AC_ARG_ENABLE([ecore-wince], | |||
429 | 429 | ||
430 | if test "x$want_elementary_wince" != "xno"; then | 430 | if test "x$want_elementary_wince" != "xno"; then |
431 | PKG_CHECK_MODULES([ELEMENTARY_WINCE], | 431 | PKG_CHECK_MODULES([ELEMENTARY_WINCE], |
432 | [ecore-wince >= 1.2.0], | 432 | [ecore-wince >= 1.6.99], |
433 | [ | 433 | [ |
434 | AC_DEFINE(HAVE_ELEMENTARY_WINCE, 1, [Windows CE support for Elementary]) | 434 | AC_DEFINE(HAVE_ELEMENTARY_WINCE, 1, [Windows CE support for Elementary]) |
435 | have_elementary_wince="yes" | 435 | have_elementary_wince="yes" |
436 | requirement_elm="ecore-wince >= 1.2.0 ${requirement_elm}" | 436 | requirement_elm="ecore-wince >= 1.6.99 ${requirement_elm}" |
437 | ], | 437 | ], |
438 | [have_elementary_wince="no"] | 438 | [have_elementary_wince="no"] |
439 | ) | 439 | ) |
@@ -477,13 +477,13 @@ AC_ARG_ENABLE([edbus], | |||
477 | if test "x$want_elementary_edbus" != "xno"; then | 477 | if test "x$want_elementary_edbus" != "xno"; then |
478 | PKG_CHECK_MODULES([ELEMENTARY_EDBUS], | 478 | PKG_CHECK_MODULES([ELEMENTARY_EDBUS], |
479 | [ | 479 | [ |
480 | edbus >= 1.2.0 | 480 | edbus >= 1.6.99 |
481 | ], | 481 | ], |
482 | [ | 482 | [ |
483 | AC_DEFINE(HAVE_ELEMENTARY_EDBUS, 1, [EDBus support for Elementary]) | 483 | AC_DEFINE(HAVE_ELEMENTARY_EDBUS, 1, [EDBus support for Elementary]) |
484 | have_elementary_edbus="yes" | 484 | have_elementary_edbus="yes" |
485 | ELM_EDBUS_DEF="#define" | 485 | ELM_EDBUS_DEF="#define" |
486 | requirement_elm="edbus >= 1.2.0 ${requirement_elm}" | 486 | requirement_elm="edbus >= 1.6.99 ${requirement_elm}" |
487 | ], | 487 | ], |
488 | [have_elementary_edbus="no"] | 488 | [have_elementary_edbus="no"] |
489 | ) | 489 | ) |
@@ -505,15 +505,15 @@ AC_ARG_ENABLE([efreet], | |||
505 | if test "x$want_elementary_efreet" != "xno"; then | 505 | if test "x$want_elementary_efreet" != "xno"; then |
506 | PKG_CHECK_MODULES([ELEMENTARY_EFREET], | 506 | PKG_CHECK_MODULES([ELEMENTARY_EFREET], |
507 | [ | 507 | [ |
508 | efreet >= 1.2.0 | 508 | efreet >= 1.6.99 |
509 | efreet-mime >= 1.2.0 | 509 | efreet-mime >= 1.6.99 |
510 | efreet-trash >= 1.2.0 | 510 | efreet-trash >= 1.6.99 |
511 | ], | 511 | ], |
512 | [ | 512 | [ |
513 | AC_DEFINE(HAVE_ELEMENTARY_EFREET, 1, [Efreet support for Elementary]) | 513 | AC_DEFINE(HAVE_ELEMENTARY_EFREET, 1, [Efreet support for Elementary]) |
514 | have_elementary_efreet="yes" | 514 | have_elementary_efreet="yes" |
515 | ELM_EFREET_DEF="#define" | 515 | ELM_EFREET_DEF="#define" |
516 | requirement_elm="efreet >= 1.2.0 efreet-mime >= 1.2.0 efreet-trash >= 1.2.0 ${requirement_elm}" | 516 | requirement_elm="efreet >= 1.6.99 efreet-mime >= 1.6.99 efreet-trash >= 1.6.99 ${requirement_elm}" |
517 | ], | 517 | ], |
518 | [have_elementary_efreet="no"] | 518 | [have_elementary_efreet="no"] |
519 | ) | 519 | ) |