Changeset 1573


Ignore:
Timestamp:
Jun 15, 2010 1:39:42 PM (10 years ago)
Author:
lou
Message:

Tweak PROJECTDIR_INIT comments and layout for smooth transition from
stable/0.6.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r1560 r1573  
    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],
     
    306308AM_CONDITIONAL(ALWAYS_FALSE, false)
    307309
    308 #Set the project's version number
     310# We set the following variable so that we know later in AC_COIN_FINALIZE
     311# that we are in a project main directory
     312coin_projectdir=yes
     313
     314# Set the project's version number
    309315if test "x$1" != x; then
    310   AC_DEFINE_UNQUOTED(m4_toupper($1_VERSION), ["$PACKAGE_VERSION"], [Version number of project])
    311 fi
    312 
    313 #Set the project's SVN revision number
     316  AC_DEFINE_UNQUOTED(m4_toupper($1_VERSION), ["$PACKAGE_VERSION"],
     317                     [Version number of project])
     318fi
     319
     320# Set the project's SVN revision number
    314321AC_CHECK_PROG([have_svnversion],[svnversion],[yes],[no])
    315322if test "x$have_svnversion" = xyes && test "x$1" != x; then
     
    317324  m4_toupper($1_SVN_REV)=`cd $srcdir/$m4_tolower(coin_has_$1) ; svnversion`
    318325  if test $m4_toupper($1_SVN_REV) != exported; then
    319     AC_DEFINE_UNQUOTED(m4_toupper($1_SVN_REV), "$m4_toupper($1_SVN_REV)", [SVN revision number of project])
    320   fi
    321 fi
    322 
    323 # We set the following variable so that we know later in AC_COIN_FINALIZE
    324 # that we are in a project main directory
    325 coin_projectdir=yes
    326 
    327 # Check if a library version is set for libtool
     326    AC_DEFINE_UNQUOTED(m4_toupper($1_SVN_REV), "$m4_toupper($1_SVN_REV)",
     327                       [SVN revision number of project])
     328  fi
     329fi
     330
     331# Capture libtool library version, if given.
    328332m4_ifvaln([$2],[coin_libversion=$2],[])
    329333]) # AC_COIN_PROJECTDIR_INIT
Note: See TracChangeset for help on using the changeset viewer.