X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.ac;h=930c62a2d65976362581aa3af73d07993f62c2cc;hp=b3cf1c2599b7e48b3955d981445f0d0a1cfa9e32;hb=4ff226fc6afb090a5211f3c0c12650207609ba90;hpb=e8462f7431582627e44906239077f1c696eefba1

diff --git a/configure.ac b/configure.ac
index b3cf1c2..930c62a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,9 @@ AC_PROG_RANLIB
 
 AC_PROG_CC
 AC_PROG_CXX
+CFLAGS=""
+CXXFLAGS=""
+
 AC_C_BIGENDIAN
 
 AC_PATH_PROG(wxconfig,wx-config)
@@ -59,7 +62,6 @@ AC_CHECK_SIZEOF(long, 4)
 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])])
@@ -127,19 +129,13 @@ if test "${getopt_long}" = "false" ; then
 fi
 AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test "$GETOPTLONG"="1")
 
+ARCH_OPTION=""
 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*)
@@ -189,7 +185,7 @@ if test "$debug" = "true" ; then
   CFLAGS="$CFLAGS -g -O0 -DDEBUG"
   AC_DEFINE(DEBUG,1,[turn on debugging])
 else
-  CFLAGS="$CFLAGS -O2 -DNDEBUG -fomit-frame-pointer"
+  CFLAGS="$CFLAGS -g -O4 -DNDEBUG -fomit-frame-pointer"
   AC_DEFINE(NDEBUG,1,[no debugging])
 fi
 
@@ -211,9 +207,7 @@ AC_MSG_CHECKING(sstream)
 
 CFLAGS="$CFLAGS -Wall"
 AC_MSG_CHECKING(whether to enable verbose warnings)
-AC_ARG_ENABLE(verbose-warnings,
-[  --enable-verbose-warnings
-                          Enable verbose compiler warnings.],
+AC_ARG_ENABLE(verbose-warnings,AS_HELP_STRING([--enable-verbose-warnings],[Enable verbose compiler warnings.]),
 [ case "$enableval" in
   yes)
     AC_MSG_RESULT(yes)
@@ -226,9 +220,7 @@ AC_ARG_ENABLE(verbose-warnings,
 )
 
 AC_MSG_CHECKING(static executables)
-AC_ARG_ENABLE(static,
-[  --enable-static
-                            Enable static executables.],
+AC_ARG_ENABLE(static,AS_HELP_STRING([--enable-static],[Enable static executables]),
 [ case "$enableval" in
   yes)
     AC_MSG_RESULT(yes)
@@ -240,9 +232,16 @@ AC_ARG_ENABLE(static,
   esac ], AC_MSG_RESULT(no)
 )
 
+dnl Checking if use OpenMP
+AC_ARG_ENABLE([openmp], AS_HELP_STRING([--disable-openmp],[Disable use of OpenMP]))
+AS_IF([test "x$enable_openmp" != "xno"], [
+    AX_OPENMP
+    CFLAGS="$CFLAGS $OPENMP_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
+])
+
 dnl Set LAM path
-AC_ARG_WITH(lam,
-[  --with-lam[=PATH]         Set path of LAM MPI ],
+AC_ARG_WITH(lam,AS_HELP_STRING([--with-lam[=PATH]],[Set path of LAM MPI ]),
 [    if test "$withval" != "no" ; then
          trylamdir=$withval
      fi ]
@@ -462,7 +461,7 @@ dnl Check for efence
 AC_CHECK_LIB(efence, main, [efence=true], [efence=false])
 AC_MSG_CHECKING([for enable-efence])
 AC_ARG_ENABLE(efence,
-[  --enable-efence        Use ElectricFence memory allocation],
+[--enable-efence],[Use ElectricFence memory allocation],
 [case "${enableval}" in
   yes) useefence=true 
        AC_MSG_RESULT(yes)