Changeset 202


Ignore:
Timestamp:
Dec 21, 2006 12:10:55 AM (15 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/HSL/trunk/configure

    r196 r202  
    25532553# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
    25542554case "$CC" in
    2555   cl* | */cl*)
     2555  cl* | */cl* | CL* | */CL* )
    25562556    if test "$ac_cv_prog_cc_g" = yes ; then
    25572557      ac_cv_prog_cc_g=no
     
    32953295      *-cygwin* | *-mingw*)
    32963296        case $F77 in
    3297           ifort* | */ifort*)
     3297          ifort* | */ifort* | IFORT* | */IFORT* )
    32983298            coin_opt_fflags='-O3'
    32993299            coin_add_fflags='-nologo -MT'
     
    1994719947
    1994819948
    19949 # NEW: If libtool exists in the directory higher up, we use that one
    19950 #      instead of creating a new one
    19951 
    19952 if test "x$LIBTOOL" = x; then
    19953   # We check for this header here in a non-standard way to avoid warning
    19954   # messages
     19949# We check for this header here in a non-standard way to avoid warning
     19950# messages
    1995519951
    1995619952
     
    1996719963# - paths generated for .lib files is not run through cygpath -w
    1996819964
    19969 
    19970 # - lib includes subdirectory information; we want to replace
    19971 #
    19972 # old_archive_cmds="lib /OUT:\$oldlib\$oldobjs\$old_deplibs"
    19973 #
    19974 # by
    19975 #
    19976 # 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"
    19977 #
    19978 #          -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"%' \
    19979 
    19980 # The following was a hack for chaniing @BACKSLASH to \
    19981 #          -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' \
    19982 
    19983   # Correct cygpath for minGW (ToDo!)
    19984   case $build in
    19985     *-mingw*)
    19986       CYGPATH_W=echo
     19965# Correct cygpath for minGW (ToDo!)
     19966case $build in
     19967  *-mingw*)
     19968    CYGPATH_W=echo
     19969    ;;
     19970esac
     19971
     19972case $build in
     19973  *-cygwin* | *-mingw*)
     19974  case "$CXX" in
     19975    cl* | */cl* | CL* | */CL*)
     19976      { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
     19977echo "$as_me: Applying patches to libtool for cl compiler" >&6;}
     19978      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     19979          -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     19980          -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     19981          -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     19982          -e 's%lib /OUT:%lib -OUT:%' \
     19983          -e "s%cygpath -w%$CYGPATH_W%" \
     19984          -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%' \
     19985          -e 's/$AR t/lib -nologo -list/' \
     19986          -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
     19987          -e  's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
     19988      libtool > conftest.bla
     19989
     19990      mv conftest.bla libtool
     19991      chmod 755 libtool
     19992      ;;
     19993    *)
     19994      { echo "$as_me:$LINENO: Applying patches to libtool for GNU compiler" >&5
     19995echo "$as_me: Applying patches to libtool for GNU compiler" >&6;}
     19996      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     19997          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
     19998          -e 's|libext="lib"|libext="a"|' \
     19999      libtool > conftest.bla
     20000
     20001      mv conftest.bla libtool
     20002      chmod 755 libtool
    1998720003      ;;
    1998820004  esac
    19989 
    19990   case $build in
    19991     *-cygwin* | *-mingw*)
    19992     case "$CXX" in
    19993       cl* | */cl* | CL* | */CL*)
    19994         { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
    19995 echo "$as_me: Applying patches to libtool for cl compiler" >&6;}
    19996         sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    19997             -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    19998             -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    19999             -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    20000             -e 's%lib /OUT:%lib -OUT:%' \
    20001             -e "s%cygpath -w%$CYGPATH_W%" \
    20002             -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%' \
    20003             -e 's/$AR t/lib -nologo -list/' \
    20004             -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
    20005             -e  's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
    20006         libtool > conftest.bla
    20007 
    20008         mv conftest.bla libtool
    20009         chmod 755 libtool
    20010         ;;
    20011       *)
    20012         { echo "$as_me:$LINENO: Applying patches to libtool for GNU compiler" >&5
    20013 echo "$as_me: Applying patches to libtool for GNU compiler" >&6;}
    20014         sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    20015             -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
    20016             -e 's|libext="lib"|libext="a"|' \
    20017         libtool > conftest.bla
    20018 
    20019         mv conftest.bla libtool
    20020         chmod 755 libtool
    20021         ;;
    20022     esac
    20023   esac
    20024 fi
    20025 
     20005esac
    2002620006
    2002720007
Note: See TracChangeset for help on using the changeset viewer.