浏览代码

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.


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@66485 15284696-431f-4ddb-bdfa-cd5b030d7da7
Vaclav Petras 9 年之前
父节点
当前提交
8f58766f55
共有 2 个文件被更改,包括 8 次插入4 次删除
  1. 0 4
      include/gmath.h
  2. 8 0
      include/la.h

+ 0 - 4
include/gmath.h

@@ -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 */

+ 8 - 0
include/la.h

@@ -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