Index: /issm/trunk-jpl/src/c/cores/controladm1qn3_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/cores/controladm1qn3_core.cpp	(revision 22444)
+++ /issm/trunk-jpl/src/c/cores/controladm1qn3_core.cpp	(revision 22445)
@@ -11,6 +11,5 @@
 #include "../solutionsequences/solutionsequences.h"
 
-#if defined (_HAVE_M1QN3_) 
-//& !defined(_HAVE_ADOLC_)
+#if defined (_HAVE_M1QN3_) && defined(_HAVE_ADOLC_)
 /*m1qn3 prototypes*/
 extern "C" void *ctonbe_; // DIS mode : Conversion
@@ -467,4 +466,4 @@
 
 #else
-void controladm1qn3_core(FemModel* femmodel){_error_("M1QN3 not installed");}
+void controladm1qn3_core(FemModel* femmodel){_error_("M1QN3 or ADOLC not installed");}
 #endif //_HAVE_M1QN3_
Index: /issm/trunk-jpl/src/c/cores/controlm1qn3_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/cores/controlm1qn3_core.cpp	(revision 22444)
+++ /issm/trunk-jpl/src/c/cores/controlm1qn3_core.cpp	(revision 22445)
@@ -11,5 +11,5 @@
 #include "../solutionsequences/solutionsequences.h"
 
-#if defined (_HAVE_M1QN3_) & !defined(_HAVE_ADOLC_)
+#if defined (_HAVE_M1QN3_) && !defined(_HAVE_ADOLC_)
 /*m1qn3 prototypes*/
 extern "C" void *ctonbe_; // DIS mode : Conversion