Changeset 2287


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

sync with trunk rev2286

Location:
stable/0.7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

  • stable/0.7/coin.m4

    r2254 r2287  
    20342034  fi
    20352035
     2036  AC_MSG_NOTICE([In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting])
    20362037  if test x$coin_projectdir = xyes; then
    20372038    AC_MSG_NOTICE([Configuration of $PACKAGE_NAME successful])
     
    34043405      # add projrequires to the front of the list of projects that have to be processed next
    34053406      # at the same time, remove $proj from this list
    3406       projtoprocess=${projtoprocess/$proj/$projrequires}
     3407      projtoprocess=[`echo $projtoprocess | sed -e "s/$proj/$projrequires/"`]
    34073408
    34083409      # read DATA from $pcfile, if _DATA is still empty
     
    34743475
    34753476    # set projcflags and projlibs variables by running $pcfilemod
     3477    # 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
    34763478    projcflags=
    34773479    projlibs=
     3480    IFS="$save_IFS"
    34783481    eval `sh -c "$pcfilemod"`
     3482    IFS=":"
    34793483
    34803484    # add CYGPATH_W cludge into include flags and set CFLAGS variable
     
    35193523
    35203524    # set projcflags and projlibs variables by running $pcfilemod
     3525    # 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
    35213526    projcflags=
    35223527    projlibs=
     3528    IFS="$save_IFS"
    35233529    eval `sh -c "$pcfilemod"`
     3530    IFS=":"
    35243531
    35253532    # add CYGPATH_W cludge into include flags and set CFLAGS variable
     
    35473554  # 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),
    35483555  # for the LIBS_INSTALLED, we replace everything of the form "/somepath/" by "`$(CYGPATH_W) /somepath/`",
    3549   #    everything of the form "-Lpath" by "/libpath:`$(CYGPATH_W) path`, and
    3550   #    everything of the form "-lname" by "libname.lib"
     3556  #    everything of the form "-lname" by "libname.lib", and
     3557  #    everything of the form "-Lpath" by "-libpath:`$(CYGPATH_W) path`
    35513558  if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
    35523559  then
    35533560    m4_toupper($1_LIBS)=`echo " $m4_toupper($1_LIBS) " | [sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g']`
    3554     m4_toupper($1_LIBS_INSTALLED)=`echo " $m4_toupper($1_LIBS_INSTALLED)" | [sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g']`
     3561    m4_toupper($1_LIBS_INSTALLED)=`echo " $m4_toupper($1_LIBS_INSTALLED)" | [sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g' -e 's/ -L\([^ ]*\)/ -libpath:\`$(CYGPATH_W) \1\`/g']`
    35553562  fi
    35563563
  • stable/0.7/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.