Changeset 2334


Ignore:
Timestamp:
Jun 25, 2011 12:33:45 PM (9 years ago)
Author:
stefan
Message:

sync with trunk rev2333

Location:
ThirdParty/Mumps/stable/1.4
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/stable/1.4

  • ThirdParty/Mumps/stable/1.4/configure

    r2320 r2334  
    2483424834if test -n "$PKG_CONFIG" ; then
    2483524835  if $PKG_CONFIG --exists "coinblas"; then
    24836     BLAS_VERSIONS="`$PKG_CONFIG --modversion "coinblas" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     24836    BLAS_VERSIONS="`$PKG_CONFIG --modversion "coinblas" 2>/dev/null | tr '\n' ' '`"
    2483724837     cflags=`$PKG_CONFIG --cflags "coinblas" 2>/dev/null`
    2483824838    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2539625396if test -n "$PKG_CONFIG" ; then
    2539725397  if $PKG_CONFIG --exists "coinmetis"; then
    25398     METIS_VERSIONS="`$PKG_CONFIG --modversion "coinmetis" 2>/dev/null | sed -n -e "1h;2,\\$H;\\${g;s/\n/ /g;p}"`"
     25398    METIS_VERSIONS="`$PKG_CONFIG --modversion "coinmetis" 2>/dev/null | tr '\n' ' '`"
    2539925399     cflags=`$PKG_CONFIG --cflags "coinmetis" 2>/dev/null`
    2540025400    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2592925929  *xlf*)
    2593025930    fdefs=
    25931     for flag in "$MY_FDEFS"; do
    25932       fdefs="$fdefs -WF,$flag"
    25933     done
     25931    if test -n "$MY_FDEFS"; then
     25932      for flag in $MY_FDEFS; do
     25933        fdefs="$fdefs -WF,$flag"
     25934      done
     25935    fi
    2593425936    MY_FDEFS="$fdefs"
    2593525937    ;;
     
    2601026012
    2601126013  fi
    26012 
    26013   # On AIX, the default sed cannot deal with somewhat long sed commands executed by config.status.
    26014   # So we reduce the hardcoded number of commands given to sed from 48 to 5 in config.status, hoping this will suffice.
    26015 
    2601626014
    2601726015  cat >confcache <<\_ACEOF
     
    2735327351
    2735427352
    27355     case $build in
    27356       *-aix*)
    27357         { echo "$as_me:$LINENO: patching config.status to reduce ac_max_sed_lines to 5" >&5
    27358 echo "$as_me: patching config.status to reduce ac_max_sed_lines to 5" >&6;}
    27359         sed -e 's/ac_max_sed_lines=48/ac_max_sed_lines=5/g' config.status > config.status.tmp
    27360         mv config.status.tmp config.status
    27361       ;;
    27362     esac
    27363 
    27364 
    2736527353# configure is writing to config.log, and then calls config.status.
    2736627354# config.status does its own redirection, appending to config.log.
  • ThirdParty/Mumps/stable/1.4/configure.ac

    r2320 r2334  
    131131  *xlf*)
    132132    fdefs=
    133     for flag in "$MY_FDEFS"; do
    134       fdefs="$fdefs -WF,$flag"
    135     done
     133    if test -n "$MY_FDEFS"; then
     134      for flag in $MY_FDEFS; do
     135        fdefs="$fdefs -WF,$flag"
     136      done
     137    fi
    136138    MY_FDEFS="$fdefs"
    137139    ;;
Note: See TracChangeset for help on using the changeset viewer.