Changeset 2332


Ignore:
Timestamp:
Jun 25, 2011 12:30:15 PM (8 years ago)
Author:
stefan
Message:

sync with trunk rev2331

Location:
stable/0.7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

  • stable/0.7/coin.m4

    r2306 r2332  
    20082008    AC_SUBST(ABSBUILDDIR)
    20092009  fi
    2010  
    2011   # On AIX, the default sed cannot deal with somewhat long sed commands executed by config.status.
    2012   # So we reduce the hardcoded number of commands given to sed from 48 to 5 in config.status, hoping this will suffice.
    2013   AC_CONFIG_COMMANDS_POST([
    2014     case $build in
    2015       *-aix*)
    2016         AC_MSG_NOTICE(patching config.status to reduce ac_max_sed_lines to 5)
    2017         sed -e 's/ac_max_sed_lines=48/ac_max_sed_lines=5/g' config.status > config.status.tmp
    2018         mv config.status.tmp config.status
    2019       ;;
    2020     esac
    2021   ])
    2022  
     2010 
    20232011  AC_OUTPUT
    20242012
     
    31013089if test -n "$PKG_CONFIG" ; then
    31023090  if $PKG_CONFIG --exists "$2"; then
    3103     m4_toupper($1)[]_VERSIONS="`$PKG_CONFIG --modversion "$2" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     3091    m4_toupper($1)[]_VERSIONS="`$PKG_CONFIG --modversion "$2" 2>/dev/null | tr '\n' ' '`"
    31043092    $3
    31053093  else
  • 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.