Changeset 1319 for trunk/configure.ac


Ignore:
Timestamp:
May 21, 2008, 6:03:42 PM (13 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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r1303 r1319  
    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], [LT_VERSION])
    42 AC_SUBST([YAT_MAJOR_VERSION], [MAJOR_VERSION])
    43 AC_SUBST([YAT_MINOR_VERSION], [MINOR_VERSION])
    44 AC_SUBST([YAT_PATCH_VERSION], [PATCH_VERSION])
     41AC_SUBST([YAT_LT_VERSION], [yat_lt_version])
     42AC_SUBST([YAT_MAJOR_VERSION], [yat_major_version])
     43AC_SUBST([YAT_MINOR_VERSION], [yat_minor_version])
     44AC_SUBST([YAT_PATCH_VERSION], [yat_patch_version])
    4545
    4646AC_CONFIG_HEADER([config.h])
     47m4_include(build_support/ax_prefix_config_h.m4)
     48AX_PREFIX_CONFIG_H(yat/[AC_PACKAGE_NAME]-config.h,, config.h)
     49
    4750AM_INIT_AUTOMAKE()
    4851
     
    158161AC_SUBST(YAT_LIB)
    159162AC_SUBST(YAT_LIB_LOCATION)
    160 AC_DEFINE([YAT_MAJOR_VERSION],[MAJOR_VERSION], [Define to yat MAJOR version])
    161 AC_DEFINE([YAT_MINOR_VERSION],[MINOR_VERSION], [Define to yat MINOR version])
    162 AC_DEFINE([YAT_PATCH_VERSION],[PATCH_VERSION], [Define to yat PATCH version])
    163 AC_DEFINE([YAT_DEV_BUILD],[DEV_BUILD], [false if tagged release])
     163AC_DEFINE([MAJOR_VERSION], [yat_major_version], [Define to yat MAJOR version])
     164AC_DEFINE([MINOR_VERSION],[yat_minor_version], [Define to yat MINOR version])
     165AC_DEFINE([PATCH_VERSION],[yat_patch_version], [Define to yat PATCH version])
     166AC_DEFINE([DEV_BUILD],[yat_dev_build], [false if tagged release])
    164167
    165168#doxygen stuff
Note: See TracChangeset for help on using the changeset viewer.