diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2011-02-12 12:26:07 -0800 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:14 +0100 |
| commit | 62ed358058509abe847a0e9f1854b0e39d81ca6b (patch) | |
| tree | d4bca21be7d4dfcb3214a12e7a8c20c095720c9c | |
| parent | d484070b401124dfde08801c8e56458a42335b70 (diff) | |
Restore --with-gsl in configure
| -rwxr-xr-x | configure | 16 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 22 insertions, 5 deletions
@@ -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 : diff --git a/configure.ac b/configure.ac index 32eba669..f7eac7e6 100644 --- a/configure.ac +++ b/configure.ac @@ -30,9 +30,14 @@ AC_ARG_WITH(hdf5, [HDF5_LIBS="-lhdf5"]) -PKG_CHECK_MODULES([GSL], [gsl], [], -[ - AC_ERROR([GSL is required]) +AC_ARG_WITH(gsl, +[AS_HELP_STRING([--with-gsl], [specify location of GSL (instead of using pkg-config)])], +[GSL_CFLAGS="-I$withval/include" + GSL_LIBS="-L$withval/lib -lgsl -lgslcblas -lm"], +[PKG_CHECK_MODULES([GSL], [gsl], [], + [ + AC_ERROR([GSL is required]) + ]) ]) |