Changeset 2584


Ignore:
Timestamp:
Jul 18, 2012 6:25:06 AM (7 years ago)
Author:
stefan
Message:

merge 2583 from trunk

Location:
stable/0.7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

    • Property svn:mergeinfo changed
      /trunkmerged: 2583
  • stable/0.7/coin.m4

    r2486 r2584  
    106106    AC_SUBST(m4_toupper($1_SVN_REV))
    107107    svn_rev_tmp=`LANG=en_EN svnversion $srcdir 2>/dev/null`
    108     if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x; then
     108    if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x -a "x$svn_rev_tmp" != "xUnversioned directory"; then
    109109      m4_toupper($1_SVN_REV)=`echo $svn_rev_tmp | sed -n -e 's/^@<:@0-9@:>@*://' -e 's/\(@<:@0-9@:>@\)@<:@^0-9@:>@*$/\1/p'`
    110110      AC_DEFINE_UNQUOTED(m4_toupper($1_SVN_REV), $m4_toupper($1_SVN_REV), [SVN revision number of project])
  • stable/0.7/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.