diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/edje/configure.ac | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to '')
-rw-r--r-- | libraries/edje/configure.ac | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/libraries/edje/configure.ac b/libraries/edje/configure.ac index 36bf32c..eceed6c 100644 --- a/libraries/edje/configure.ac +++ b/libraries/edje/configure.ac | |||
@@ -2,11 +2,11 @@ | |||
2 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 2 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
3 | m4_define([v_maj], [1]) | 3 | m4_define([v_maj], [1]) |
4 | m4_define([v_min], [1]) | 4 | m4_define([v_min], [1]) |
5 | m4_define([v_mic], [0]) | 5 | m4_define([v_mic], [99]) |
6 | m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || 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']))]) |
8 | ##-- When released, remove the dnl on the below line | 8 | ##-- When released, remove the dnl on the below line |
9 | m4_undefine([v_rev]) | 9 | dnl m4_undefine([v_rev]) |
10 | ##-- When doing snapshots - change soname. remove dnl on below line | 10 | ##-- When doing snapshots - change soname. remove dnl on below line |
11 | dnl m4_define([relname], [ver-pre-svn-07]) | 11 | dnl m4_define([relname], [ver-pre-svn-07]) |
12 | dnl m4_define([v_rel], [-release relname]) | 12 | dnl m4_define([v_rel], [-release relname]) |
@@ -291,14 +291,14 @@ PKG_CHECK_MODULES([ECORE_IMF], | |||
291 | [have_ecore_imf="no"]) | 291 | [have_ecore_imf="no"]) |
292 | 292 | ||
293 | # Enable Multisense use | 293 | # Enable Multisense use |
294 | want_multisense="no" | 294 | want_multisense="yes" |
295 | dnl AC_ARG_ENABLE([multisense], | 295 | AC_ARG_ENABLE([multisense], |
296 | dnl [AC_HELP_STRING( | 296 | [AC_HELP_STRING( |
297 | dnl [--enable-multisense], | 297 | [--enable-multisense], |
298 | dnl [multisense provides sound. tone and haptic effects support, [[default=disabled]]] | 298 | [multisense provides sound. tone and haptic effects support, [[default=disabled]]] |
299 | dnl )], | 299 | )], |
300 | dnl [want_multisense=$enableval] | 300 | [want_multisense=$enableval] |
301 | dnl ) | 301 | ) |
302 | AM_CONDITIONAL([ENABLE_MULTISENSE], [test "x${want_multisense}" = "xyes"]) | 302 | AM_CONDITIONAL([ENABLE_MULTISENSE], [test "x${want_multisense}" = "xyes"]) |
303 | 303 | ||
304 | ##sndfile library | 304 | ##sndfile library |
@@ -534,21 +534,6 @@ fi | |||
534 | 534 | ||
535 | ## Examples | 535 | ## Examples |
536 | 536 | ||
537 | install_examples="yes" | ||
538 | AC_ARG_ENABLE([install-examples], | ||
539 | AC_HELP_STRING([--disable-install-examples], | ||
540 | [disable installing examples (compiled or just source). | ||
541 | @<:@default==enabled@:>@]), | ||
542 | [ | ||
543 | if test "x${enableval}" = "xyes" ; then | ||
544 | install_examples="yes" | ||
545 | else | ||
546 | install_examples="no" | ||
547 | fi | ||
548 | ], | ||
549 | [install_examples="yes"]) | ||
550 | AM_CONDITIONAL([INSTALL_EXAMPLES], [test "x${install_examples}" = "xyes"]) | ||
551 | |||
552 | build_examples="no" | 537 | build_examples="no" |
553 | AC_ARG_ENABLE([build-examples], | 538 | AC_ARG_ENABLE([build-examples], |
554 | AC_HELP_STRING([--enable-build-examples], | 539 | AC_HELP_STRING([--enable-build-examples], |
@@ -557,7 +542,7 @@ AC_ARG_ENABLE([build-examples], | |||
557 | if test "x${enableval}" = "xyes" ; then | 542 | if test "x${enableval}" = "xyes" ; then |
558 | build_examples="yes" | 543 | build_examples="yes" |
559 | edje_cc=$($PKG_CONFIG --variable=prefix edje)/bin/edje_cc | 544 | edje_cc=$($PKG_CONFIG --variable=prefix edje)/bin/edje_cc |
560 | # put in here the dependencies for Edje' examples. They are | 545 | # put in here the dependencies for Edje' examples. They are |
561 | # meant to be 'real world' usage examples, thus one will be | 546 | # meant to be 'real world' usage examples, thus one will be |
562 | # using higher level libraries on these programs | 547 | # using higher level libraries on these programs |
563 | AC_SUBST(edje_cc) | 548 | AC_SUBST(edje_cc) |