[Valgrind-valkyrie-dev] valkyrie: r452 - trunk

[<sv...@va...>]

Author: sewardj
Date: 2009-01-07 10:55:37 +0000 (Wed, 07 Jan 2009)
New Revision: 452

Log:

* bump version number

* make the detection of Valgrind more strict.  If no Valgrind is
  detected, or the version number is wrong, just stop.



Modified:
   trunk/configure.in


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-01-06 22:16:52 UTC (rev 451)
+++ trunk/configure.in	2009-01-07 10:55:37 UTC (rev 452)
@@ -2,7 +2,7 @@
 
 ########################################################################
 # ? AC_PREREQ(2.59)
-AC_INIT(Valkyrie, 1.3.0, in...@op...)
+AC_INIT(Valkyrie, 1.4.0.SVN, in...@op...)
 AC_CONFIG_SRCDIR([valkyrie/main.cpp])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR(m4)
@@ -46,7 +46,7 @@
 
 if test x"$VALGRIND" = x ; then
    # Valgrind not found
-   AC_MSG_WARN([Valgrind not found: may be configured at runtime.])
+   AC_MSG_ERROR([Valgrind not found.])
 else
   # Valgrind found: check is ok
   AC_MSG_CHECKING([valgrind version (need >= 3.4.0)])
@@ -55,7 +55,7 @@
   VG_VERSION=`$VALGRIND --version | sed "s/^valgrind-//"`
   if test x"$VG_VERSION" = x; then
      # failed to start valgrind
-     AC_MSG_WARN([Failed to start Valgrind. Please check your Valgrind installation. Valgrind path may be set at runtime.])
+     AC_MSG_ERROR([Failed to start Valgrind. Please check your Valgrind installation.])
      VALGRIND=""
   else
      AC_MSG_RESULT([$VG_VERSION])
@@ -64,7 +64,7 @@
      if { test $VG_VERSION_1 -lt $VG_VERSION_MIN1  || \
           test $VG_VERSION_2 -lt $VG_VERSION_MIN2; }; then
         VALGRIND=""
-        AC_MSG_ERROR([Not configuring for valgrind: need minimum version of 3.4.0.  Please configure with a more recent version of Valgrind (may be done at runtime).])
+        AC_MSG_ERROR([Not configuring for valgrind: need minimum version of 3.4.0.])
      fi
   fi
 fi