aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2012-02-25 23:59:58 +0100
committerThomas White <taw@bitwiz.org.uk>2012-02-25 23:59:58 +0100
commitd737f85c66ee8e8f759069858ef5fc9788a32b87 (patch)
tree9e807dab8ad35fc3e9eb9b000322fd5cb920b90f /libcrystfel
parent675e9292f0488f4ee9ec1c3f4dd145c949321ddf (diff)
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.
Diffstat (limited to 'libcrystfel')
-rw-r--r--libcrystfel/src/cell.c2
-rw-r--r--libcrystfel/src/filters.c4
-rw-r--r--libcrystfel/src/utils.c2
3 files changed, 0 insertions, 8 deletions
diff --git a/libcrystfel/src/cell.c b/libcrystfel/src/cell.c
index 59910605..63843b50 100644
--- a/libcrystfel/src/cell.c
+++ b/libcrystfel/src/cell.c
@@ -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)
diff --git a/libcrystfel/src/filters.c b/libcrystfel/src/filters.c
index 5bfab0ab..3c5d91b3 100644
--- a/libcrystfel/src/filters.c
+++ b/libcrystfel/src/filters.c
@@ -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
diff --git a/libcrystfel/src/utils.c b/libcrystfel/src/utils.c
index bc1408e7..1572aceb 100644
--- a/libcrystfel/src/utils.c
+++ b/libcrystfel/src/utils.c
@@ -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