From ebf81a687573e61c9f979f02809b6e98e10ad02a Mon Sep 17 00:00:00 2001
From: Thomas White <taw@bitwiz.org.uk>
Date: Sun, 16 Jan 2011 18:53:45 +0100
Subject: Only use gl_IGNORE_UNUSED_LIBRARIES with recent GSL

Old GSL doesn't play nicely with this option.
---
 configure.ac | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'configure.ac')

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"
-- 
cgit v1.2.3