Changeset 2273


Ignore:
Timestamp:
Jun 15, 2011 4:52:09 AM (9 years ago)
Author:
stefan
Message:

fix recent fix for mingw: need to replace -l before -L to avoid double replace

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r2262 r2273  
    35543554  # 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),
    35553555  # for the LIBS_INSTALLED, we replace everything of the form "/somepath/" by "`$(CYGPATH_W) /somepath/`",
    3556   #    everything of the form "-Lpath" by "-libpath:`$(CYGPATH_W) path`, and
    3557   #    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`
    35583558  if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
    35593559  then
    35603560    m4_toupper($1_LIBS)=`echo " $m4_toupper($1_LIBS) " | [sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g']`
    3561     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']`
    35623562  fi
    35633563
Note: See TracChangeset for help on using the changeset viewer.