Changeset 1514 for ThirdParty/Mumps


Ignore:
Timestamp:
Apr 24, 2010 4:11:10 PM (10 years ago)
Author:
stefan
Message:

rerun autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/branches/split/configure

    r1508 r1514  
    2385723857#call fallback in case the previous failed, maybe because pkg-config was not available
    2385823858
    23859 if test $coin_has_blas != "yes" ; then
     23859if test x$coin_has_blas != "xyes" ; then
    2386023860echo "$as_me:$LINENO: checking for COIN-OR module Blas (fallback)" >&5
    2386123861echo $ECHO_N "checking for COIN-OR module Blas (fallback)... $ECHO_C" >&6
     
    2388323883    # add CYGPATH_W cludge into include flags
    2388423884    # replace -L${libdir} by absolute path to build directory in linker flags
     23885    # we assume that the build directory is ../ThirdParty/Blas/src if this directory exists, otherwise we assume that it is ../ThirdParty/Blas
    2388523886    BLAS_CFLAGS=`sed -n -e 's/Cflags://' -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/gp' ../ThirdParty/Blas/coinblas-uninstalled.pc`
    2388623887    projectlibs=`sed -n -e 's/Libs://' -e 's/-L\${libdir}//p' ../ThirdParty/Blas/coinblas-uninstalled.pc`
    2388723888    if test "x$projectlibs" != x ; then
    23888       BLAS_LIBS="-L`cd ../ThirdParty/Blas; pwd` $projectlibs"
     23889      if test -d ../ThirdParty/Blas/src ; then
     23890        BLAS_LIBS="-L`cd ../ThirdParty/Blas/src; pwd` $projectlibs"
     23891      else
     23892        BLAS_LIBS="-L`cd ../ThirdParty/Blas; pwd` $projectlibs"
     23893      fi
     23894    else
     23895      BLAS_LIBS=`sed -n -e 's/Libs://p' ../ThirdParty/Blas/coinblas-uninstalled.pc`
    2388923896    fi
    2389023897    BLAS_DATA=`sed -n -e 's/datadir=//gp' ../ThirdParty/Blas/coinblas-uninstalled.pc`
    2389123898
    2389223899    ADDLIBS="$ADDLIBS $BLAS_LIBS"
    23893 
    23894     REQUIREDPACKAGES="$REQUIREDPACKAGES coinblas"
     23900       REQUIREDPACKAGES="$REQUIREDPACKAGES coinblas"
     23901
    2389523902
    2389623903
     
    2411024117
    2411124118
    24112 if test $coin_has_metis != "yes" ; then
     24119if test x$coin_has_metis != "xyes" ; then
    2411324120echo "$as_me:$LINENO: checking for COIN-OR module Metis (fallback)" >&5
    2411424121echo $ECHO_N "checking for COIN-OR module Metis (fallback)... $ECHO_C" >&6
     
    2413624143    # add CYGPATH_W cludge into include flags
    2413724144    # replace -L${libdir} by absolute path to build directory in linker flags
     24145    # we assume that the build directory is ../Metis/src if this directory exists, otherwise we assume that it is ../Metis
    2413824146    METIS_CFLAGS=`sed -n -e 's/Cflags://' -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/gp' ../Metis/coinmetis-uninstalled.pc`
    2413924147    projectlibs=`sed -n -e 's/Libs://' -e 's/-L\${libdir}//p' ../Metis/coinmetis-uninstalled.pc`
    2414024148    if test "x$projectlibs" != x ; then
    24141       METIS_LIBS="-L`cd ../Metis; pwd` $projectlibs"
     24149      if test -d ../Metis/src ; then
     24150        METIS_LIBS="-L`cd ../Metis/src; pwd` $projectlibs"
     24151      else
     24152        METIS_LIBS="-L`cd ../Metis; pwd` $projectlibs"
     24153      fi
     24154    else
     24155      METIS_LIBS=`sed -n -e 's/Libs://p' ../Metis/coinmetis-uninstalled.pc`
    2414224156    fi
    2414324157    METIS_DATA=`sed -n -e 's/datadir=//gp' ../Metis/coinmetis-uninstalled.pc`
    2414424158
    2414524159    ADDLIBS="$ADDLIBS $METIS_LIBS"
    24146 
    24147     REQUIREDPACKAGES="$REQUIREDPACKAGES coinmetis"
     24160       REQUIREDPACKAGES="$REQUIREDPACKAGES coinmetis"
     24161
    2414824162
    2414924163
Note: See TracChangeset for help on using the changeset viewer.