[PATCH] [build] Simplify generation of ginac/version.h

diff --git a/configure.ac b/configure.ac
index 78d7f2a6785d20f54e27ae7edb0329cda5fce074..2c2c8e9e7a9e2196a4d7c0ee0bb63719ed3ddd41 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -30,20 +30,15 @@ AC_INIT([GiNaC], ginac_version, [<ginac-list@ginac.de>])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(ginac/basic.cpp)
 AC_CONFIG_AUX_DIR([config])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(ginac/basic.cpp)
 AC_CONFIG_AUX_DIR([config])

-AC_CONFIG_HEADERS([config/config.h])
+AC_CONFIG_HEADERS([config/config.h ginac/version.h])

 AC_CONFIG_MACRO_DIR([m4])
 dnl This defines PACKAGE and VERSION.
 AM_INIT_AUTOMAKE([gnu 1.7 dist-bzip2])
 
 dnl Process GiNaC version information
 AC_CONFIG_MACRO_DIR([m4])
 dnl This defines PACKAGE and VERSION.
 AM_INIT_AUTOMAKE([gnu 1.7 dist-bzip2])
 
 dnl Process GiNaC version information

-GINACLIB_MAJOR_VERSION=ginac_major_version
-GINACLIB_MINOR_VERSION=ginac_minor_version
-GINACLIB_MICRO_VERSION=ginac_micro_version
-GINACLIB_VERSION=ginac_version
-AC_SUBST(GINACLIB_MAJOR_VERSION)
-AC_SUBST(GINACLIB_MINOR_VERSION)
-AC_SUBST(GINACLIB_MICRO_VERSION)
-AC_SUBST(GINACLIB_VERSION)
+AC_DEFINE([GINACLIB_MAJOR_VERSION], ginac_major_version, [Major version of GiNaC])
+AC_DEFINE([GINACLIB_MINOR_VERSION], ginac_minor_version, [Minor version of GiNaC])
+AC_DEFINE([GINACLIB_MICRO_VERSION], ginac_minor_version, [Micro version of GiNaC])

 
 dnl GiNaC archive file version information.
 dnl
 
 dnl GiNaC archive file version information.
 dnl


@@ -134,7 +129,6 @@ Makefile
 GiNaC.spec
 ginac.pc
 ginac/Makefile
 GiNaC.spec
 ginac.pc
 ginac/Makefile

-ginac/version.h

 check/Makefile
 ginsh/Makefile
 ginsh/ginsh.1
 check/Makefile
 ginsh/Makefile
 ginsh/ginsh.1

diff --git a/ginac/version.h.in b/ginac/version.h.in
index da42751b440ccae45c115d5d7b8342eb9db964e6..a8a717577723af6781e9b585dd2e28ae80f2c6ed 100644 (file)
--- a/ginac/version.h.in
+++ b/ginac/version.h.in
@@ -23,10 +23,14 @@
 #ifndef __GINAC_VERSION_H__
 #define __GINAC_VERSION_H__
 
 #ifndef __GINAC_VERSION_H__
 #define __GINAC_VERSION_H__
 

-/* Major, minor, and micro version number of the GiNaC library. */
-#define GINACLIB_MAJOR_VERSION @GINACLIB_MAJOR_VERSION@
-#define GINACLIB_MINOR_VERSION @GINACLIB_MINOR_VERSION@
-#define GINACLIB_MICRO_VERSION @GINACLIB_MICRO_VERSION@
+/* Major version of GiNaC */
+#undef GINACLIB_MAJOR_VERSION
+
+/* Minor version of GiNaC */
+#undef GINACLIB_MINOR_VERSION
+
+/* Micro version of GiNaC */
+#undef GINACLIB_MICRO_VERSION

 
 namespace GiNaC {
 
 
 namespace GiNaC {