Changeset 1760 for stable


Ignore:
Timestamp:
Jul 2, 2011 9:15:55 AM (8 years ago)
Author:
stefan
Message:

sync with trunk rev1759; rerun autotools

Location:
stable/1.14
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/1.14

  • stable/1.14/Clp/configure

    r1753 r1760  
    2094020940if test -n "$PKG_CONFIG" ; then
    2094120941  if $PKG_CONFIG --exists "coinutils"; then
    20942     COINUTILS_VERSIONS="`$PKG_CONFIG --modversion "coinutils" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     20942    COINUTILS_VERSIONS=`$PKG_CONFIG --modversion "coinutils" 2>/dev/null | tr '\n' ' '`
    2094320943     cflags=`$PKG_CONFIG --cflags "coinutils" 2>/dev/null`
    2094420944    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2145621456if test -n "$PKG_CONFIG" ; then
    2145721457  if $PKG_CONFIG --exists "osi"; then
    21458     OSI_VERSIONS="`$PKG_CONFIG --modversion "osi" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     21458    OSI_VERSIONS=`$PKG_CONFIG --modversion "osi" 2>/dev/null | tr '\n' ' '`
    2145921459     cflags=`$PKG_CONFIG --cflags "osi" 2>/dev/null`
    2146021460    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2195621956if test -n "$PKG_CONFIG" ; then
    2195721957  if $PKG_CONFIG --exists "osi-unittests"; then
    21958     OSITESTS_VERSIONS="`$PKG_CONFIG --modversion "osi-unittests" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     21958    OSITESTS_VERSIONS=`$PKG_CONFIG --modversion "osi-unittests" 2>/dev/null | tr '\n' ' '`
    2195921959     cflags=`$PKG_CONFIG --cflags "osi-unittests" 2>/dev/null`
    2196021960    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2243722437if test -n "$PKG_CONFIG" ; then
    2243822438  if $PKG_CONFIG --exists "coindatasample"; then
    22439     SAMPLE_VERSIONS="`$PKG_CONFIG --modversion "coindatasample" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     22439    SAMPLE_VERSIONS=`$PKG_CONFIG --modversion "coindatasample" 2>/dev/null | tr '\n' ' '`
    2244022440     cflags=`$PKG_CONFIG --cflags "coindatasample" 2>/dev/null`
    2244122441    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2291822918if test -n "$PKG_CONFIG" ; then
    2291922919  if $PKG_CONFIG --exists "coindatanetlib"; then
    22920     NETLIB_VERSIONS="`$PKG_CONFIG --modversion "coindatanetlib" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     22920    NETLIB_VERSIONS=`$PKG_CONFIG --modversion "coindatanetlib" 2>/dev/null | tr '\n' ' '`
    2292122921     cflags=`$PKG_CONFIG --cflags "coindatanetlib" 2>/dev/null`
    2292222922    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2380023800if test -n "$PKG_CONFIG" ; then
    2380123801  if $PKG_CONFIG --exists "coinglpk"; then
    23802     GLPK_VERSIONS="`$PKG_CONFIG --modversion "coinglpk" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     23802    GLPK_VERSIONS=`$PKG_CONFIG --modversion "coinglpk" 2>/dev/null | tr '\n' ' '`
    2380323803     cflags=`$PKG_CONFIG --cflags "coinglpk" 2>/dev/null`
    2380423804    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2433524335if test -n "$PKG_CONFIG" ; then
    2433624336  if $PKG_CONFIG --exists "coinmumps"; then
    24337     MUMPS_VERSIONS="`$PKG_CONFIG --modversion "coinmumps" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     24337    MUMPS_VERSIONS=`$PKG_CONFIG --modversion "coinmumps" 2>/dev/null | tr '\n' ' '`
    2433824338     cflags=`$PKG_CONFIG --cflags "coinmumps" 2>/dev/null`
    2433924339    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2929329293if test -n "$PKG_CONFIG" ; then
    2929429294  if $PKG_CONFIG --exists "coinblas"; then
    29295     BLAS_VERSIONS="`$PKG_CONFIG --modversion "coinblas" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     29295    BLAS_VERSIONS=`$PKG_CONFIG --modversion "coinblas" 2>/dev/null | tr '\n' ' '`
    2929629296     cflags=`$PKG_CONFIG --cflags "coinblas" 2>/dev/null`
    2929729297    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    3143631436
    3143731437  fi
    31438 
    31439   # On AIX, the default sed cannot deal with somewhat long sed commands executed by config.status.
    31440   # So we reduce the hardcoded number of commands given to sed from 48 to 5 in config.status, hoping this will suffice.
    31441 
    3144231438
    3144331439  cat >confcache <<\_ACEOF
     
    3321333209
    3321433210
    33215     case $build in
    33216       *-aix*)
    33217         { echo "$as_me:$LINENO: patching config.status to reduce ac_max_sed_lines to 5" >&5
    33218 echo "$as_me: patching config.status to reduce ac_max_sed_lines to 5" >&6;}
    33219         sed -e 's/ac_max_sed_lines=48/ac_max_sed_lines=5/g' config.status > config.status.tmp
    33220         mv config.status.tmp config.status
    33221       ;;
    33222     esac
    33223 
    33224 
    3322533211# configure is writing to config.log, and then calls config.status.
    3322633212# config.status does its own redirection, appending to config.log.
  • stable/1.14/Clp/src/ClpDynamicMatrix.hpp

    r1753 r1760  
    136136                      int numberColumns, const int * starts,
    137137                      const double * lower, const double * upper,
    138                       const int * startColumn, const int * row,
     138                      const CoinBigIndex * startColumn, const int * row,
    139139                      const double * element, const double * cost,
    140140                      const double * columnLower = NULL, const double * columnUpper = NULL,
  • stable/1.14/configure

    r1753 r1760  
    2242322423  fi
    2242422424
    22425   # On AIX, the default sed cannot deal with somewhat long sed commands executed by config.status.
    22426   # So we reduce the hardcoded number of commands given to sed from 48 to 5 in config.status, hoping this will suffice.
    22427 
    22428 
    2242922425  cat >confcache <<\_ACEOF
    2243022426# This file is a shell script that caches the results of configure
     
    2368923685
    2369023686
    23691     case $build in
    23692       *-aix*)
    23693         { echo "$as_me:$LINENO: patching config.status to reduce ac_max_sed_lines to 5" >&5
    23694 echo "$as_me: patching config.status to reduce ac_max_sed_lines to 5" >&6;}
    23695         sed -e 's/ac_max_sed_lines=48/ac_max_sed_lines=5/g' config.status > config.status.tmp
    23696         mv config.status.tmp config.status
    23697       ;;
    23698     esac
    23699 
    23700 
    2370123687# configure is writing to config.log, and then calls config.status.
    2370223688# config.status does its own redirection, appending to config.log.
Note: See TracChangeset for help on using the changeset viewer.