Changeset 2327


Ignore:
Timestamp:
Jun 19, 2011 11:30:16 AM (9 years ago)
Author:
stefan
Message:

merge chgsets 2288 and 2291 from trunk

Location:
stable/0.6
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.6

  • stable/0.6/coin.m4

    r2278 r2327  
    15081508AC_REQUIRE([AC_COIN_F77_COMPS])
    15091509AC_MSG_NOTICE([Trying to determine Fortran compiler name])
    1510 AC_CHECK_PROGS([F77],[$coin_f77_comps],[unavailable])
     1510AC_CHECK_TOOLS([F77],[$coin_f77_comps],[unavailable])
    15111511])
    15121512
     
    22502250    AC_SUBST(ABSBUILDDIR)
    22512251  fi
    2252  
     2252 
     2253  # On AIX, the default sed cannot deal with somewhat long sed commands executed by config.status.
     2254  # So we reduce the hardcoded number of commands given to sed from 48 to 5 in config.status, hoping this will suffice.
     2255  AC_CONFIG_COMMANDS_POST([
     2256    case $build in
     2257      *-aix*)
     2258        AC_MSG_NOTICE(patching config.status to reduce ac_max_sed_lines to 5)
     2259        sed -e 's/ac_max_sed_lines=48/ac_max_sed_lines=5/g' config.status > config.status.tmp
     2260        mv config.status.tmp config.status
     2261      ;;
     2262    esac
     2263  ])
     2264 
    22532265  AC_OUTPUT
    22542266
  • stable/0.6/compile_f2c

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