fftw: turning greping for -m* in CFLAGS into ia32 specific queries

(cherry picked from commit 223d89e5c64ce9685c8332d1a97bfe6d6efb7f2f)

3 files changed, 20 insertions, 24 deletions

diff --git a/libs/fftw/BUILD b/libs/fftw/BUILD
index 3adf54bd3a..34b53b619a 100755
--- a/libs/fftw/BUILD
+++ b/libs/fftw/BUILD
@@ -1,36 +1,20 @@
-if list_find "$CFLAGS" sse2; then
-	DOUBLEOPTS="$DOUBLEOPTS --enable-sse2"
-fi
-if list_find "$CFLAGS" sse; then
-	FLOATOPTS="$FLOATOPTS --enable-sse"
-fi
-if list_find "$CFLAGS" altivec; then
-	FLOATOPTS="$FLOATOPTS --enable-altivec"
-fi
-if list_find "$CFLAGS" 3dnow; then
-	FLOATOPTS="$FLOATOPTS --enable-k7"
-fi
-if list_find "$CFLAGS" powerpc; then
-	OPTS="$OPTS --enable-fma"
-fi
 if [[ $FORTRAN == "n" ]]; then
-	OPTS="$OPTS --disable-fortran"
-fi
-CFLAGS="${CFLAGS/-Os/}"
-OPTS="$OPTS $FFTW_THREADS"                 &&
-
+  OPTS="$OPTS --disable-fortran"
+fi &&
+CFLAGS="${CFLAGS/-Os/}" &&
+OPTS="$OPTS $FFTW_THREADS $FFTW_OPTS"      &&
 cd $SOURCE_DIRECTORY/fftw-single-$VERSION  &&
 ./configure  --prefix=${INSTALL_ROOT}/usr  \
              --enable-shared               \
              --enable-float                \
              --enable-type-prefix          \
-      $OPTS $FLOATOPTS                     &&
+      $OPTS $FFTW_FLOATOPTS                &&
 make                                       &&
 cd $SOURCE_DIRECTORY/fftw-double-$VERSION  &&
 ./configure  --prefix=${INSTALL_ROOT}/usr  \
              --enable-shared               \
              --enable-type-prefix          \
-      $OPTS $DOUBLEOPTS                    &&
+      $OPTS $FFTW_DOUBLEOPTS               &&
 make                                       &&
 cd $SOURCE_DIRECTORY/fftw-longdouble-$VERSION  &&
 ./configure  --prefix=${INSTALL_ROOT}/usr  \
diff --git a/libs/fftw/CONFIGURE b/libs/fftw/CONFIGURE
index 5783e3f5df..3fb99fc35c 100755
--- a/libs/fftw/CONFIGURE
+++ b/libs/fftw/CONFIGURE
@@ -2,5 +2,13 @@ config_query_option FFTW_THREADS "Compile FFTW SMP threads library?" n \
                     "--enable-threads --with-combined-threads"         \
                     "--disable-threads --without-combined-threads"    &&
 
-config_query FORTRAN "Compile in fortran bindings?" n
-
+config_query FORTRAN "Compile in fortran bindings?" n &&
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
+  config_query_option FFTW_DOUBLEOPTS  "x86: enable SSE2 for doubles?" n --enable-sse2 --enable-sse2  &&
+  config_query_option FFTW_FLOATOPTS "x86: enable SSE for floats?" n --enable-sse --disable-sse &&
+  config_query_option FFTW_FLOATOPTS "x86: enable K7 opts (incl. 3DNow) for floats?" n --enable-k7 --disable-k7
+fi &&
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ppc" ]]; then
+  config_query_option FFTW_FLOATOPTS "ppc: enable AltiVec for floats?" n --enable-altivec --disable-altivec
+fi &&
+config_query_option FFTW_OPTS "Enable opts for fused multiply-add (p.ex. ppc)?" n --enable-fma --disable-fma
diff --git a/libs/fftw/HISTORY b/libs/fftw/HISTORY
index c9f52e0fa3..be2d7f5d69 100644
--- a/libs/fftw/HISTORY
+++ b/libs/fftw/HISTORY
@@ -1,3 +1,7 @@
+2007-02-16 Thomas Orgis <sobukus@sourcemage.org>
+	* CONFIGURE,BUILD: turn grepping of CFLAGS into queries for
+	  special optimizations, accompanying --enable with --disable
+
 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
 	* PROVIDES: [automated] Fixed invalid entries.