From ddb8c95fa994ffc95758044d317879be46da3625 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Wed, 9 Jun 2010 18:22:47 +0000 Subject: [PATCH] SVN_REPO_PATH envvar during autoconf to use svnversion in there. Some systems, like the Gentoo, copy the svn contents somewhere before doing the autoconf, this may result in lack of .svn and thus minor version "0". This patch introduces the $SVN_REPO_PATH to say where the svn checkout containing the ".svn" directory is. SVN revision: 49594 --- legacy/ecore/configure.ac | 2 +- legacy/edje/configure.ac | 2 +- legacy/eet/configure.ac | 2 +- legacy/eeze/configure.ac | 2 +- legacy/efreet/configure.ac | 2 +- legacy/eina/configure.ac | 2 +- legacy/embryo/configure.ac | 2 +- legacy/evas/configure.ac | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index e3ccdda1e9..c45ebd6dd6 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -3,7 +3,7 @@ m4_define([v_maj], [0]) m4_define([v_min], [9]) m4_define([v_mic], [9]) -m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 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']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) diff --git a/legacy/edje/configure.ac b/legacy/edje/configure.ac index 1239134d16..797e792925 100644 --- a/legacy/edje/configure.ac +++ b/legacy/edje/configure.ac @@ -3,7 +3,7 @@ m4_define([v_maj], [0]) m4_define([v_min], [9]) m4_define([v_mic], [9]) -m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 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']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) diff --git a/legacy/eet/configure.ac b/legacy/eet/configure.ac index d6753794fd..7cb04f0cfe 100644 --- a/legacy/eet/configure.ac +++ b/legacy/eet/configure.ac @@ -3,7 +3,7 @@ m4_define([v_maj], [1]) m4_define([v_min], [3]) m4_define([v_mic], [1]) -m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 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']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) diff --git a/legacy/eeze/configure.ac b/legacy/eeze/configure.ac index 6f82eebda1..b75bcaf1dc 100644 --- a/legacy/eeze/configure.ac +++ b/legacy/eeze/configure.ac @@ -3,7 +3,7 @@ m4_define([v_maj], [0]) m4_define([v_min], [2]) m4_define([v_mic], [0]) -m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 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']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) diff --git a/legacy/efreet/configure.ac b/legacy/efreet/configure.ac index 832ae30ebb..88a37a69b1 100644 --- a/legacy/efreet/configure.ac +++ b/legacy/efreet/configure.ac @@ -3,7 +3,7 @@ m4_define([v_maj], [0]) m4_define([v_min], [5]) m4_define([v_mic], [0]) -m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 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']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac index 036cfad7d6..446766f4d6 100644 --- a/legacy/eina/configure.ac +++ b/legacy/eina/configure.ac @@ -3,7 +3,7 @@ m4_define([v_maj], [0]) m4_define([v_min], [9]) m4_define([v_mic], [9]) -m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 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']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) diff --git a/legacy/embryo/configure.ac b/legacy/embryo/configure.ac index 188c700d60..6481aa7656 100644 --- a/legacy/embryo/configure.ac +++ b/legacy/embryo/configure.ac @@ -3,7 +3,7 @@ m4_define([v_maj], [0]) m4_define([v_min], [9]) m4_define([v_mic], [9]) -m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 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']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac index ec0ab300aa..6e33c0d053 100644 --- a/legacy/evas/configure.ac +++ b/legacy/evas/configure.ac @@ -3,7 +3,7 @@ m4_define([v_maj], [0]) m4_define([v_min], [9]) m4_define([v_mic], [9]) -m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 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']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev])