[GRASS-SVN] r66485 - grass/trunk/include

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2015-10-12 19:25:44 -0700 (Mon, 12 Oct 2015)
New Revision: 66485

Modified:
   grass/trunk/include/gmath.h
   grass/trunk/include/la.h
Log:
remove la.h from standard gmath header 

Now we can easilly indentify modules which depend on la.h and its dependencies.
We fail in la.h if the dependencies are not fulfilled.
This shouln't require any additional work in modules except for including
la.h unless they want to use la.h conditionally.


Modified: grass/trunk/include/gmath.h
===================================================================
--- grass/trunk/include/gmath.h	2015-10-13 02:08:52 UTC (rev 66484)
+++ grass/trunk/include/gmath.h	2015-10-13 02:25:44 UTC (rev 66485)
@@ -24,10 +24,6 @@
 #define GRASS_GMATH_H
 
 #include <grass/config.h>
-#if defined(HAVE_LIBLAPACK) && defined(HAVE_LIBBLAS)
- /* only include if available */
-#include <grass/la.h>
-#endif
 #include <stddef.h>
 
 /*solver names */

Modified: grass/trunk/include/la.h
===================================================================
--- grass/trunk/include/la.h	2015-10-13 02:08:52 UTC (rev 66484)
+++ grass/trunk/include/la.h	2015-10-13 02:25:44 UTC (rev 66485)
@@ -13,6 +13,14 @@
  * \date 2000-2007
  */
 
+#ifndef HAVE_LIBBLAS
+#error GRASS GIS is not configured with BLAS (la.h cannot be included)
+#endif
+
+#ifndef HAVE_LIBLAPACK
+#error GRASS GIS is not configured with LAPACK (la.h cannot be included)
+#endif
+
 #ifndef GRASS_LA_H
 #define GRASS_LA_H