Merge pull request #56 from BackofenLab/intarna-2

*configure : OMP check only if multithreading enabled
BackofenLab · Feb 6, 2017 · 4b47515 · 4b47515
2 parents 8b42216 + 1ed6140
commit 4b47515
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -46,9 +46,6 @@ AC_LANG([C++])
 # ensure we are using c11 C++ standard
 AX_CXX_COMPILE_STDCXX( [11], [noext], [mandatory])
 
-# ensure OPENMP can be used
-AX_OPENMP([],[AC_MSG_ERROR([OPENMP support is mandatory for compilation])]])
-AM_CXXFLAGS="$AM_CXXFLAGS $OPENMP_CXXFLAGS"
 
 ###############################################################################
 ###############################################################################
@@ -90,6 +87,9 @@ AC_MSG_RESULT([$multithreadingEnabled])
 if test x"$multithreadingEnabled" = x"yes"; then
 	AC_DEFINE([INTARNA_MULITHREADING], [1], [Enabling multi-threading support])
 	AC_SUBST([INTARNA_MULITHREADING],[1])
+	# ensure OPENMP can be used
+	AX_OPENMP([],[AC_MSG_ERROR([OPENMP support is mandatory for compilation])]])
+	AM_CXXFLAGS="$AM_CXXFLAGS $OPENMP_CXXFLAGS"
 else
 	AC_DEFINE([INTARNA_MULITHREADING], [0], [Disabling multi-threading support])
 	AC_SUBST([INTARNA_MULITHREADING],[0])