Changeset 1579


Ignore:
Timestamp:
Jun 16, 2010 10:36:24 AM (9 years ago)
Author:
lou
Message:

Change semantics of PROJECTDIR_INIT to ease transition to trunk version. First
parameter now project name; defines PROJ_VERSION. Second (optional) paramter is
libtool library version number.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/0.6/coin.m4

    r1362 r1579  
    285285
    286286# This macro does everything that is required in the early part in the
    287 # configure script, such as defining a few variables.  This should only
    288 # be used in the main directory of a project directory (the one under
    289 # which src is)
     287# configure script, such as defining a few variables.  This should only be used
     288# in the main directory of a project directory (the one which holds the src
     289# directory for the project). The first parameter is the project name. The
     290# second (optional) is the libtool library version (important for releases,
     291# less so for stable or trunk).
    290292
    291293AC_DEFUN([AC_COIN_PROJECTDIR_INIT],
     
    310312coin_projectdir=yes
    311313
    312 # Check if a library version is set for libtool
    313 m4_ifvaln([$1],[coin_libversion=$1],[])
     314# Set the project's version number.
     315if test "x$1" != x; then
     316  # temporary hack to avoid breaking lapack 1.0.20;
     317  # do not propagate to BuildTools trunk!  --lh, 100615--
     318  if expr "$1" : '.*:.*' >/dev/null 2>&1 ; then
     319    coin_libversion="$1"
     320  else
     321    AC_DEFINE_UNQUOTED(m4_toupper($1_VERSION), ["$PACKAGE_VERSION"],
     322                       [Version number of project])
     323  fi
     324fi
     325
     326# Capture libtool library version, if given.
     327m4_ifvaln([$2],[coin_libversion=$2],[])
    314328]) # AC_COIN_PROJECTDIR_INIT
    315329
Note: See TracChangeset for help on using the changeset viewer.