diff options
| author | Andreas Enge <andreas.enge@inria.fr> | 2011-08-31 09:48:16 +0000 |
|---|---|---|
| committer | Andreas Enge <andreas.enge@inria.fr> | 2011-08-31 09:48:16 +0000 |
| commit | dfcb563ed860d857edffdde1be0bce67dbecffe3 (patch) | |
| tree | 59fe55fded403b5268cfad504f22425281fd0e3d | |
| parent | f988cfab17cec50ec36c50ff226221da60322b52 (diff) | |
| download | mpc-git-dfcb563ed860d857edffdde1be0bce67dbecffe3.tar.gz | |
configure.ac, mpc.m4, Makefile.am:
do not use svn version for autoconf, but in development versions, export it
to the makefile to be used for the distribution name
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/mpc/trunk@1049 211d60ee-9f03-0410-a15a-8952a2c7a4e4
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | doc/version.texi | 4 | ||||
| -rw-r--r-- | m4/mpc.m4 | 23 |
4 files changed, 31 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 1a9c342..cf0b6cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,9 @@ ACLOCAL_AMFLAGS = -I m4 +# version number for distribution tarball +VERSION = @VERSION@@SVNVERSION@ + SUBDIRS = src tests doc EXTRA_HEADERS = src/mpc-log.h diff --git a/configure.ac b/configure.ac index 5560da3..bb32fac 100644 --- a/configure.ac +++ b/configure.ac @@ -22,8 +22,7 @@ along with this program. If not, see http://www.gnu.org/licenses/ . # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -define([svnversion], esyscmd([svnversion -n])) -AC_INIT(mpc, 1.0.0-dev-svnversion, mpc-discuss@lists.gforge.inria.fr) +AC_INIT(mpc, 1.0.0-dev, mpc-discuss@lists.gforge.inria.fr) AC_CONFIG_SRCDIR([src/mpc-impl.h]) AC_CONFIG_HEADER([config.h]) @@ -218,13 +217,14 @@ case $host in MPC_WINDOWS esac - - # Checks for gcc version, result in GCC_VERSION inside config.log, for instance AX_GCC_VERSION AC_DEFINE_UNQUOTED([MPC_GCC], ["$GCC"], [Gcc yes or no]) AC_DEFINE_UNQUOTED([MPC_CC], ["$CC"], [C compiler]) AC_DEFINE_UNQUOTED([MPC_GCC_VERSION], ["$GCC_VERSION"], [Version of gcc]) +# Looks for svn version if the version string contains "dev" +MPC_SVNVERSION + AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile doc/Makefile]) AC_OUTPUT diff --git a/doc/version.texi b/doc/version.texi index fe83c29..7495fc9 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ @set UPDATED 30 August 2011 @set UPDATED-MONTH August 2011 -@set EDITION 1.0.0-dev-1044M -@set VERSION 1.0.0-dev-1044M +@set EDITION 1.0.0-dev +@set VERSION 1.0.0-dev @@ -135,7 +135,7 @@ AC_DEFUN([MPC_C_CHECK_WARNINGCFLAGS], [ # SYNOPSIS # # -MPC_GMP_CC_CFLAGS +# MPC_GMP_CC_CFLAGS # # DESCRIPTION # @@ -241,3 +241,24 @@ error fi ;; ]) + + +# +# SYNOPSIS +# +# +# MPC_SVNVERSION +# +# DESCRIPTION +# +# If current version string contains "dev", substitutes svn version into +# SVNVERSION +# +AC_DEFUN([MPC_SVNVERSION], [ + if echo $VERSION | grep -c dev >/dev/null 2>&1 ; then + AC_MSG_CHECKING([for current svn version]) + SVNVERSION=esyscmd([svnversion -n]) + AC_SUBST([SVNVERSION]) + AC_MSG_RESULT([$SVNVERSION]) + fi +]) |