summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Gough <bjg@gnu.org>2010-01-18 15:18:07 +0000
committerBrian Gough <bjg@gnu.org>2010-01-18 15:18:07 +0000
commitffb8708d2cf636801de0b9f1f03c65a5ab0bcb13 (patch)
treeba08f782dcaff83dd72351f86d346e7df2378105
parent603e6db6f6bbf53916a22488b1c13109f1ddf688 (diff)
downloadgsl-ffb8708d2cf636801de0b9f1f03c65a5ab0bcb13.tar.gz
added GSL_MAJOR_VERSION and GSL_MINOR_VERSION macros
-rw-r--r--ChangeLog5
-rw-r--r--NEWS3
-rw-r--r--configure.ac9
-rw-r--r--gsl_version.h.in2
4 files changed, 19 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d28bea..0d43ff0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-18 Brian Gough <bjg@network-theory.co.uk>
+
+ * gsl_version.h.in, configure.ac: added GSL_MAJOR_VERSION and
+ GSL_MINOR_VERSION macros
+
2009-07-09 Brian Gough <bjg@network-theory.co.uk>
* configure.ac: added RETURN_IF_NULL macro to handle null argument
diff --git a/NEWS b/NEWS
index a3b50ea..d198cbb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+** Added macros GSL_MAJOR_VERSION and GSL_MINOR_VERSION in
+ <gsl/gsl_version.h>
+
** Improved gsl_eigen_symmv and gsl_eigen_symm to avoid a potential
infinite loop when the tridiagonalised matrix contains very small
values. [bug #28096]
diff --git a/configure.ac b/configure.ac
index f9f5b04..94821b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,15 @@ case "$VERSION" in
;;
esac
+dnl Split VERSION into GSL_VERSION_MAJOR and GSL_VERSION_MINOR
+dnl Follows AX_SPLIT_VERSION macro from AC-Archive
+dnl Rhys Ulerich <rhys.ulerich@gmail.com>
+AC_PROG_SED
+GSL_MAJOR_VERSION=`echo "$VERSION" | $SED 's/\([[^.]][[^.]]*\).*/\1/'`
+GSL_MINOR_VERSION=`echo "$VERSION" | $SED 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
+AC_SUBST(GSL_MAJOR_VERSION)
+AC_SUBST(GSL_MINOR_VERSION)
+
dnl things required by automake
dnl AC_ARG_PROGRAM
AC_PROG_MAKE_SET
diff --git a/gsl_version.h.in b/gsl_version.h.in
index 25bf3a3..0b48826 100644
--- a/gsl_version.h.in
+++ b/gsl_version.h.in
@@ -16,6 +16,8 @@ __BEGIN_DECLS
#define GSL_VERSION "@VERSION@"
+#define GSL_MAJOR_VERSION @GSL_MAJOR_VERSION@
+#define GSL_MINOR_VERSION @GSL_MINOR_VERSION@
GSL_VAR const char * gsl_version;