Changeset 201 for ThirdParty/Blas


Ignore:
Timestamp:
Dec 21, 2006 12:10:50 AM (13 years ago)
Author:
andreasw
Message:

corrected libtool fixes on Cygwin - was screwed up after re-use changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Blas/trunk/configure

    r195 r201  
    25522552# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
    25532553case "$CC" in
    2554   cl* | */cl*)
     2554  cl* | */cl* | CL* | */CL* )
    25552555    if test "$ac_cv_prog_cc_g" = yes ; then
    25562556      ac_cv_prog_cc_g=no
     
    32943294      *-cygwin* | *-mingw*)
    32953295        case $F77 in
    3296           ifort* | */ifort*)
     3296          ifort* | */ifort* | IFORT* | */IFORT* )
    32973297            coin_opt_fflags='-O3'
    32983298            coin_add_fflags='-nologo -MT'
     
    1994419944
    1994519945
    19946 # NEW: If libtool exists in the directory higher up, we use that one
    19947 #      instead of creating a new one
    19948 
    19949 if test "x$LIBTOOL" = x; then
    19950   # We check for this header here in a non-standard way to avoid warning
    19951   # messages
     19946# We check for this header here in a non-standard way to avoid warning
     19947# messages
    1995219948
    1995319949
     
    1996419960# - paths generated for .lib files is not run through cygpath -w
    1996519961
    19966 
    19967 # - lib includes subdirectory information; we want to replace
    19968 #
    19969 # old_archive_cmds="lib /OUT:\$oldlib\$oldobjs\$old_deplibs"
    19970 #
    19971 # by
    19972 #
    19973 # old_archive_cmds="echo \$oldlib | grep .libs >/dev/null; if test \$? = 0; then cd .libs; lib /OUT:\`echo \$oldlib\$oldobjs\$old_deplibs | sed -e s@\.libs/@@g\`; cd .. ; else lib /OUT:\$oldlib\$oldobjs\$old_deplibs ; fi"
    19974 #
    19975 #          -e 's%old_archive_cmds="lib /OUT:\\\$oldlib\\\$oldobjs\\\$old_deplibs"%old_archive_cmds="echo \\\$oldlib \| grep .libs >/dev/null; if test \\\$? = 0; then cd .libs; lib /OUT:\\\`echo \\\$oldlib\\\$oldobjs\\\$old_deplibs \| sed -e s@\\.libs/@@g\\\`; cd .. ; else lib /OUT:\\\$oldlib\\\$oldobjs\\\$old_deplibs; fi"%' \
    19976 
    19977 # The following was a hack for chaniing @BACKSLASH to \
    19978 #          -e 'sYcompile_command=`\$echo "X\$compile_command" | \$Xsed -e '"'"'s%@OUTPUT@%'"'"'"\$output"'"'"'%g'"'"'`Ycompile_command=`\$echo "X\$compile_command" | \$Xsed -e '"'"'s%@OUTPUT@%'"'"'"\$output"'"'"'%g'"'"' | \$Xsed -e '"'"'s%@BACKSLASH@%\\\\\\\\\\\\\\\\%g'"'"'`Y' \
    19979 
    19980   # Correct cygpath for minGW (ToDo!)
    19981   case $build in
    19982     *-mingw*)
    19983       CYGPATH_W=echo
     19962# Correct cygpath for minGW (ToDo!)
     19963case $build in
     19964  *-mingw*)
     19965    CYGPATH_W=echo
     19966    ;;
     19967esac
     19968
     19969case $build in
     19970  *-cygwin* | *-mingw*)
     19971  case "$CXX" in
     19972    cl* | */cl* | CL* | */CL*)
     19973      { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
     19974echo "$as_me: Applying patches to libtool for cl compiler" >&6;}
     19975      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     19976          -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     19977          -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     19978          -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     19979          -e 's%lib /OUT:%lib -OUT:%' \
     19980          -e "s%cygpath -w%$CYGPATH_W%" \
     19981          -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
     19982          -e 's/$AR t/lib -nologo -list/' \
     19983          -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
     19984          -e  's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
     19985      libtool > conftest.bla
     19986
     19987      mv conftest.bla libtool
     19988      chmod 755 libtool
     19989      ;;
     19990    *)
     19991      { echo "$as_me:$LINENO: Applying patches to libtool for GNU compiler" >&5
     19992echo "$as_me: Applying patches to libtool for GNU compiler" >&6;}
     19993      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     19994          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
     19995          -e 's|libext="lib"|libext="a"|' \
     19996      libtool > conftest.bla
     19997
     19998      mv conftest.bla libtool
     19999      chmod 755 libtool
    1998420000      ;;
    1998520001  esac
    19986 
    19987   case $build in
    19988     *-cygwin* | *-mingw*)
    19989     case "$CXX" in
    19990       cl* | */cl* | CL* | */CL*)
    19991         { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
    19992 echo "$as_me: Applying patches to libtool for cl compiler" >&6;}
    19993         sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    19994             -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    19995             -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    19996             -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    19997             -e 's%lib /OUT:%lib -OUT:%' \
    19998             -e "s%cygpath -w%$CYGPATH_W%" \
    19999             -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
    20000             -e 's/$AR t/lib -nologo -list/' \
    20001             -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
    20002             -e  's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
    20003         libtool > conftest.bla
    20004 
    20005         mv conftest.bla libtool
    20006         chmod 755 libtool
    20007         ;;
    20008       *)
    20009         { echo "$as_me:$LINENO: Applying patches to libtool for GNU compiler" >&5
    20010 echo "$as_me: Applying patches to libtool for GNU compiler" >&6;}
    20011         sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    20012             -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
    20013             -e 's|libext="lib"|libext="a"|' \
    20014         libtool > conftest.bla
    20015 
    20016         mv conftest.bla libtool
    20017         chmod 755 libtool
    20018         ;;
    20019     esac
    20020   esac
    20021 fi
    20022 
     20002esac
    2002320003
    2002420004
Note: See TracChangeset for help on using the changeset viewer.