Changeset 1321 for trunk/configure.ac


Ignore:
Timestamp:
May 23, 2008, 4:14:41 PM (13 years ago)
Author:
Peter
Message:

Basically reverting r1319. I was not happy with the macro, so create defines are now placed in version.h instead. version.h is generated by configure from version.h.in. The macro ax_prefix_config_h.m4 will be removed later.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r1319 r1321  
    3333
    3434m4_include([./build_support/version.m4])
    35 AC_INIT([yat],[yat_version],[jari@thep.lu.se])
     35AC_INIT([yat],[YAT_VERSION],[jari@thep.lu.se])
    3636AC_PREREQ(2.60)
    3737AC_CONFIG_SRCDIR([yat/utility/Matrix.h])
     
    3939AC_PREFIX_DEFAULT([/usr/local])
    4040
    41 AC_SUBST([YAT_LT_VERSION], [yat_lt_version])
    42 AC_SUBST([YAT_MAJOR_VERSION], [yat_major_version])
    43 AC_SUBST([YAT_MINOR_VERSION], [yat_minor_version])
    44 AC_SUBST([YAT_PATCH_VERSION], [yat_patch_version])
     41AC_SUBST([YAT_LT_VERSION], [LT_VERSION])
     42AC_SUBST([YAT_MAJOR_VERSION], [MAJOR_VERSION])
     43AC_SUBST([YAT_MINOR_VERSION], [MINOR_VERSION])
     44AC_SUBST([YAT_PATCH_VERSION], [PATCH_VERSION])
     45AC_SUBST([YAT_DEV_BUILD], [DEV_BUILD])
    4546
    4647AC_CONFIG_HEADER([config.h])
    47 m4_include(build_support/ax_prefix_config_h.m4)
    48 AX_PREFIX_CONFIG_H(yat/[AC_PACKAGE_NAME]-config.h,, config.h)
    49 
    5048AM_INIT_AUTOMAKE()
    5149
     
    161159AC_SUBST(YAT_LIB)
    162160AC_SUBST(YAT_LIB_LOCATION)
    163 AC_DEFINE([MAJOR_VERSION], [yat_major_version], [Define to yat MAJOR version])
    164 AC_DEFINE([MINOR_VERSION],[yat_minor_version], [Define to yat MINOR version])
    165 AC_DEFINE([PATCH_VERSION],[yat_patch_version], [Define to yat PATCH version])
    166 AC_DEFINE([DEV_BUILD],[yat_dev_build], [false if tagged release])
    167161
    168162#doxygen stuff
     
    184178     yat/regression/Makefile
    185179     yat/statistics/Makefile
     180     yat/utility/version.h
    186181     yat/utility/Makefile])
    187182
Note: See TracChangeset for help on using the changeset viewer.