]> Savannah Git Hosting - m4.git/commitdiff

Savannah Git Hosting - m4.git/commitdiff

git git@sv / m4.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d77ce2b)
Be namespace clean for M4 version; fixes 2008年04月08日 regression.
2008年4月10日 17:09:03 +0000 (11:09 -0600)
2008年4月10日 20:12:48 +0000 (14:12 -0600)
* configure.ac (version): Rename...
(M4_VERSION): ...to this, since using 'version' broke po.m4.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 1ecc606611e41ab8b8d6d01679aefb9f2ef7ca7d..c857a4414d1279a5059a5ada89677149f2273172 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008年04月10日 Eric Blake <ebb9@byu.net>
+
+ Be namespace clean for M4 version; fixes 2008年04月08日 regression.
+ * configure.ac (version): Rename...
+ (M4_VERSION): ...to this, since using 'version' broke po.m4.
+
2008年04月09日 Eric Blake <ebb9@byu.net>
Mention 1.4.11 release.
diff --git a/configure.ac b/configure.ac
index fdac14da05edfa3b810f7621499d57e392b4f0eb..b4a4515ad83ca9490e85a14db285699ea48f1aca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,9 +23,11 @@ AC_PREREQ([2.61a.347])
## ------------------------ ##
## Autoconf initialization. ##
## ------------------------ ##
-m4_define([version], m4_esyscmd([build-aux/git-version-gen .tarball-version]))
-m4_bmatch(m4_defn([version]), [^[0-9]], [], [m4_define([version], [1.9a])])
-AC_INIT([GNU M4], m4_defn([version]), [bug-m4@gnu.org])
+m4_define([M4_VERSION],
+ m4_esyscmd([build-aux/git-version-gen .tarball-version]))
+m4_bmatch(m4_defn([M4_VERSION]), [^[0-9]], [],
+ [m4_define([M4_VERSION], [1.9a])])
+AC_INIT([GNU M4], m4_defn([M4_VERSION]), [bug-m4@gnu.org])
AC_CONFIG_SRCDIR([src/m4.h])
AC_CONFIG_AUX_DIR([build-aux])
@@ -55,7 +57,7 @@ M4_default_preload="M4_DEFAULT_PRELOAD"
## Automake Initialization. ##
## ------------------------ ##
AM_INIT_AUTOMAKE([1.10.1 subdir-objects dist-bzip2 dist-lzma]
-m4_bmatch(m4_defn([version]), [-], [gnu], [gnits]))
+m4_bmatch(m4_defn([M4_VERSION]), [-], [gnu], [gnits]))
GNU M4 source repository
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /