Changeset 2287 for stable/0.7
- Timestamp:
- Jun 15, 2011 8:07:45 AM (10 years ago)
- Location:
- stable/0.7
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/0.7
- Property svn:mergeinfo changed
/trunk merged: 2258-2262,2273
- Property svn:mergeinfo changed
-
stable/0.7/coin.m4
r2254 r2287 2034 2034 fi 2035 2035 2036 AC_MSG_NOTICE([In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting]) 2036 2037 if test x$coin_projectdir = xyes; then 2037 2038 AC_MSG_NOTICE([Configuration of $PACKAGE_NAME successful]) … … 3404 3405 # add projrequires to the front of the list of projects that have to be processed next 3405 3406 # at the same time, remove $proj from this list 3406 projtoprocess= ${projtoprocess/$proj/$projrequires}3407 projtoprocess=[`echo $projtoprocess | sed -e "s/$proj/$projrequires/"`] 3407 3408 3408 3409 # read DATA from $pcfile, if _DATA is still empty … … 3474 3475 3475 3476 # 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 3476 3478 projcflags= 3477 3479 projlibs= 3480 IFS="$save_IFS" 3478 3481 eval `sh -c "$pcfilemod"` 3482 IFS=":" 3479 3483 3480 3484 # add CYGPATH_W cludge into include flags and set CFLAGS variable … … 3519 3523 3520 3524 # 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 3521 3526 projcflags= 3522 3527 projlibs= 3528 IFS="$save_IFS" 3523 3529 eval `sh -c "$pcfilemod"` 3530 IFS=":" 3524 3531 3525 3532 # add CYGPATH_W cludge into include flags and set CFLAGS variable … … 3547 3554 # 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), 3548 3555 # 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`, and3550 # 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` 3551 3558 if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ; 3552 3559 then 3553 3560 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']` 3555 3562 fi 3556 3563 -
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.