Changeset 2129

Timestamp:

Dec 23, 2009, 5:58:30 AM (13 years ago)

Author:

Peter

Message:

New configure option 'with-gsl=DIR'. This option also accepts 'no' as
an argument or equivalently '--without-gsl' in which case no check for
GSL will be performed. The old --with-gsl-prefix and
--with-gsl-exec-prefix are deprecated.

fixes #544

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• README (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• m4/gsl.m4 (modified) (2 diffs)
• m4/yat_gsl.m4 (modified) (2 diffs)

trunk/NEWS

@@ -5 +5 @@
 Version 0.6 (released DATE)
 
-  - Behavior of operator==(DataWeightProxy, DataWeightProxy) ws modified (#578)
+  - new configure option `--with-gsl` (#544)
+  - configure option `--with-gsl-prefix` is deprecated (#544)
+  - configure option `--with-gsl-exec-prefix` is deprecated (#544)
+  - Behavior of operator==(DataWeightProxy, DataWeightProxy) is modified (#578)
   - several constructors in namespace random are now declared explicit (#571)
   - pair_first_iterator and pair_second_iterator now work with

trunk/README

@@ -43 +43 @@
 GNU Scientific Library, [http://www.gnu.org/software/gsl/ GSL] version
 1.8 or later. If you have GSL installed in a non-standard location,
-`./configure --with-gsl-prefix=DIR` can be useful to provide the
-location of GSL. The `gsl-config` script, which is used to retrieve
-needed compiler and linker flags, is expected to be found in
-`DIR/bin/`.
+`./configure --with-gsl=DIR` can be useful to provide the location of
+GSL. The `gsl-config` script, which is used to retrieve needed
+compiler and linker flags, is expected to be found in `DIR/bin/`. The
+check for existing GSL can be turned off with option
+`--without-gsl`. This can be useful, for example, if gsl-config is not
+available at configure time but header file will be available at make
+time.
 
 === BLAS ===
@@ -76 +79 @@
 installed in a non-standard location, `./configure --with-boost=DIR`
 can be useful to provide the location of Boost. Boost header files are
-expected to be found in `DIR/include`.
+expected to be found in `DIR/include`. The check for boost header
+files can be turned off with `--without-boost`.
 
 === quiet nan ===

trunk/configure.ac

@@ -48 +48 @@
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([1.10 std-options])
+
+dnl The empty help-string for --with-gsl-prefix and
+dnl --with-gsl-exec-prefix creates an empty line in middle of help
+dnl output. This hacks move the line to above 'Optional Packages:',
+dnl which is prettier.
+dnl
+dnl FIXME: remove when we removed support for --with-gsl-prefix and
+dnl --with-gsl-exec-prefix
+m4_divert_once([HELP_WITH], [])
 
 # Set default programming language

trunk/m4/gsl.m4

@@ -5 +5 @@
 AC_DEFUN([AX_PATH_GSL],
 [
-AC_ARG_WITH(gsl-prefix,[  --with-gsl-prefix=PFX   Prefix where GSL is installed (optional)],
-            gsl_prefix="$withval", gsl_prefix="")
-AC_ARG_WITH(gsl-exec-prefix,[  --with-gsl-exec-prefix=PFX Exec prefix where GSL is installed (optional)],
-            gsl_exec_prefix="$withval", gsl_exec_prefix="")
+AC_ARG_WITH([gsl-prefix],[],
+            [AC_MSG_WARN([option --with-gsl-prefix is deprecated])
+             gsl_prefix="$withval"], [gsl_prefix=""])
+
+AC_ARG_WITH([gsl-exec-prefix],[],
+            [AC_MSG_WARN([option --with-gsl-exec-prefix is deprecated])
+             gsl_exec_prefix="$withval"], [gsl_exec_prefix=""])
 
   if test "x${GSL_CONFIG+set}" != xset ; then
@@ -16 +19 @@
      if test "x$gsl_exec_prefix" != x ; then
         GSL_CONFIG="$gsl_exec_prefix/bin/gsl-config"
+     fi
+     if test "x$with_gsl" != x ; then
+        GSL_CONFIG="$with_gsl/bin/gsl-config"
      fi
   fi

trunk/m4/yat_gsl.m4

@@ -32 +32 @@
   AC_PREREQ([2.63]) dnl we use YAT_CHECK_GSL_HEADER
   yat_gsl_status="ok" 
-  AX_PATH_GSL([$1],,[yat_gsl_status="no"])
+  AC_ARG_WITH([gsl], 
+              [AS_HELP_STRING([--with-gsl=DIR], [prefix for gsl installation])])
+
+  AS_IF([with_gsl], [no], [yat_gsl_status=skip])        
+
+  AS_IF([test "x$yat_gsl_status" = "xok"], [
+           AX_PATH_GSL([$1],,[yat_gsl_status="no"])
+        ])
 
   AS_IF([test "x$yat_gsl_status" = "xok"],
@@ -47 +54 @@
         ])
 
-  AS_IF([test "x$yat_gsl_status" = "xok"],
-        [m4_default([$2], [:])],
-        [m4_default([$3], [:])])
+  AS_CASE([$yat_gsl_status], 
+          [ok], [m4_default([$2], [:])],
+          [skip], [:],
+          [m4_default([$3], [:])])