Changeset 1913


Ignore:
Timestamp:
Dec 5, 2010 3:43:27 PM (9 years ago)
Author:
stefan
Message:

rerun autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/trunk/configure

    r1905 r1913  
    2216222162    if test "$CYGPATH_W" != "echo" ; then
    2216322163      # need to put into brackets since otherwise autoconf replaces the brackets in the sed command
    22164           cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
    22165         fi
     22164      cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     22165    fi
    2216622166    METIS_CFLAGS="$cflags"
    2216722167    METIS_LIBS=`$PKG_CONFIG --libs "coinmetis" 2>/dev/null`
     
    2217022170        echo "$as_me:$LINENO: result: yes: $METIS_VERSIONS" >&5
    2217122171echo "${ECHO_T}yes: $METIS_VERSIONS" >&6
    22172         HSL_PCREQUIRES="coinmetis $HSL_PCREQUIRES"
     22172
     22173        # adjust linker flags for (i)cl compiler
     22174        # for the LIBS, we replace everything of the form "/somepath/name.lib" by "`$(CYGPATH_W) /somepath/`name.lib | sed -e s|\|/|g" (where we have to use excessive many \ to get the \ into the command line for cl)
     22175        if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
     22176        then
     22177          METIS_LIBS=`echo " $METIS_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
     22178        fi
     22179
     22180        # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in HSL
     22181
     22182          HSL_PCREQUIRES="coinmetis $HSL_PCREQUIRES"
     22183          HSL_CFLAGS="$METIS_CFLAGS $HSL_CFLAGS"
     22184          HSL_LIBS="$METIS_LIBS $HSL_LIBS"
    2217322185
    2217422186
     
    2219322205    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2219422206    export PKG_CONFIG_PATH
    22195 
    22196     # augment X_CFLAGS and X_LIBS for each build target X in HSL
    22197 
    22198       HSL_CFLAGS="$METIS_CFLAGS $HSL_CFLAGS"
    22199       HSL_LIBS="$METIS_LIBS $HSL_LIBS"
    2220022207
    2220122208  else
     
    2228122288        pcifilemod=`sed -e '/[a-zA-Z]:/d' -e 's/datadir=\(.*\)/echo projdatadir=\\\\"\1\\\\"/g' $pcifile`
    2228222289        eval `sh -c "$pcifilemod"`
     22290        if test "${CYGPATH_W}" != "echo"; then
     22291          projdatadir="\`\$(CYGPATH_W) ${projdatadir} | sed -e 's/\\\\\\\\/\\\\\\\\\\\\\\\\/g'\`"
     22292        fi
    2228322293        METIS_DATA_INSTALLED="$projdatadir"
    2228422294      fi
     
    2232122331
    2232222332    # set projcflags and projlibs variables by running $pcfilemod
     22333    projcflags=
     22334    projlibs=
    2232322335    eval `sh -c "$pcfilemod"`
    2232422336
    2232522337    # add CYGPATH_W cludge into include flags and set CFLAGS variable
    22326     projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     22338    if test "${CYGPATH_W}" != "echo"; then
     22339      projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     22340    fi
    2232722341    METIS_CFLAGS="$projcflags $METIS_CFLAGS"
    2232822342
     
    2236222376
    2236322377    # set projcflags and projlibs variables by running $pcfilemod
     22378    projcflags=
     22379    projlibs=
    2236422380    eval `sh -c "$pcfilemod"`
    2236522381
    2236622382    # add CYGPATH_W cludge into include flags and set CFLAGS variable
    22367     projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     22383    if test "${CYGPATH_W}" != "echo"; then
     22384      projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'`
     22385    fi
    2236822386    METIS_CFLAGS_INSTALLED="$projcflags $METIS_CFLAGS_INSTALLED"
    2236922387
     
    2238722405_ACEOF
    2238822406
     22407
     22408  # adjust linker flags for (i)cl compiler
     22409  # for the LIBS, we replace everything of the form "/somepath/name.lib" by "`$(CYGPATH_W) /somepath/`name.lib | sed -e s|\|/|g" (where we have to use excessive many \ to get the \ into the command line for cl),
     22410  # for the LIBS_INSTALLED, we replace everything of the form "/somepath/" by "`$(CYGPATH_W) /somepath/`",
     22411  #    everything of the form "-Lpath" by "/libpath:`$(CYGPATH_W) path`, and
     22412  #    everything of the form "-lname" by "libname.lib"
     22413  if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
     22414  then
     22415    METIS_LIBS=`echo " $METIS_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
     22416    METIS_LIBS_INSTALLED=`echo " $METIS_LIBS_INSTALLED" | sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g'`
     22417  fi
    2238922418
    2239022419
     
    2242822457  # construct dependencies variables from LIBS variables
    2242922458  # we add an extra space in LIBS so we can substitute out everything starting with " -"
    22430   METIS_DEPENDENCIES=`echo " $METIS_LIBS" | sed -e 's/ -[^ ]*//g'`
    22431 
    22432     HSL_DEPENDENCIES=`echo " $HSL_LIBS" | sed -e 's/ -[^ ]*//g'`
     22459  # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
     22460  METIS_DEPENDENCIES=`echo " $METIS_LIBS" | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     22461
     22462    HSL_DEPENDENCIES=`echo " $HSL_LIBS " | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2243322463
    2243422464
Note: See TracChangeset for help on using the changeset viewer.