[Rivet-svn] r2553 - trunk

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Jun 30 13:47:09 2010
New Revision: 2553

Log:
Making Python extension biuld check failure into an error rather than a warning

Modified:
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Wed Jun 30 13:46:09 2010	(r2552)
+++ trunk/ChangeLog	Wed Jun 30 13:47:09 2010	(r2553)
@@ -1,6 +1,12 @@
-2010-06-28  Andy Buckley  <andy at insectnation.org>
+2010-06-30  Andy Buckley  <andy at insectnation.org>
+
+	* Minimising amount of Log class mapped into SWIG.
 
-	* Rivet 1.2.2 release.
+	* Making Python ext build checks fail with error rather than
+	warning if it has been requested (or, rather, not explicitly
+	disabled).
+
+2010-06-28  Andy Buckley  <andy at insectnation.org>
 
 	* Converting rivet Python module to be a package, with the dlopen
 	flag setting etc. done around the SWIG generated core wrapper

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Wed Jun 30 13:46:09 2010	(r2552)
+++ trunk/configure.ac	Wed Jun 30 13:47:09 2010	(r2553)
@@ -1,7 +1,7 @@
 ## Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([Rivet],[1.2.2],[rivet at projects.hepforge.org],[Rivet])
+AC_INIT([Rivet],[1.2.2b],[rivet at projects.hepforge.org],[Rivet])
 AC_CONFIG_SRCDIR([src/Core/Analysis.cc])
 AC_CONFIG_HEADERS([include/Rivet/Config/DummyConfig.hh include/Rivet/Config/RivetConfig.hh include/Rivet/Config/BuildOptions.hh])
 AM_INIT_AUTOMAKE(dist-bzip2)
@@ -199,14 +199,14 @@
     AC_MSG_RESULT([$python_incpath])
     python_header="$python_incpath/Python.h"
     if test -z "$python_incpath"; then
-      AC_MSG_WARN([Can't build Python extension since include directory cannot be determined from distutils])
+      AC_MSG_ERROR([Can't build Python extension since include directory cannot be determined from distutils])
       enable_pyext=no
     elif test ! -e "$python_header"; then
-      AC_MSG_WARN([Can't build Python extension since header file $python_header cannot be found])
+      AC_MSG_ERROR([Can't build Python extension since header file $python_header cannot be found])
       enable_pyext=no
     fi
   else
-    AC_MSG_WARN([Can't build Python extension since python can't be found])
+    AC_MSG_ERROR([Can't build Python extension since python can't be found])
     enable_pyext=no
   fi
 fi
@@ -214,7 +214,7 @@
 if test x$enable_pyext == xyes; then
   AC_PROG_SWIG
   if test x$SWIG == x; then
-    AC_MSG_WARN([Can't build Python extension since swig could not be found])
+    AC_MSG_ERROR([Can't build Python extension since swig could not be found])
     enable_pyext=no
   else
     ## Test that SWIG makes a compilable source file...
@@ -231,7 +231,7 @@
     stat_string=`$SWIG -c++ -python conftest.i 2>&1 1>&5` ; test -z "$stat_string" || flag_ok=no
     AC_MSG_RESULT([$flag_ok])
     if test x$flag_ok != xyes; then
-      AC_MSG_WARN([Can't build Python extension since $SWIG is not able to make a Python wrapper])
+      AC_MSG_ERROR([Can't build Python extension since $SWIG is not able to make a Python wrapper])
       enable_pyext=no
     else
       AC_MSG_CHECKING([if $SWIG is compatible with the $CXX compiler])
@@ -241,7 +241,7 @@
       fi
       AC_MSG_RESULT([$flag_ok])
       if test x$flag_ok != xyes; then
-        AC_MSG_WARN([Can't build Python extension since $SWIG is not compatible with $CXX])
+        AC_MSG_ERROR([Can't build Python extension since $SWIG is not compatible with $CXX])
         enable_pyext=no
       fi
     fi