From 4a05bef5d0559b2fff8a94baf59e55216b059493 Mon Sep 17 00:00:00 2001
From: Martin Reinecke <martin@mpa-garching.mpg.de>
Date: Wed, 18 Jul 2012 13:24:03 +0200
Subject: [PATCH] new handling of vector capabilities

---
 configure.ac             | 22 ----------------------
 libsharp/sharp_vecutil.h |  4 ++--
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/configure.ac b/configure.ac
index cb3ddc6..ee0283a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,20 +40,6 @@ AC_ARG_ENABLE(debug,
      ENABLE_DEBUG=yes
    fi])
 
-ENABLE_SSE2=yes
-AC_ARG_ENABLE(sse2,
-  [  --disable-sse2          disable generation of SSE2 instructions],
-  [if test "$enableval" = no; then
-     ENABLE_SSE2=no
-   fi])
-
-ENABLE_AVX=yes
-AC_ARG_ENABLE(avx,
-  [  --disable-avx           disable generation of AVX instructions],
-  [if test "$enableval" = no; then
-     ENABLE_AVX=no
-   fi])
-
 case $CCTYPE in
   gcc)
     CCFLAGS="-O3 -fno-tree-vectorize -ffast-math -fomit-frame-pointer -std=c99 -pedantic -Wextra -Wall -Wno-unknown-pragmas -Wshadow -Wmissing-prototypes -Wfatal-errors"
@@ -102,14 +88,6 @@ if test $ENABLE_MPI = yes; then
   CCFLAGS="$CCFLAGS -DUSE_MPI"
 fi
 
-if test $ENABLE_SSE2 = no; then
-  CCFLAGS="$CCFLAGS -DDISABLE_SSE2"
-fi
-
-if test $ENABLE_AVX = no; then
-  CCFLAGS="$CCFLAGS -DDISABLE_AVX"
-fi
-
 CCFLAGS_NO_C="$CCFLAGS $CPPFLAGS"
 
 LDCCFLAGS="$LDFLAGS $CCFLAGS"
diff --git a/libsharp/sharp_vecutil.h b/libsharp/sharp_vecutil.h
index 5b64c5a..fb6b60f 100644
--- a/libsharp/sharp_vecutil.h
+++ b/libsharp/sharp_vecutil.h
@@ -32,9 +32,9 @@
 #ifndef SHARP_VECUTIL_H
 #define SHARP_VECUTIL_H
 
-#if (defined (__AVX__) && (!defined (DISABLE_AVX)) && (!defined (DISABLE_SSE2)))
+#if (defined (__AVX__))
 #define VLEN 4
-#elif (defined (__SSE2__) && (!defined (DISABLE_SSE2)))
+#elif (defined (__SSE2__))
 #define VLEN 2
 #else
 #define VLEN 1