[Ecm-commits] r2430 - trunk

cvs commits ecm-commits at lists.gforge.inria.fr
Thu Feb 21 13:21:29 CET 2013


Author: zimmerma
Date: 2013-02-21 13:21:29 +0100 (Thu, 21 Feb 2013)
New Revision: 2430

Log:
removed libgsl dependency for the user, since this is only required for
development work, cf http://trac.sagemath.org/sage_trac/ticket/14151#comment:20


Modified:
   trunk/TODO
   trunk/configure.in
   trunk/rho.c
Modified: trunk/TODO
===================================================================
--- trunk/TODO	2013-02-21 10:27:05 UTC (rev 2429)
+++ trunk/TODO	2013-02-21 12:21:29 UTC (rev 2430)
@@ -100,10 +100,6 @@
 3) documentation
 
 4) installation
-- don't check for gslcblas (HAVE_LIBGSLCBLAS) since we don't use it
-- instead of checking always for GSL, check it only when requested by
-  the user with --with-cblas
-  (cf http://trac.sagemath.org/sage_trac/ticket/14151#comment:20)
 - check for __builtin_constant_p and __builtin_expect at configure time
 - [suggested by Peter Montgomery] add the possibility to compile a "fat"
   binary, which automatically selects the best mulredc assembly code

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2013-02-21 10:27:05 UTC (rev 2429)
+++ trunk/configure.in	2013-02-21 12:21:29 UTC (rev 2430)
@@ -374,20 +374,6 @@
 AC_CHECK_LIB(m,cos)
 AC_CHECK_LIB(rt,aio_read)
 
-dnl Check for GSL but don't add it to LIBS, since only rho uses it and
-dnl we don't want all other binaries to depend on it. 
-dnl If found, pass link flags to Makefile via GSL_LD_FLAGS
-GSL_LD_FLAGS=
-dnl Check if "-lgslcblas" works. If yes, check if "-lgsl -lgslcblas" works.
-dnl If both work, put "-lgsl -lgslcblas" in GSL_LD_FLAGS
-AC_CHECK_LIB([gslcblas],[cblas_dgemm], dnl
- [AC_CHECK_LIB([gsl],[gsl_blas_dgemm], dnl
-  [AC_DEFINE([HAVE_LIBGSL],1,[Define to 1 if you have the `gsl' library (-lgsl).])
-   AC_DEFINE([HAVE_LIBGSLCBLAS],1,[Define to 1 if you have the `gslcblas' library (-lgslcblas).])
-   GSL_LD_FLAGS="-lgsl -lgslcblas"], [], dnl
-   dnl Here comes the "OTHER-LIBRARIES" field for AC_CHECK_LIB [gsl]:
-   [-lgslcblas])])
-
 AC_CHECK_FUNCS([isascii memset strchr strlen strncasecmp strstr], [], [AC_MSG_ERROR([required function missing])])
 AC_CHECK_FUNCS([access unlink], [], [AC_MSG_ERROR([required function missing])])
 AC_CHECK_FUNCS([isspace isdigit isxdigit], [], [AC_MSG_ERROR([required function missing])])

Modified: trunk/rho.c
===================================================================
--- trunk/rho.c	2013-02-21 10:27:05 UTC (rev 2429)
+++ trunk/rho.c	2013-02-21 12:21:29 UTC (rev 2430)
@@ -1,7 +1,7 @@
 /* Dickman's rho function (to compute probability of success of ecm).
 
-Copyright 2004, 2005, 2006, 2008, 2009, 2010, 2011 Alexander Kruppa,
-Paul Zimmermann.
+Copyright 2004, 2005, 2006, 2008, 2009, 2010, 2011, 2012, 2013
+Alexander Kruppa, Paul Zimmermann.
 
 This file is part of the ECM Library.
 
@@ -20,6 +20,9 @@
 http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */
 
+/* define TESTDRIVE to compile rho as a stand-alone program, in which case
+   you need to have libgsl installed */
+
 #include "config.h"
 #if defined(TESTDRIVE)
 #define _ISOC99_SOURCE 1
@@ -33,7 +36,7 @@
 #include <string.h>
 #include "primegen.h"
 #endif
-#if defined(TESTDRIVE) && defined(HAVE_LIBGSL)
+#if defined(TESTDRIVE)
 #include <gsl/gsl_math.h>
 #include <gsl/gsl_sf_expint.h>
 #include <gsl/gsl_integration.h>
@@ -240,7 +243,7 @@
 #endif /* TESTDRIVE */
 
 
-#if defined(TESTDRIVE) && defined(HAVE_LIBGSL)
+#if defined(TESTDRIVE)
 static double
 Li (const double x)
 {
@@ -315,7 +318,7 @@
 }
 
 
-#if defined(TESTDRIVE) && defined(HAVE_LIBGSL)
+#if defined(TESTDRIVE)
 
 /* The Buchstab omega(x) function, exact for x <= 4 where it can be 
    evaluated without numerical integration, and approximated by 
@@ -736,7 +739,7 @@
    This function estimates the \Phi(x,y) function via eq. (48) of the 1st
    edition resp. equation (6.49) of the 3rd edition of Tenenbaum's book. */
 
-#if defined(TESTDRIVE) && defined(HAVE_LIBGSL)
+#if defined(TESTDRIVE)
 
 static double 
 integrand1 (double x, double *y)




More information about the Ecm-commits mailing list