Changeset 3811

Timestamp:

Jul 8, 2019, 9:06:31 AM (4 years 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:

• build_support/Makefile.am (modified) (1 diff)
• build_support/gen_yat_pc.sh.in (modified) (1 diff)
• configure.ac (modified) (3 diffs)

trunk/build_support/Makefile.am

@@ -63 +63 @@
   -e 's|@YAT_PATCH_VERSION[@]|$(YAT_PATCH_VERSION)|g' \
   -e 's|@YAT_DEV_BUILD[@]|$(YAT_DEV_BUILD)|g' \
-  -e 's|@gsl_version[@]|$(gsl_version)|g' \
   -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
-  -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
-  -e 's|@min_boost_version[@]|$(min_boost_version)|g'
+  -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g'
 
 build_support/yat-config: Makefile $(srcdir)/build_support/yat-config.in

trunk/build_support/gen_yat_pc.sh.in

@@ -77 +77 @@
 -e "s|@includedir[@]|${my_includedir}|g" \
 -e 's|@VERSION[@]|@VERSION@|g' \
--e 's|@gsl_version[@]|@gsl_version@|g' \
 -e 's|@CPPFLAGS[@]|@CPPFLAGS@|g' \
 -e 's|@YAT_CPPFLAGS[@]|@YAT_CPPFLAGS@|g' \

trunk/configure.ac

@@ -271 +271 @@
 # GNU Scientific Library, GSL http://www.gnu.org/software/gsl/, checks
 # Including AX_PATH_GSL macro from gsl.m4 distributed by GSL
-gsl_version="1.8"
-AC_SUBST(gsl_version)
-YAT_CHECK_GSL([$gsl_version],[LIBS="-lgsl $LIBS"],[AC_MSG_FAILURE([dnl
-GSL $gsl_version (or newer) not found. The GNU Scientific Library
+m4_define([YAT_REQUIRED_GSL_VERSION], [1.8])
+YAT_CHECK_GSL([YAT_REQUIRED_GSL_VERSION],[LIBS="-lgsl $LIBS"],
+   [AC_MSG_FAILURE([dnl
+GSL YAT_REQUIRED_GSL_VERSION (or newer) not found. The GNU Scientific Library
 (GSL) library cannot be found. Please make sure GSL is installed.])
 ])
@@ -285 +285 @@
 
 # Boost http://www.boost.org
-min_boost_version=1.35
-AC_SUBST(min_boost_version)
-AX_BOOST_BASE(["$min_boost_version"], [], [AC_MSG_FAILURE([dnl
-Boost ${min_boost_version} (or newer) not found. Please install boost, or provide
+m4_define([YAT_REQUIRED_BOOST_VERSION], [1.35])
+AX_BOOST_BASE([YAT_REQUIRED_BOOST_VERSION], [], [AC_MSG_FAILURE([dnl
+Boost YAT_REQUIRED_BOOST_VERSION (or newer) not found. Please install boost, or provide
 CPPFLAGS=-I/path/to/boost])
 ])
@@ -591 +590 @@
 YAT_VAR_REMOVE([YAT_PC_LIBS_PRIVATE], [-lgsl $YAT_CBLAS_LIB $LIBM])
 YAT_SET_CONTAINS([$yat_libyat_la_LIBADD], [-lgsl], [
-  YAT_PC_REQUIRES_PRIVATE="gsl > $gsl_version"
+  YAT_PC_REQUIRES_PRIVATE="gsl > YAT_REQUIRED_GSL_VERSION"
 ], [
-  YAT_PC_REQUIRES="gsl > $gsl_version"
+  YAT_PC_REQUIRES="gsl > YAT_REQUIRED_GSL_VERSION"
 ])