Check for OpenMP use, use AX_EXT flags better

diff --git a/configure.ac b/configure.ac
index b3cf1c2599b7e48b3955d981445f0d0a1cfa9e32..80b048414203a67e4f9e2117a5a4c78a7565d127 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,6 @@ AC_CHECK_SIZEOF(long, 4)
 AC_CHECK_SIZEOF(float, 4)
 AC_CHECK_SIZEOF(double, 8)
 
 AC_CHECK_SIZEOF(float, 4)
 AC_CHECK_SIZEOF(double, 8)
 

-dnl Add define templates

 
 dnl Checks for libraries.
 AC_CHECK_LIB(z, deflate, [ zlib="true" ], [ zlib="false" ;  AC_MSG_WARN([zlib missing. Will need zlib for PNG support])])
 
 dnl Checks for libraries.
 AC_CHECK_LIB(z, deflate, [ zlib="true" ], [ zlib="false" ;  AC_MSG_WARN([zlib missing. Will need zlib for PNG support])])


@@ -127,19 +126,13 @@ if test "${getopt_long}" = "false" ; then
 fi
 AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test "$GETOPTLONG"="1")
 
 fi
 AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test "$GETOPTLONG"="1")
 

+ARCH_OPTION=""

 case $target_cpu in
     i386|i486|i586|i686|x86|x86_64)
         AX_EXT
 case $target_cpu in
     i386|i486|i586|i686|x86|x86_64)
         AX_EXT

-        if [ test "$ax_cv_have_sse41_ext" = yes && test "$ac_cv_header_smmintrin_h" = yes ]; then
-            # SSE4.1/2 extensions
-            ARCH_OPTION='-msse4.1'
-        elif [ test "$ax_cv_have_sse3_ext" = yes && test "$ac_cv_header_pmmintrin_h" = yes ]; then
-            ARCH_OPTION='-msse3'
-        elif [ test "$ax_cv_have_sse2_ext" = yes && test "$ac_cv_header_emmintrin_h" = yes ]; then
-            ARCH_OPTION='-msse2'
-        else
-            ARCH_OPTION="-ffast-math"
-        fi;;
+        CFLAGS="$CFLAGS $CPUEXT_FLAGS $SIMD_FLAGS"
+        CXXFLAGS="$CXXFLAGS $CPUEXT_FLAGS $SIMD_FLAGS"
+        ;;

     powerpc*)
         ARCH_OPTION="-fno-common -faltivec";;
     armv1*|armv2*|armv3*|armv4*|armv5*|armv6*)
     powerpc*)
         ARCH_OPTION="-fno-common -faltivec";;
     armv1*|armv2*|armv3*|armv4*|armv5*|armv6*)


@@ -240,6 +233,24 @@ AC_ARG_ENABLE(static,
   esac ], AC_MSG_RESULT(no)
 )
 
   esac ], AC_MSG_RESULT(no)
 )
 

+dnl Checking if use OpenMP
+AC_MSG_CHECKING(OpenMP)
+AC_ARG_ENABLE(openmp,
+[  --enable-openmp
+                            Enable use of OpenMP.],
+[ case "$enableval" in
+  yes)
+    AC_MSG_RESULT(yes)
+    AX_OPENMP
+    CFLAGS="$CFLAGS $OPENMP_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
+    ;;
+  *)
+    AC_MSG_RESULT(no)
+    ;;
+  esac ], AC_MSG_RESULT(no)
+)
+

 dnl Set LAM path
 AC_ARG_WITH(lam,
 [  --with-lam[=PATH]         Set path of LAM MPI ],
 dnl Set LAM path
 AC_ARG_WITH(lam,
 [  --with-lam[=PATH]         Set path of LAM MPI ],