Changeset 3229 for trunk/m4/my_version.m4

Timestamp:

May 20, 2014, 9:00:16 AM (9 years ago)

Author:

Peter

Message:

translate variables when PACKAGE is not suitable as shell variable or a C #define.

File:

• trunk/m4/my_version.m4 (modified) (3 diffs)

trunk/m4/my_version.m4

@@ -1 +1 @@
 ## $Id$
 #
-# Copyright (C) 2012 Peter Johansson
+# Copyright (C) 2012, 2014 Peter Johansson
 #
 # This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -19 +19 @@
 #
 
-# serial 0
+# serial 1 (yat 0.13)
 
 # How to use this file
 # ====================
-# In 'configure.ac', include this file and call 'MY_VERSION_early'
-# before 'AC_INIT'.  After AC_INIT you can call MY_VERSION in order to
-# AC_SUBST and AC_DEFINE variables MAJOR_VERSION, MINOR_VERSION etc.
-#   m4_include([m4/version.m4])
+#
+# Copy this file to your project, e.g. directory 'm4/'. Aclocal will
+# not do that du to limitations.  In 'configure.ac', include this file
+# and call 'MY_VERSION_early' before 'AC_INIT'.  After AC_INIT you can
+# call MY_VERSION in order to AC_SUBST and AC_DEFINE variables
+# FOO_MAJOR_VERSION, FOO_MINOR_VERSION etc., where FOO has been
+# replaced with PACKAGE_NAME after appropriate translation (to suit a
+# Make variable or PP #define):
+#
+#   m4_include([m4/my_version.m4])
 #   MY_VERSION_early([3],[1],[4],[true])
 #   AC_INIT([foo], [my_VERSION])
@@ -51 +57 @@
 m4_ifndef([my_VERSION],
           [m4_fatal([MY_VERSION_early must be expanded before MY_VERSION])])
-AC_SUBST(m4_toupper(AC_PACKAGE_NAME)[_MAJOR_VERSION], [my_MAJOR_VERSION])
-AC_SUBST(m4_toupper(AC_PACKAGE_NAME)[_MINOR_VERSION], [my_MINOR_VERSION])
-AC_SUBST(m4_toupper(AC_PACKAGE_NAME)[_PATCH_VERSION], [my_PATCH_VERSION])
 
+AS_VAR_PUSHDEF([my_PACKAGE_SH], [m4_toupper(AC_PACKAGE_NAME)])
+AC_SUBST(my_PACKAGE_SH[_MAJOR_VERSION], [my_MAJOR_VERSION])
+AC_SUBST(my_PACKAGE_SH[_MINOR_VERSION], [my_MINOR_VERSION])
+AC_SUBST(my_PACKAGE_SH[_PATCH_VERSION], [my_PATCH_VERSION])
+AS_VAR_POPDEF([my_PACKAGE_SH])
+
+m4_pushdef([my_PACKAGE_CPP], [AS_TR_CPP([m4_toupper(AC_PACKAGE_NAME)])])
 AC_DEFINE([DEV_BUILD],[my_DEV_BUILD],
           [true if dev build (version ends with pre)])
-AC_DEFINE(m4_toupper(AC_PACKAGE_NAME)[_MAJOR_VERSION], [my_MAJOR_VERSION],
+AC_DEFINE(my_PACKAGE_CPP[_MAJOR_VERSION], [my_MAJOR_VERSION],
                     [Define to major version])
-AC_DEFINE(m4_toupper(AC_PACKAGE_NAME)[_MINOR_VERSION], [my_MINOR_VERSION],
+AC_DEFINE(my_PACKAGE_CPP[_MINOR_VERSION], [my_MINOR_VERSION],
                     [Define to minor version])
-AC_DEFINE(m4_toupper(AC_PACKAGE_NAME)[_PATCH_VERSION], [my_PATCH_VERSION],
+AC_DEFINE(my_PACKAGE_CPP[_PATCH_VERSION], [my_PATCH_VERSION],
                     [Define to patch version])
+m4_popdef([my_PACKAGE_CPP])
 ]) # MY_VERSION