Commit d737f85c authored by Thomas White's avatar Thomas White
Browse files

Make --enable-gsl-fudge the default

There's absolutely no sensible reason why this should be optional - it doesn't cause
any difficulties when enabled.
parent 675e9292
......@@ -9,9 +9,6 @@
/* Define to 1 when the gnulib module strnlen should be tested. */
#undef GNULIB_TEST_STRNLEN
/* Define to 1 if the GSL fudge is needed */
#undef GSL_FUDGE
/* Define to 1 if you have the <bp-sym.h> header file. */
#undef HAVE_BP_SYM_H
......
......@@ -38,19 +38,6 @@ AC_ARG_WITH(gsl,
[PKG_CHECK_MODULES([GSL], [gsl])])
AC_ARG_ENABLE(gsl-fudge, AS_HELP_STRING([--enable-gsl-fudge],
[Use this option if you get lots of linker errors concerning GSL and CBLAS]))
AC_MSG_CHECKING([whether to use the GSL CBLAS fudge])
AS_IF([test "x$enable_gsl_fudge" == "xyes"],
[
AC_MSG_RESULT([yes])
AC_DEFINE([GSL_FUDGE], [1], [Define to 1 if the GSL fudge is needed])
],
[
AC_MSG_RESULT([no])
])
AC_ARG_WITH(opencl, AS_HELP_STRING([--with-opencl], [Use OpenCL]))
AC_MSG_CHECKING([whether to use OpenCL])
AS_IF([test "x$with_opencl" == "xyes"],
......
......@@ -1090,13 +1090,11 @@ UnitCell *load_cell_from_pdb(const char *filename)
}
#ifdef GSL_FUDGE
/* Force the linker to bring in CBLAS to make GSL happy */
void cell_fudge_gslcblas()
{
STATUS("%p\n", cblas_sgemm);
}
#endif
UnitCell *rotate_cell(UnitCell *in, double omega, double phi, double rot)
......
......@@ -32,9 +32,7 @@
#include <string.h>
#include <assert.h>
#include <gsl/gsl_statistics_int.h>
#ifdef GSL_FUDGE
#include <gsl/gsl_blas.h>
#endif
#include "image.h"
......@@ -133,10 +131,8 @@ void filter_noise(struct image *image, float *old)
}
#ifdef GSL_FUDGE
/* Force the linker to bring in CBLAS to make GSL happy */
void filters_fudge_gslcblas()
{
STATUS("%p\n", cblas_sgemm);
}
#endif
......@@ -492,10 +492,8 @@ char *safe_basename(const char *in)
}
#ifdef GSL_FUDGE
/* Force the linker to bring in CBLAS to make GSL happy */
void utils_fudge_gslcblas()
{
STATUS("%p\n", cblas_sgemm);
}
#endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment