Changeset 2285


Ignore:
Timestamp:
Jun 15, 2011 8:03:01 AM (8 years ago)
Author:
stefan
Message:

rerun autotools; merge fixes in example Makefiles for mingw/cl from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/stable/1.3/configure

    r2194 r2285  
    28082808        coin_opt_cflags="-O3"
    28092809        coin_add_cflags="-pipe"
    2810         coin_dbg_cflags="-g"
     2810        coin_dbg_cflags="-g -O0"
    28112811        coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas"
    28122812        case $build in
     
    35693569    coin_opt_fflags="-O3"
    35703570    coin_add_fflags="-pipe"
    3571     coin_dbg_fflags="-g"
     3571    coin_dbg_fflags="-g -O0"
    35723572    case $enable_doscompile in
    35733573      mingw)
     
    2402024020BLAS_DATA_INSTALLED=
    2402124021
    24022 # initial list of dependencies is "coinblas", but we need to filter out version number specifications (= x, <= x, >= x)
     24022# initial list of dependencies is "coinblas", but we need to filter out version number specifications (= x, <= x, >= x, != x)
    2402324023projtoprocess="coinblas"
    2402424024
     
    2405924059      # add projrequires to the front of the list of projects that have to be processed next
    2406024060      # at the same time, remove $proj from this list
    24061       projtoprocess=${projtoprocess/$proj/$projrequires}
     24061      projtoprocess=`echo $projtoprocess | sed -e "s/$proj/$projrequires/"`
    2406224062
    2406324063      # read DATA from $pcfile, if _DATA is still empty
     
    2413024130
    2413124131    # set projcflags and projlibs variables by running $pcfilemod
     24132    # under mingw, the current IFS seem to make the : in the paths of the gfortran libs go away, so we temporarily set IFS back to its default
    2413224133    projcflags=
    2413324134    projlibs=
     24135    IFS="$save_IFS"
    2413424136    eval `sh -c "$pcfilemod"`
     24137    IFS=":"
    2413524138
    2413624139    # add CYGPATH_W cludge into include flags and set CFLAGS variable
     
    2417524178
    2417624179    # set projcflags and projlibs variables by running $pcfilemod
     24180    # under mingw, the current IFS seem to make the : in the paths of the gfortran libs go away, so we temporarily set IFS back to its default
    2417724181    projcflags=
    2417824182    projlibs=
     24183    IFS="$save_IFS"
    2417924184    eval `sh -c "$pcfilemod"`
     24185    IFS=":"
    2418024186
    2418124187    # add CYGPATH_W cludge into include flags and set CFLAGS variable
     
    2420824214  # 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),
    2420924215  # for the LIBS_INSTALLED, we replace everything of the form "/somepath/" by "`$(CYGPATH_W) /somepath/`",
    24210   #    everything of the form "-Lpath" by "/libpath:`$(CYGPATH_W) path`, and
    24211   #    everything of the form "-lname" by "libname.lib"
     24216  #    everything of the form "-lname" by "libname.lib", and
     24217  #    everything of the form "-Lpath" by "-libpath:`$(CYGPATH_W) path`
    2421224218  if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
    2421324219  then
    2421424220    BLAS_LIBS=`echo " $BLAS_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
    24215     BLAS_LIBS_INSTALLED=`echo " $BLAS_LIBS_INSTALLED" | sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g'`
     24221    BLAS_LIBS_INSTALLED=`echo " $BLAS_LIBS_INSTALLED" | sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g' -e 's/ -L\([^ ]*\)/ -libpath:\`$(CYGPATH_W) \1\`/g'`
    2421624222  fi
    2421724223
     
    2453824544METIS_DATA_INSTALLED=
    2453924545
    24540 # initial list of dependencies is "coinmetis >= 4.0", but we need to filter out version number specifications (= x, <= x, >= x)
     24546# initial list of dependencies is "coinmetis >= 4.0", but we need to filter out version number specifications (= x, <= x, >= x, != x)
    2454124547projtoprocess="coinmetis "
    2454224548
     
    2457724583      # add projrequires to the front of the list of projects that have to be processed next
    2457824584      # at the same time, remove $proj from this list
    24579       projtoprocess=${projtoprocess/$proj/$projrequires}
     24585      projtoprocess=`echo $projtoprocess | sed -e "s/$proj/$projrequires/"`
    2458024586
    2458124587      # read DATA from $pcfile, if _DATA is still empty
     
    2464824654
    2464924655    # set projcflags and projlibs variables by running $pcfilemod
     24656    # under mingw, the current IFS seem to make the : in the paths of the gfortran libs go away, so we temporarily set IFS back to its default
    2465024657    projcflags=
    2465124658    projlibs=
     24659    IFS="$save_IFS"
    2465224660    eval `sh -c "$pcfilemod"`
     24661    IFS=":"
    2465324662
    2465424663    # add CYGPATH_W cludge into include flags and set CFLAGS variable
     
    2469324702
    2469424703    # set projcflags and projlibs variables by running $pcfilemod
     24704    # under mingw, the current IFS seem to make the : in the paths of the gfortran libs go away, so we temporarily set IFS back to its default
    2469524705    projcflags=
    2469624706    projlibs=
     24707    IFS="$save_IFS"
    2469724708    eval `sh -c "$pcfilemod"`
     24709    IFS=":"
    2469824710
    2469924711    # add CYGPATH_W cludge into include flags and set CFLAGS variable
     
    2472624738  # 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),
    2472724739  # for the LIBS_INSTALLED, we replace everything of the form "/somepath/" by "`$(CYGPATH_W) /somepath/`",
    24728   #    everything of the form "-Lpath" by "/libpath:`$(CYGPATH_W) path`, and
    24729   #    everything of the form "-lname" by "libname.lib"
     24740  #    everything of the form "-lname" by "libname.lib", and
     24741  #    everything of the form "-Lpath" by "-libpath:`$(CYGPATH_W) path`
    2473024742  if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
    2473124743  then
    2473224744    METIS_LIBS=`echo " $METIS_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
    24733     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'`
     24745    METIS_LIBS_INSTALLED=`echo " $METIS_LIBS_INSTALLED" | sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g' -e 's/ -L\([^ ]*\)/ -libpath:\`$(CYGPATH_W) \1\`/g'`
    2473424746  fi
    2473524747
     
    2649626508  fi
    2649726509
     26510  { echo "$as_me:$LINENO: In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting" >&5
     26511echo "$as_me: In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting" >&6;}
    2649826512  if test x$coin_projectdir = xyes; then
    2649926513    { echo "$as_me:$LINENO: Configuration of $PACKAGE_NAME successful" >&5
Note: See TracChangeset for help on using the changeset viewer.