From 4ae521f63712fac08611ea57683335f9efca5837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Virgile=20Pr=C3=A9vosto?= <virgile.prevosto@cea.fr>
Date: Tue, 21 Feb 2012 17:50:15 +0000
Subject: [PATCH] FRAMAC_VERSION is defined by main configure.ac, no need to do
 it here

---
 src/plugins/e-acsl/configure.ac | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/plugins/e-acsl/configure.ac b/src/plugins/e-acsl/configure.ac
index 56b023810ca..ee39a11426e 100644
--- a/src/plugins/e-acsl/configure.ac
+++ b/src/plugins/e-acsl/configure.ac
@@ -50,16 +50,9 @@ check_plugin(e_acsl,PLUGIN_RELATIVE_PATH(plugin_file),
 
 AC_MSG_CHECKING(for Frama-C version)
 
-#FRAMAC_VERSION=`$FRAMA_C -version | sed -e 's/Version: \(.*\)/\1/' -e '2,$d' `
-FRAMAC_VERSION=`frama-c -version | sed -e 's/Version: \(.*\)/\1/' -e '2,$d' `
-AC_MSG_RESULT($FRAMAC_VERSION)
-
 DEV_VERSION_NUMBER=`echo $FRAMAC_VERSION | sed -e 's/.*-\(.*\)/\1/' `
 VERSION_NUMBER=`echo $DEV_VERSION_NUMBER | sed -e 's/\(.*\)+dev/\1/' `
 
-# does not check the version number in order to keep the build farm happy
-# (see bts #1070)
-
 # if test $VERSION_NUMBER -lt 20111001; then
 #   AC_MSG_ERROR(Frama-C version must be Nitrogen-20111001.)
 # else if test $VERSION_NUMBER -gt 20111001; then
@@ -70,7 +63,9 @@ VERSION_NUMBER=`echo $DEV_VERSION_NUMBER | sed -e 's/\(.*\)+dev/\1/' `
 # at the time being, must use the Frama-C development version
 DEV=`echo $DEV_VERSION_NUMBER | sed -e 's/.*\(+dev\)/\1/' `
 if test "$DEV" != "+dev"; then
-  AC_MSG_ERROR(Frama-C version must be the current SVN version.)
+  AC_MSG_ERROR(Frama-C version must be the current SVN version.);
+else
+  AC_MSG_RESULT($FRAMAC_VERSION)
 fi
 
 # OCaml version
-- 
GitLab