Changeset 3811


Ignore:
Timestamp:
Jul 8, 2019, 9:06:31 AM (4 months ago)
Author:
Peter
Message:

prefer variable assignment as autoconf time rather than at configure time and get rid of the variable in Makefile and gen_yat_pc script.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/build_support/Makefile.am

    r3792 r3811  
    6363  -e 's|@YAT_PATCH_VERSION[@]|$(YAT_PATCH_VERSION)|g' \
    6464  -e 's|@YAT_DEV_BUILD[@]|$(YAT_DEV_BUILD)|g' \
    65   -e 's|@gsl_version[@]|$(gsl_version)|g' \
    6665  -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
    67   -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
    68   -e 's|@min_boost_version[@]|$(min_boost_version)|g'
     66  -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g'
    6967
    7068build_support/yat-config: Makefile $(srcdir)/build_support/yat-config.in
  • trunk/build_support/gen_yat_pc.sh.in

    r3417 r3811  
    7777-e "s|@includedir[@]|${my_includedir}|g" \
    7878-e 's|@VERSION[@]|@VERSION@|g' \
    79 -e 's|@gsl_version[@]|@gsl_version@|g' \
    8079-e 's|@CPPFLAGS[@]|@CPPFLAGS@|g' \
    8180-e 's|@YAT_CPPFLAGS[@]|@YAT_CPPFLAGS@|g' \
  • trunk/configure.ac

    r3792 r3811  
    271271# GNU Scientific Library, GSL http://www.gnu.org/software/gsl/, checks
    272272# Including AX_PATH_GSL macro from gsl.m4 distributed by GSL
    273 gsl_version="1.8"
    274 AC_SUBST(gsl_version)
    275 YAT_CHECK_GSL([$gsl_version],[LIBS="-lgsl $LIBS"],[AC_MSG_FAILURE([dnl
    276 GSL $gsl_version (or newer) not found. The GNU Scientific Library
     273m4_define([YAT_REQUIRED_GSL_VERSION], [1.8])
     274YAT_CHECK_GSL([YAT_REQUIRED_GSL_VERSION],[LIBS="-lgsl $LIBS"],
     275   [AC_MSG_FAILURE([dnl
     276GSL YAT_REQUIRED_GSL_VERSION (or newer) not found. The GNU Scientific Library
    277277(GSL) library cannot be found. Please make sure GSL is installed.])
    278278])
     
    285285
    286286# Boost http://www.boost.org
    287 min_boost_version=1.35
    288 AC_SUBST(min_boost_version)
    289 AX_BOOST_BASE(["$min_boost_version"], [], [AC_MSG_FAILURE([dnl
    290 Boost ${min_boost_version} (or newer) not found. Please install boost, or provide
     287m4_define([YAT_REQUIRED_BOOST_VERSION], [1.35])
     288AX_BOOST_BASE([YAT_REQUIRED_BOOST_VERSION], [], [AC_MSG_FAILURE([dnl
     289Boost YAT_REQUIRED_BOOST_VERSION (or newer) not found. Please install boost, or provide
    291290CPPFLAGS=-I/path/to/boost])
    292291])
     
    591590YAT_VAR_REMOVE([YAT_PC_LIBS_PRIVATE], [-lgsl $YAT_CBLAS_LIB $LIBM])
    592591YAT_SET_CONTAINS([$yat_libyat_la_LIBADD], [-lgsl], [
    593   YAT_PC_REQUIRES_PRIVATE="gsl > $gsl_version"
     592  YAT_PC_REQUIRES_PRIVATE="gsl > YAT_REQUIRED_GSL_VERSION"
    594593], [
    595   YAT_PC_REQUIRES="gsl > $gsl_version"
     594  YAT_PC_REQUIRES="gsl > YAT_REQUIRED_GSL_VERSION"
    596595])
    597596
Note: See TracChangeset for help on using the changeset viewer.