[Commit-gnuradio] r9868 - gnuradio/branches/developers/eb/frank/config

[eb]

Author: eb
Date: 2008-10-26 23:55:21 -0600 (Sun, 26 Oct 2008)
New Revision: 9868

Modified:
   gnuradio/branches/developers/eb/frank/config/grc_gnuradio_core.m4
Log:
Refactored check for gsl and cblas such that the error msg now
references gsl, not cblas.  Installing gsl (which comes with it's own
cblas) is much easier than figuring out which of the umpteen cblas
implementations you want...


Modified: gnuradio/branches/developers/eb/frank/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/branches/developers/eb/frank/config/grc_gnuradio_core.m4   
2008-10-27 05:38:39 UTC (rev 9867)
+++ gnuradio/branches/developers/eb/frank/config/grc_gnuradio_core.m4   
2008-10-27 05:55:21 UTC (rev 9868)
@@ -37,14 +37,12 @@
     dnl   yes  : if the --enable code passed muster and all dependencies are 
met
     dnl   no   : otherwise
     if test $passed = yes; then        
-       dnl look for fast CBLAS for GSL
-       ACX_CBLAS([],[passed=no; AC_MSG_RESULT([gnuradio-core requires a CBLAS 
library, not found.])])
-       if test $passed = yes; then
-            dnl check for GSL
-           PKG_CHECK_MODULES(GSL, gsl >= 1.10,
-               [], dnl FIXME remove -lgslcblas from GSL_LIBS
-               [passed=no;AC_MSG_RESULT([gnuradio-core requires package gsl, 
not found.])])
-        fi
+       dnl look for fast CBLAS for GSL, but don't complain if not found
+       ACX_CBLAS([],[])
+        dnl check for GSL
+       PKG_CHECK_MODULES(GSL, gsl >= 1.10,
+           [], dnl FIXME remove -lgslcblas from GSL_LIBS if we found a better 
CBLAS_LIBS above
+           [passed=no;AC_MSG_RESULT([gnuradio-core requires package gsl, not 
found.])])
     fi
 
     if test $passed != with; then