Changeset 2117


Ignore:
Timestamp:
Mar 5, 2011 6:28:15 AM (9 years ago)
Author:
stefan
Message:

sync with trunk rev2116

Location:
stable/0.7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

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

    r2115 r2117  
    8888  [coin_minorver=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.\([0-9]*\).*/\1/gp'`]
    8989  [coin_releasever=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*/\1/gp'`]
    90   if test "x$coin_majorver" = x ; then coin_majorver=-1 ; fi
    91   if test "x$coin_minorver" = x ; then coin_minorver=-1 ; fi
    92   if test "x$coin_releasever" = x ; then coin_releasever=-1 ; fi
     90  if test "x$coin_majorver" = x ; then coin_majorver=9999 ; fi
     91  if test "x$coin_minorver" = x ; then coin_minorver=9999 ; fi
     92  if test "x$coin_releasever" = x ; then coin_releasever=9999 ; fi
    9393  AC_DEFINE_UNQUOTED(m4_toupper($1_VERSION_MAJOR),   [$coin_majorver],   [Major Version number of project])
    9494  AC_DEFINE_UNQUOTED(m4_toupper($1_VERSION_MINOR),   [$coin_minorver],   [Minor Version number of project])
     
    396396        coin_add_cxxflags="-pipe"
    397397        coin_dbg_cxxflags="-g"
    398         coin_warn_cxxflags="-Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wno-unknown-pragmas"
     398        coin_warn_cxxflags="-Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wno-unknown-pragmas -Wno-long-long"
    399399        case $build in
    400400          *-darwin*)
     
    794794        coin_add_cflags="-pipe"
    795795        coin_dbg_cflags="-g"
    796         coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas"
     796        coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas -Wno-long-long"
    797797        case $build in
    798798          *-darwin*)
  • 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.