Changeset 2800


Ignore:
Timestamp:
Jun 27, 2013 7:53:54 AM (7 years ago)
Author:
stefan
Message:

move project versioning stuff into extra macro

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r2767 r2800  
    5757]) # AC_COIN_CHECK_VPATH
    5858
    59 ###########################################################################
    60 #                         COIN_PROJECTDIR_INIT                            #
    61 ###########################################################################
    62 
    63 # This macro does everything that is required in the early part in the
    64 # configure script, such as defining a few variables.  This should only be used
    65 # in the main directory of a project directory (the one which holds the src
    66 # directory for the project). The first parameter is the project name. The
    67 # second (optional) is the libtool library version (important for releases,
    68 # less so for stable or trunk).
    69 
    70 AC_DEFUN([AC_COIN_PROJECTDIR_INIT],
     59
     60###########################################################################
     61#                          COIN_PROJECTVERSION                            #
     62###########################################################################
     63
     64# This macro is used by COIN_PROJECTDIR_INIT and sets up variables related
     65# to versioning numbers of the project.
     66
     67AC_DEFUN([AC_COIN_PROJECTVERSION],
    7168[
    72 # As backup, we make sure we don't loose an FLIBS if it has been set
    73 # by the user
    74 save_FLIBS="$FLIBS"
    75 
    76 # A useful makefile conditional that is always false
    77 AM_CONDITIONAL(ALWAYS_FALSE, false)
    78 
    79 # We set the following variable so that we know later in AC_COIN_FINALIZE
    80 # that we are in a project main directory
    81 coin_projectdir=yes
    82 
    83 # Set the project's version numbers
    8469m4_ifvaln([$1],[
    8570  AC_DEFINE_UNQUOTED(m4_toupper($1_VERSION), ["$PACKAGE_VERSION"],[Version number of project])
     
    11297  fi
    11398 ])
    114 
    115 # Capture libtool library version, if given.
    116 m4_ifvaln([$2],[coin_libversion=$2],[])
     99 
     100 # Capture libtool library version, if given.
     101 m4_ifvaln([$2],[coin_libversion=$2],[])
     102])
     103
     104###########################################################################
     105#                         COIN_PROJECTDIR_INIT                            #
     106###########################################################################
     107
     108# This macro does everything that is required in the early part in the
     109# configure script, such as defining a few variables.  This should only be used
     110# in the main directory of a project directory (the one which holds the src
     111# directory for the project). The first parameter is the project name. The
     112# second (optional) is the libtool library version (important for releases,
     113# less so for stable or trunk).
     114
     115AC_DEFUN([AC_COIN_PROJECTDIR_INIT],
     116[
     117# As backup, we make sure we don't loose an FLIBS if it has been set
     118# by the user
     119save_FLIBS="$FLIBS"
     120
     121# A useful makefile conditional that is always false
     122AM_CONDITIONAL(ALWAYS_FALSE, false)
     123
     124# We set the following variable so that we know later in AC_COIN_FINALIZE
     125# that we are in a project main directory
     126coin_projectdir=yes
     127
     128# Set the project's version numbers
     129AC_COIN_PROJECTVERSION($1, $2)
    117130
    118131]) # AC_COIN_PROJECTDIR_INIT
Note: See TracChangeset for help on using the changeset viewer.