Mercurial > hg > octave-max

changeset 9917:c1210502785b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
provide OCTAVE_API_VERSION_NUMBER
author John W. Eaton <jwe@octave.org>
date Fri, 04 Dec 2009 15:18:17 -0500
parents 3dbe6e920f76
children 57b41617c9fd
files ChangeLog common.mk configure.ac src/ChangeLog src/Makefile.am src/version.h.in
diffstat 6 files changed, 18 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-04  John W. Eaton  <jwe@octave.org>
+
+	* configure.ac (OCTAVE_API_VERSION_NUMBER): New variable.
+	(OCTAVE_API_VERSION): Define using OCTAVE_API_VERSION_NUMBER.
+	* common.mk (OCTAVE_API_VERSION_NUMBER): New variable.
+
 2009-12-04  John W. Eaton  <jwe@octave.org>
 
 	* configure.ac: Check $have_x = yes, not just $have_x.
--- a/common.mk
+++ b/common.mk
@@ -19,6 +19,7 @@
 DESKTOP_FILE_INSTALL = @DESKTOP_FILE_INSTALL@
 
 OCTAVE_VERSION = @OCTAVE_VERSION@
+OCTAVE_API_VERSION_NUMBER = @OCTAVE_API_VERSION_NUMBER@
 OCTAVE_API_VERSION = @OCTAVE_API_VERSION@
 OCTAVE_RELEASE_DATE = @OCTAVE_RELEASE_DATE@
 OCTAVE_COPYRIGHT = @OCTAVE_COPYRIGHT@
--- a/configure.ac
+++ b/configure.ac
@@ -33,10 +33,12 @@
 
 dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg
 OCTAVE_VERSION="$PACKAGE_VERSION"
-OCTAVE_API_VERSION="api-v38+"
+OCTAVE_API_VERSION_NUMBER="38"
+OCTAVE_API_VERSION="api-v$OCTAVE_API_VERSION_NUMBER+"
 OCTAVE_RELEASE_DATE="2009-09-12"
 OCTAVE_COPYRIGHT="Copyright (C) 2009 John W. Eaton and others."
 AC_SUBST(OCTAVE_VERSION)
+AC_SUBST(OCTAVE_API_VERSION_NUMBER)
 AC_SUBST(OCTAVE_API_VERSION)
 AC_SUBST(OCTAVE_RELEASE_DATE)
 AC_SUBST(OCTAVE_COPYRIGHT)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-04  John W. Eaton  <jwe@octave.org>
+
+	* version.h.in (OCTAVE_API_VERSION_NUMBER): New macro.
+	* Makefile.am (version.h): Substitute OCTAVE_API_VERSION_NUMBER.
+
 2009-12-04  John W. Eaton  <jwe@octave.org>
 
 	* Makefile.am (mkdefs): New arguments, srcdir and file.
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -600,6 +600,7 @@
 
 version.h: version.h.in Makefile
 	$(SED) < $< \
+	  -e "s|%OCTAVE_API_VERSION_NUMBER%|${OCTAVE_API_VERSION_NUMBER}|" \
 	  -e "s|%OCTAVE_API_VERSION%|\"${OCTAVE_API_VERSION}\"|" \
 	  -e "s|%OCTAVE_COPYRIGHT%|\"${OCTAVE_COPYRIGHT}\"|" \
 	  -e "s|%OCTAVE_RELEASE_DATE%|\"${OCTAVE_RELEASE_DATE}\"|" \
--- a/src/version.h.in
+++ b/src/version.h.in
@@ -27,6 +27,8 @@
 
 #define OCTAVE_VERSION %OCTAVE_VERSION%
 
+#define OCTAVE_API_VERSION_NUMBER %OCTAVE_API_VERSION_NUMBER%
+
 #define OCTAVE_API_VERSION %OCTAVE_API_VERSION%
 
 #define OCTAVE_RELEASE_DATE %OCTAVE_RELEASE_DATE%