From 62ed358058509abe847a0e9f1854b0e39d81ca6b Mon Sep 17 00:00:00 2001
From: Thomas White <taw@bitwiz.org.uk>
Date: Sat, 12 Feb 2011 12:26:07 -0800
Subject: Restore --with-gsl in configure

---
 configure | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 28a70f28..e30aa7c8 100755
--- a/configure
+++ b/configure
@@ -807,6 +807,7 @@ enable_option_checking
 enable_dependency_tracking
 enable_silent_rules
 with_hdf5
+with_gsl
 enable_gsl_fudge
 enable_opencl
 enable_gtk
@@ -1474,6 +1475,8 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-hdf5             specify location of HDF5 library
+  --with-gsl              specify location of GSL (instead of using
+                          pkg-config)
   --with-libtiff          specify location of libTIFF library
 
 Some influential environment variables:
@@ -6334,6 +6337,12 @@ $as_echo "no" >&6; }
 	fi
 fi
 
+# Check whether --with-gsl was given.
+if test "${with_gsl+set}" = set; then :
+  withval=$with_gsl; GSL_CFLAGS="-I$withval/include"
+ GSL_LIBS="-L$withval/lib -lgsl -lgslcblas -lm"
+else
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSL" >&5
 $as_echo_n "checking for GSL... " >&6; }
@@ -6391,13 +6400,13 @@ fi
 	echo "$GSL_PKG_ERRORS" >&5
 
 
-   as_fn_error $? "GSL is required" "$LINENO" 5
+    as_fn_error $? "GSL is required" "$LINENO" 5
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-   as_fn_error $? "GSL is required" "$LINENO" 5
+    as_fn_error $? "GSL is required" "$LINENO" 5
 
 else
 	GSL_CFLAGS=$pkg_cv_GSL_CFLAGS
@@ -6407,6 +6416,9 @@ $as_echo "yes" >&6; }
 
 fi
 
+fi
+
+
 
 # Check whether --enable-gsl-fudge was given.
 if test "${enable_gsl_fudge+set}" = set; then :
-- 
cgit v1.2.3