Changeset 1319

Timestamp:

May 21, 2008, 6:03:42 PM (15 years ago)

Author:

Peter

Message:

config.h is no longer installed. Therefore, do not include config.h
into other header files. Instead there is a yat/yat-config.h which
will be installed and can therefore be used in header files. The
yat-config contains the same information as config.h but variables are
prefix'd with a YAT_. I had to change style in version.m4 due to a
variable clash between variables set in version.m4 and variables I
wanted in config.h.

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• NEWS (modified) (1 diff)
• build_support/ax_prefix_config_h.m4 (added)
• build_support/version.m4 (modified) (3 diffs)
• configure.ac (modified) (3 diffs)
• yat/Makefile.am (modified) (1 diff)
• yat/utility/version.cc (modified) (2 diffs)

trunk/Makefile.am

@@ -28 +28 @@
 SUBDIRS = yat test doc
 
-include_yatdir = $(includedir)/yat
-
-include_yat_HEADERS = config.h
-
 .PHONY: doc
 doc:; @(cd doc; $(MAKE) $@)

trunk/NEWS

@@ -8 +8 @@
   - is_int now depends on numerical_limits for inf and NaN treatment
   - Similar for is_float. See revision [1312] for details.
+  - yat-config.h is installed rather than config.h
 
 Version 0.4.1 (released 14 May 2008)

trunk/build_support/version.m4

@@ -25 +25 @@
 #
 # MAJOR - Modify when incompatible changes are made
-m4_define([MAJOR_VERSION], [0])
+m4_define([yat_major_version], [0])
 # MINOR - Modify when new functionality is added
-m4_define([MINOR_VERSION], [5])
+m4_define([yat_minor_version], [5])
 # PATCH - Modify for every released patch
-m4_define([PATCH_VERSION], [0])
+m4_define([yat_patch_version], [0])
 
 # DEV_BUILD - When rolling a tarball we set this to `false'. In
 # repository value remains `true'.
-m4_define([DEV_BUILD], [true])
+m4_define([yat_dev_build], [true])
 
 # Library versioning (current:revision:age)
@@ -54 +54 @@
 # yat-0.4.1  1:0:0
 #
-m4_define([LT_VERSION], [1:0:0])
+m4_define([yat_lt_version], [1:0:0])
 
 
@@ -62 +62 @@
 
 # Setting YAT_VERSION based upon settings above
-m4_define([YAT_VERSION],MAJOR_VERSION.MINOR_VERSION) 
+m4_define([yat_version],yat_major_version.yat_minor_version) 
 # disregarding patch number if zero
-m4_define([YAT_VERSION], m4_if(PATCH_VERSION,[0], YAT_VERSION,
-                                  YAT_VERSION.PATCH_VERSION))
-m4_define([YAT_VERSION], m4_if(DEV_BUILD,[true], YAT_VERSION[pre],
-                                  YAT_VERSION))
+m4_define([yat_version], m4_if(yat_patch_version,[0], yat_version,
+                                  yat_version.yat_patch_version))
+m4_define([yat_version], m4_if(yat_dev_build,[true], yat_version[pre],
+                                  yat_version))
 

trunk/configure.ac

@@ -33 +33 @@
 
 m4_include([./build_support/version.m4])
-AC_INIT([yat],[YAT_VERSION],[jari@thep.lu.se])
+AC_INIT([yat],[yat_version],[jari@thep.lu.se])
 AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR([yat/utility/Matrix.h])
@@ -39 +39 @@
 AC_PREFIX_DEFAULT([/usr/local])
 
-AC_SUBST([YAT_LT_VERSION], [LT_VERSION])
-AC_SUBST([YAT_MAJOR_VERSION], [MAJOR_VERSION])
-AC_SUBST([YAT_MINOR_VERSION], [MINOR_VERSION])
-AC_SUBST([YAT_PATCH_VERSION], [PATCH_VERSION])
+AC_SUBST([YAT_LT_VERSION], [yat_lt_version])
+AC_SUBST([YAT_MAJOR_VERSION], [yat_major_version])
+AC_SUBST([YAT_MINOR_VERSION], [yat_minor_version])
+AC_SUBST([YAT_PATCH_VERSION], [yat_patch_version])
 
 AC_CONFIG_HEADER([config.h])
+m4_include(build_support/ax_prefix_config_h.m4)
+AX_PREFIX_CONFIG_H(yat/[AC_PACKAGE_NAME]-config.h,, config.h)
+
 AM_INIT_AUTOMAKE()
 
@@ -158 +161 @@
 AC_SUBST(YAT_LIB)
 AC_SUBST(YAT_LIB_LOCATION)
-AC_DEFINE([YAT_MAJOR_VERSION],[MAJOR_VERSION], [Define to yat MAJOR version])
-AC_DEFINE([YAT_MINOR_VERSION],[MINOR_VERSION], [Define to yat MINOR version])
-AC_DEFINE([YAT_PATCH_VERSION],[PATCH_VERSION], [Define to yat PATCH version])
-AC_DEFINE([YAT_DEV_BUILD],[DEV_BUILD], [false if tagged release])
+AC_DEFINE([MAJOR_VERSION], [yat_major_version], [Define to yat MAJOR version])
+AC_DEFINE([MINOR_VERSION],[yat_minor_version], [Define to yat MINOR version])
+AC_DEFINE([PATCH_VERSION],[yat_patch_version], [Define to yat PATCH version])
+AC_DEFINE([DEV_BUILD],[yat_dev_build], [false if tagged release])
 
 #doxygen stuff

trunk/yat/Makefile.am

@@ -27 +27 @@
 SUBDIRS = classifier random regression statistics utility
 
+include_yatdir = $(includedir)/yat
+
+include_yat_HEADERS = yat-config.h
+
 lib_LTLIBRARIES = libyat.la
 

trunk/yat/utility/version.cc

@@ -23 +23 @@
 
 #include "version.h"
-#include "config.h"
+#include "yat/yat-config.h"
 
 namespace theplu {
@@ -49 +49 @@
   std::string version(void)
   {
-    return VERSION;
+    return YAT_VERSION;
   }