Externalise MySolver properly

src/Makefile.am

@@ -25,6 +25,7 @@ run-one-body-sample-gdb: one-body-sample
 one_body_sample_SOURCES = \
 	assemblers.cc \
 	compute_state.cc \
+	mysolver.cc \
 	one-body-sample.cc \
 	print.cc \
 	vtk.cc

src/mysolver.cc

@@ -62,4 +62,4 @@ MySolver<dim, VectorType, OperatorType, GridType,
   return multigridStep;
 }
 
-//#include "mysolver_tmpl.cc"
+#include "mysolver_tmpl.cc"

src/one-body-sample.cc

@@ -2,6 +2,10 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_IPOPT
+#undef HAVE_IPOPT
+#endif
+
 #ifndef srcdir
 #error srcdir unset
 #endif
@@ -51,7 +55,7 @@
 
 #include "assemblers.hh"
 #include "compute_state.hh"
-#include "mysolver.cc" // TODO
+#include "mysolver.hh"
 #include "print.hh"
 #include "vtk.hh"