add and use DEAL_II_WITH_GSL

diff --git a/doc/doxygen/options.dox.in b/doc/doxygen/options.dox.in
index 6f16b23e37d4c3aba827b8b456de6c0659749f7f..5dd491948a9b7df41a6915b419d918c3a690219a 100644 (file)
--- a/doc/doxygen/options.dox.in
+++ b/doc/doxygen/options.dox.in
@@ -1,4 +1,4 @@
-# This file contains project-specific configurations for the 
+# This file contains project-specific configurations for the
 # deal.II documentation.
 
 PROJECT_NAME           = "The deal.II Library"
@@ -167,6 +167,7 @@ PREDEFINED             = DOXYGEN=1 \
                          DEAL_II_WITH_BOOST=1 \
                          DEAL_II_WITH_CXX11=1 \
                          DEAL_II_WITH_CXX14=1 \
+                         DEAL_II_WITH_GSL=1 \
                          DEAL_II_WITH_HDF5=1 \
                          DEAL_II_WITH_LAPACK=1 \
                          DEAL_II_WITH_METIS=1 \

diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
index d6c5f0348e78571b8e82f19fb795362bb4973be4..1f8cb03e52b5ccb17e685f76ccc6a3f47f5f326b 100644 (file)
--- a/include/deal.II/base/config.h.in
+++ b/include/deal.II/base/config.h.in
@@ -39,6 +39,7 @@
 #cmakedefine DEAL_II_WITH_BZIP2
 #cmakedefine DEAL_II_WITH_CXX11
 #cmakedefine DEAL_II_WITH_CXX14
+#cmakedefine DEAL_II_WITH_GSL
 #cmakedefine DEAL_II_WITH_HDF5
 #cmakedefine DEAL_II_WITH_LAPACK
 #cmakedefine DEAL_II_WITH_METIS
@@ -331,4 +332,3 @@ _Pragma("GCC diagnostic pop")
 #include <deal.II/base/types.h>
 
 #endif
-

diff --git a/include/deal.II/base/function_cspline.h b/include/deal.II/base/function_cspline.h
index fac6269867919de44a13c1b16847cce8bdcc5813..361c7f7464202b729d5ea0188d0003fa7f32a002 100644 (file)
--- a/include/deal.II/base/function_cspline.h
+++ b/include/deal.II/base/function_cspline.h
@@ -18,6 +18,7 @@
 
 #include <deal.II/base/config.h>
 
+#ifdef DEAL_II_WITH_GSL
 #include <deal.II/base/function.h>
 #include <deal.II/base/point.h>
 #include <gsl/gsl_spline.h>
@@ -111,3 +112,5 @@ DEAL_II_NAMESPACE_CLOSE
 
 #endif
 
+#endif
+

diff --git a/source/base/function_cspline.cc b/source/base/function_cspline.cc
index a74e311ee92904bbbd0335f859e240f2e9d725fd..af8df06dd33539990d0387787c810591797ded90 100644 (file)
--- a/source/base/function_cspline.cc
+++ b/source/base/function_cspline.cc
@@ -16,6 +16,7 @@
 #include <deal.II/base/point.h>
 #include <deal.II/base/function_cspline.h>
 
+#ifdef DEAL_II_WITH_GSL
 #include <cmath>
 #include <algorithm>
 
@@ -97,3 +98,5 @@ namespace Functions
 }
 
 DEAL_II_NAMESPACE_CLOSE
+
+#endif

diff --git a/tests/base/functions_cspline.cc b/tests/base/functions_cspline.cc
index 56338974ed50fe3e44a2eea6a8a2529bd129af0a..45952175aa94c27482d451313b0486576d88b071 100644 (file)
--- a/tests/base/functions_cspline.cc
+++ b/tests/base/functions_cspline.cc
@@ -21,6 +21,7 @@
 #include <cmath>
 #include <deal.II/base/function_cspline.h>
 
+#ifdef DEAL_II_WITH_GSL
 template <int dim>
 void check()
 {
@@ -77,3 +78,15 @@ int main()
 
   check<1>();
 }
+#else
+
+int main()
+{
+  std::string logname = "output";
+  std::ofstream logfile(logname.c_str());
+  deallog.attach(logfile);
+  deallog.threshold_double(1.e-10);
+
+  deallog << "Ok"<< std::endl;
+}
+#endif