Changeset 2129


Ignore:
Timestamp:
Dec 23, 2009, 5:58:30 AM (12 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:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEWS

    r2123 r2129  
    55Version 0.6 (released DATE)
    66
    7   - Behavior of operator==(DataWeightProxy, DataWeightProxy) ws modified (#578)
     7  - new configure option `--with-gsl` (#544)
     8  - configure option `--with-gsl-prefix` is deprecated (#544)
     9  - configure option `--with-gsl-exec-prefix` is deprecated (#544)
     10  - Behavior of operator==(DataWeightProxy, DataWeightProxy) is modified (#578)
    811  - several constructors in namespace random are now declared explicit (#571)
    912  - pair_first_iterator and pair_second_iterator now work with
  • trunk/README

    r2119 r2129  
    4343GNU Scientific Library, [http://www.gnu.org/software/gsl/ GSL] version
    44441.8 or later. If you have GSL installed in a non-standard location,
    45 `./configure --with-gsl-prefix=DIR` can be useful to provide the
    46 location of GSL. The `gsl-config` script, which is used to retrieve
    47 needed compiler and linker flags, is expected to be found in
    48 `DIR/bin/`.
     45`./configure --with-gsl=DIR` can be useful to provide the location of
     46GSL. The `gsl-config` script, which is used to retrieve needed
     47compiler and linker flags, is expected to be found in `DIR/bin/`. The
     48check for existing GSL can be turned off with option
     49`--without-gsl`. This can be useful, for example, if gsl-config is not
     50available at configure time but header file will be available at make
     51time.
    4952
    5053=== BLAS ===
     
    7679installed in a non-standard location, `./configure --with-boost=DIR`
    7780can be useful to provide the location of Boost. Boost header files are
    78 expected to be found in `DIR/include`.
     81expected to be found in `DIR/include`. The check for boost header
     82files can be turned off with `--without-boost`.
    7983
    8084=== quiet nan ===
  • trunk/configure.ac

    r2128 r2129  
    4848AC_CONFIG_HEADER([config.h])
    4949AM_INIT_AUTOMAKE([1.10 std-options])
     50
     51dnl The empty help-string for --with-gsl-prefix and
     52dnl --with-gsl-exec-prefix creates an empty line in middle of help
     53dnl output. This hacks move the line to above 'Optional Packages:',
     54dnl which is prettier.
     55dnl
     56dnl FIXME: remove when we removed support for --with-gsl-prefix and
     57dnl --with-gsl-exec-prefix
     58m4_divert_once([HELP_WITH], [])
    5059
    5160# Set default programming language
  • trunk/m4/gsl.m4

    r2103 r2129  
    55AC_DEFUN([AX_PATH_GSL],
    66[
    7 AC_ARG_WITH(gsl-prefix,[  --with-gsl-prefix=PFX   Prefix where GSL is installed (optional)],
    8             gsl_prefix="$withval", gsl_prefix="")
    9 AC_ARG_WITH(gsl-exec-prefix,[  --with-gsl-exec-prefix=PFX Exec prefix where GSL is installed (optional)],
    10             gsl_exec_prefix="$withval", gsl_exec_prefix="")
     7AC_ARG_WITH([gsl-prefix],[],
     8            [AC_MSG_WARN([option --with-gsl-prefix is deprecated])
     9             gsl_prefix="$withval"], [gsl_prefix=""])
     10
     11AC_ARG_WITH([gsl-exec-prefix],[],
     12            [AC_MSG_WARN([option --with-gsl-exec-prefix is deprecated])
     13             gsl_exec_prefix="$withval"], [gsl_exec_prefix=""])
    1114
    1215  if test "x${GSL_CONFIG+set}" != xset ; then
     
    1619     if test "x$gsl_exec_prefix" != x ; then
    1720        GSL_CONFIG="$gsl_exec_prefix/bin/gsl-config"
     21     fi
     22     if test "x$with_gsl" != x ; then
     23        GSL_CONFIG="$with_gsl/bin/gsl-config"
    1824     fi
    1925  fi
  • trunk/m4/yat_gsl.m4

    r2093 r2129  
    3232  AC_PREREQ([2.63]) dnl we use YAT_CHECK_GSL_HEADER
    3333  yat_gsl_status="ok"
    34   AX_PATH_GSL([$1],,[yat_gsl_status="no"])
     34  AC_ARG_WITH([gsl],
     35              [AS_HELP_STRING([--with-gsl=DIR], [prefix for gsl installation])])
     36
     37  AS_IF([with_gsl], [no], [yat_gsl_status=skip])       
     38
     39  AS_IF([test "x$yat_gsl_status" = "xok"], [
     40           AX_PATH_GSL([$1],,[yat_gsl_status="no"])
     41        ])
    3542
    3643  AS_IF([test "x$yat_gsl_status" = "xok"],
     
    4754        ])
    4855
    49   AS_IF([test "x$yat_gsl_status" = "xok"],
    50         [m4_default([$2], [:])],
    51         [m4_default([$3], [:])])
     56  AS_CASE([$yat_gsl_status],
     57          [ok], [m4_default([$2], [:])],
     58          [skip], [:],
     59          [m4_default([$3], [:])])
    5260
    5361
Note: See TracChangeset for help on using the changeset viewer.