Changeset 2802 for stable/0.7/coin.m4


Ignore:
Timestamp:
Jun 28, 2013 8:52:42 AM (7 years ago)
Author:
stefan
Message:

merge r2800 and r2801 from trunk

Location:
stable/0.7
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

  • stable/0.7/coin.m4

    r2768 r2802  
    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],
    71 [
    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
    84 m4_ifvaln([$1],[
     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],
     68[m4_ifvaln([$1],[
    8569  AC_DEFINE_UNQUOTED(m4_toupper($1_VERSION), ["$PACKAGE_VERSION"],[Version number of project])
    8670 
     
    11296  fi
    11397 ])
    114 
     98 
    11599# Capture libtool library version, if given.
    116 m4_ifvaln([$2],[coin_libversion=$2],[])
    117 
     100 m4_ifvaln([$2],[coin_libversion=$2],[])
     101])
     102
     103###########################################################################
     104#                         COIN_PROJECTDIR_INIT                            #
     105###########################################################################
     106
     107# This macro does everything that is required in the early part in the
     108# configure script, such as defining a few variables.  This should only be used
     109# in the main directory of a project directory (the one which holds the src
     110# directory for the project). The first parameter is the project name. The
     111# second (optional) is the libtool library version (important for releases,
     112# less so for stable or trunk).
     113
     114AC_DEFUN([AC_COIN_PROJECTDIR_INIT],
     115[
     116# As backup, we make sure we don't loose an FLIBS if it has been set
     117# by the user
     118save_FLIBS="$FLIBS"
     119
     120# A useful makefile conditional that is always false
     121AM_CONDITIONAL(ALWAYS_FALSE, false)
     122
     123# We set the following variable so that we know later in AC_COIN_FINALIZE
     124# that we are in a project main directory
     125coin_projectdir=yes
     126
     127# Set the project's version numbers
     128AC_COIN_PROJECTVERSION($1, $2)
    118129]) # AC_COIN_PROJECTDIR_INIT
    119130
Note: See TracChangeset for help on using the changeset viewer.