aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2013-12-06 16:05:45 +0100
committerStefan Schmidt <stefan@datenfreihafen.org>2013-12-06 16:05:45 +0100
commit09609e9d04a0f18843fa07d053c59bf1f5810833 (patch)
tree96766c674db5ac4a50a70765bd01013e36163f2b
parentevas - silence coverty (false positive leak) (diff)
downloadefl-09609e9d04a0f18843fa07d053c59bf1f5810833.tar.gz
configure: Switch back to dev profile in master branch.
This also enables v_rev again. Thanks to Doug for pointing it out.
-rw-r--r--configure.ac2
-rw-r--r--m4/efl.m42
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index fc322f5cac..3c701920dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-EFL_VERSION([1], [8], [99], [release])
+EFL_VERSION([1], [8], [99], [dev])
AC_INIT([efl], [efl_version], [enlightenment-devel@lists.sourceforge.net])
AC_PREREQ([2.60])
diff --git a/m4/efl.m4 b/m4/efl.m4
index 31c5f87588..e197708113 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -29,7 +29,7 @@ m4_define([dev_version], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || e
m4_define([v_rev], m4_if($4, dev, [dev_version], [0]))dnl
m4_define([v_rel], [])dnl
m4_define([def_build_profile], m4_if($4, dev, [dev], [release]))dnl
-dnl m4_define([efl_version], m4_if($4, dev, [v_maj.v_min.v_mic.v_rev], [v_maj.v_min.v_mic]))dnl
+m4_define([efl_version], m4_if($4, dev, [v_maj.v_min.v_mic.v_rev], [v_maj.v_min.v_mic]))dnl
m4_define([efl_version], [v_maj.v_min.v_mic])dnl
])