diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2011-01-16 18:53:45 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:11 +0100 |
| commit | ebf81a687573e61c9f979f02809b6e98e10ad02a (patch) | |
| tree | ee383dba8b04b736bdff89be44b12e7906628b42 /configure.ac | |
| parent | 63dc461a73ba698ccbab42ae3d4427810b1af14e (diff) | |
Only use gl_IGNORE_UNUSED_LIBRARIES with recent GSL
Old GSL doesn't play nicely with this option.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index da550a85..df17b31c 100644 --- a/configure.ac +++ b/configure.ac @@ -30,11 +30,14 @@ AC_ARG_WITH(hdf5, [HDF5_LIBS="-lhdf5"]) -AC_ARG_WITH(gsl, -[AS_HELP_STRING([--with-gsl], [specify location of GSL])], -[GSL_CFLAGS="-I$withval/include" - GSL_LIBS="-L$withval/lib -lgsl -lgslcblas"], -[GSL_LIBS="-lgsl -lgslcblas"]) +PKG_CHECK_MODULES([GSL], [gsl], [], +[ + AC_ERROR([GSL is required]) +]) +PKG_CHECK_MODULES([GSL_version], [gsl >= 1.13], +[ + gl_IGNORE_UNUSED_LIBRARIES +]) AC_ARG_ENABLE(opencl, AS_HELP_STRING([--enable-opencl], [Enable the use of OpenCL])) @@ -153,9 +156,6 @@ PKG_CHECK_MODULES([GDK_pixbuf], [gdk-pixbuf], [], ]) -gl_IGNORE_UNUSED_LIBRARIES - - CFLAGS="$CFLAGS $HDF5_CFLAGS $GSL_CFLAGS $OPENCL_CFLAGS -pthread $GTK_CFLAGS" CFLAGS="$CFLAGS $LIBTIFF_CFLAGS -D_GNU_SOURCE $libPNG_CFLAGS $Cairo_CFLAGS" CFLAGS="$CFLAGS $GDK_pixbuf_CFLAGS $GDK_pixbuf_2_CFLAGS" |