[Lunar-commits] r23764 - moonbase/trunk/libs/fftw3

[Dennis Veatch]

Author: stumbles
Date: 2007-03-21 11:00:24 +0100 (Wed, 21 Mar 2007)
New Revision: 23764

Removed:
   moonbase/trunk/libs/fftw3/CONFIGURE
Modified:
   moonbase/trunk/libs/fftw3/BUILD
   moonbase/trunk/libs/fftw3/DETAILS
Log:

Ran into bit of a snag with the rosegarden bump. It wanted fftw3
float libs, libfftw3f.* . Well the way the current BUILD is, it 
would remove all the non float libs. Which would cause other 
modules like amarok, grass, libofa (to name a few) to crap out 
because there were no libfftw3 libs.

This fixes it so we now can have both lib types present.

Bumping the date so everyone can get it now in case they have said
"y" to float.



Modified: moonbase/trunk/libs/fftw3/BUILD
===================================================================
--- moonbase/trunk/libs/fftw3/BUILD	2007-03-21 03:33:30 UTC (rev 23763)
+++ moonbase/trunk/libs/fftw3/BUILD	2007-03-21 10:00:24 UTC (rev 23764)
@@ -1,11 +1,21 @@
 (
 
-  OPTS="$OPTS --enable-shared"
+# In order to have fftw3 float libs *AND* non-float libs.
+# We have to do this twice.
 
-  if [[ "$ENABLE_FLOAT" == "y" ]]; then
-    OPTS="$OPTS --enable-float"
-  fi &&
+  ./configure   --prefix=/usr       \
+                --enable-shared     \
+                --enable-float      \
+                $OPTS              &&
 
-  default_build
+  default_make    &&
 
+  make distclean  &&
+
+  ./configure   --prefix=/usr       \
+                --enable-shared     \
+                $OPTS              &&
+
+  default_make
+
 ) > $C_FIFO 2>&1

Deleted: moonbase/trunk/libs/fftw3/CONFIGURE

Modified: moonbase/trunk/libs/fftw3/DETAILS
===================================================================
--- moonbase/trunk/libs/fftw3/DETAILS	2007-03-21 03:33:30 UTC (rev 23763)
+++ moonbase/trunk/libs/fftw3/DETAILS	2007-03-21 10:00:24 UTC (rev 23764)
@@ -6,7 +6,7 @@
       SOURCE_VFY=sha1:3e4c64009ffb48123a0f30f46c1d89da7810dc67
         WEB_SITE=http://www.fftw.org/
          ENTERED=20011207
-         UPDATED=20060706
+         UPDATED=20070321
 	   SHORT="Fast Fourier Tranform C Library"
 
 cat << EOF