Changeset 1694


Ignore:
Timestamp:
Oct 30, 2010 6:19:15 PM (9 years ago)
Author:
tkr
Message:

Backing out r1579

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/0.6/coin.m4

    r1579 r1694  
    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 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).
     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)
    292290
    293291AC_DEFUN([AC_COIN_PROJECTDIR_INIT],
     
    312310coin_projectdir=yes
    313311
    314 # Set the project's version number.
    315 if 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
    324 fi
    325 
    326 # Capture libtool library version, if given.
    327 m4_ifvaln([$2],[coin_libversion=$2],[])
     312# Check if a library version is set for libtool
     313m4_ifvaln([$1],[coin_libversion=$1],[])
    328314]) # AC_COIN_PROJECTDIR_INIT
    329315
Note: See TracChangeset for help on using the changeset viewer.