Changeset 731


Ignore:
Timestamp:
Jul 2, 2011 10:22:22 AM (9 years ago)
Author:
stefan
Message:

undo faulty update of configure from chgset 729

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/configure

    r729 r731  
    2233522335if test -n "$PKG_CONFIG" ; then
    2233622336  if $PKG_CONFIG --exists "bonmin"; then
    22337     BONMIN_VERSIONS="`$PKG_CONFIG --modversion "bonmin" 2>/dev/null | tr '\n' ' '`"
     22337    BONMIN_VERSIONS=`$PKG_CONFIG --modversion "bonmin" 2>/dev/null | tr '\n' ' '`
    2233822338     cflags=`$PKG_CONFIG --cflags "bonmin" 2>/dev/null`
    2233922339    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2285822858if test -n "$PKG_CONFIG" ; then
    2285922859  if $PKG_CONFIG --exists "bonminamplinterface"; then
    22860     ASL_VERSIONS="`$PKG_CONFIG --modversion "bonminamplinterface" 2>/dev/null | tr '\n' ' '`"
     22860    ASL_VERSIONS=`$PKG_CONFIG --modversion "bonminamplinterface" 2>/dev/null | tr '\n' ' '`
    2286122861     cflags=`$PKG_CONFIG --cflags "bonminamplinterface" 2>/dev/null`
    2286222862    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2358123581if test -n "$PKG_CONFIG" ; then
    2358223582  if $PKG_CONFIG --exists "coinscip"; then
    23583     SCIP_VERSIONS="`$PKG_CONFIG --modversion "coinscip" 2>/dev/null | tr '\n' ' '`"
     23583    SCIP_VERSIONS=`$PKG_CONFIG --modversion "coinscip" 2>/dev/null | tr '\n' ' '`
    2358423584     cflags=`$PKG_CONFIG --cflags "coinscip" 2>/dev/null`
    2358523585    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2409424094if test -n "$PKG_CONFIG" ; then
    2409524095  if $PKG_CONFIG --exists "osi-cplex"; then
    24096     CPX_VERSIONS="`$PKG_CONFIG --modversion "osi-cplex" 2>/dev/null | tr '\n' ' '`"
     24096    CPX_VERSIONS=`$PKG_CONFIG --modversion "osi-cplex" 2>/dev/null | tr '\n' ' '`
    2409724097     cflags=`$PKG_CONFIG --cflags "osi-cplex" 2>/dev/null`
    2409824098    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2461424614if test -n "$PKG_CONFIG" ; then
    2461524615  if $PKG_CONFIG --exists "osi-gurobi"; then
    24616     GRB_VERSIONS="`$PKG_CONFIG --modversion "osi-gurobi" 2>/dev/null | tr '\n' ' '`"
     24616    GRB_VERSIONS=`$PKG_CONFIG --modversion "osi-gurobi" 2>/dev/null | tr '\n' ' '`
    2461724617     cflags=`$PKG_CONFIG --cflags "osi-gurobi" 2>/dev/null`
    2461824618    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2512525125if test -n "$PKG_CONFIG" ; then
    2512625126  if $PKG_CONFIG --exists "osi-mosek"; then
    25127     MSK_VERSIONS="`$PKG_CONFIG --modversion "osi-mosek" 2>/dev/null | tr '\n' ' '`"
     25127    MSK_VERSIONS=`$PKG_CONFIG --modversion "osi-mosek" 2>/dev/null | tr '\n' ' '`
    2512825128     cflags=`$PKG_CONFIG --cflags "osi-mosek" 2>/dev/null`
    2512925129    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2563625636if test -n "$PKG_CONFIG" ; then
    2563725637  if $PKG_CONFIG --exists "osi-soplex"; then
    25638     SPX_VERSIONS="`$PKG_CONFIG --modversion "osi-soplex" 2>/dev/null | tr '\n' ' '`"
     25638    SPX_VERSIONS=`$PKG_CONFIG --modversion "osi-soplex" 2>/dev/null | tr '\n' ' '`
    2563925639     cflags=`$PKG_CONFIG --cflags "osi-soplex" 2>/dev/null`
    2564025640    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2614726147if test -n "$PKG_CONFIG" ; then
    2614826148  if $PKG_CONFIG --exists "osi-xpress"; then
    26149     XPR_VERSIONS="`$PKG_CONFIG --modversion "osi-xpress" 2>/dev/null | tr '\n' ' '`"
     26149    XPR_VERSIONS=`$PKG_CONFIG --modversion "osi-xpress" 2>/dev/null | tr '\n' ' '`
    2615026150     cflags=`$PKG_CONFIG --cflags "osi-xpress" 2>/dev/null`
    2615126151    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2792727927
    2792827928  fi
    27929 
    27930   # On AIX, the default sed cannot deal with somewhat long sed commands executed by config.status.
    27931   # So we reduce the hardcoded number of commands given to sed from 48 to 5 in config.status, hoping this will suffice.
    27932 
    2793327929
    2793427930  cat >confcache <<\_ACEOF
     
    2965629652
    2965729653
    29658     case $build in
    29659       *-aix*)
    29660         { echo "$as_me:$LINENO: patching config.status to reduce ac_max_sed_lines to 5" >&5
    29661 echo "$as_me: patching config.status to reduce ac_max_sed_lines to 5" >&6;}
    29662         sed -e 's/ac_max_sed_lines=48/ac_max_sed_lines=5/g' config.status > config.status.tmp
    29663         mv config.status.tmp config.status
    29664       ;;
    29665     esac
    29666 
    29667 
    2966829654# configure is writing to config.log, and then calls config.status.
    2966929655# config.status does its own redirection, appending to config.log.
Note: See TracChangeset for help on using the changeset viewer.