Changeset 91 for stable/2.1/configure.ac


Ignore:
Timestamp:
Feb 24, 2010 2:56:58 AM (10 years ago)
Author:
awalther
Message:

mergestable version 2.1 with revision 89

Location:
stable/2.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.1

  • stable/2.1/configure.ac

    r62 r91  
    1010define([ADOLC_VER], [2])
    1111define([ADOLC_SUB], [1])
    12 define([ADOLC_LVL], [1])
     12define([ADOLC_LVL], [3])
    1313
    1414AC_PREREQ(2.57)
     
    202202             fi
    203203             ac_adolc_cflags="$ac_adolc_cflags $ac_adolc_openmpflag"
    204              if test "$GCC" = yes; then
    205                 ac_adolc_cflags="$ac_adolc_cflags -DAD_ERR_FUN=1"
    206              fi
    207204
    208205             AC_SUBST(ac_adolc_cflags)
     
    231228             fi
    232229             ac_adolc_cxxflags="$ac_adolc_cxxflags $ac_adolc_openmpflag"
    233              if test "$GCC" = yes; then
    234                 ac_adolc_cxxflags="$ac_adolc_cxxflags -DAD_ERR_FUN=1"
    235              fi
    236              AC_SUBST(ac_adolc_cxxflags)
     230            AC_SUBST(ac_adolc_cxxflags)
    237231             AC_MSG_RESULT($ac_adolc_cxxflags)])
    238232
     
    246240# - paths generated for .lib files is not run through cygpath -w
    247241
     242#
     243# REQUIRED FOR COMPILATION WITH CYGWIN !!!
     244#
     245 
    248246
    249247AC_DEFUN([AC_COIN_PATCH_LIBTOOL_CYGWIN],
     
    252250      AC_MSG_NOTICE(Applying patches to libtool for cl compiler)
    253251      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    254           -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    255           -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    256           -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    257           -e 's%lib /OUT:%lib -OUT:%' \
    258           -e "s%cygpath -w%$CYGPATH_W%" \
    259           -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo '"$mydos2unix"'\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
    260           -e 's/$AR t/lib -nologo -list/' \
    261           -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
    262           -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
    263           -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
     252          -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     253          -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     254          -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     255          -e 's%lib /OUT:%lib -OUT:%' \
     256          -e "s%cygpath -w%$CYGPATH_W%" \
     257          -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo '"$mydos2unix"'\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
     258          -e 's/$AR t/lib -nologo -list/' \
     259          -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
     260          -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
     261          -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
    264262      libtool > conftest.bla
    265263
     
    270268      AC_MSG_NOTICE(Applying patches to libtool for GNU compiler)
    271269      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    272           -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
    273           -e 's|libext="lib"|libext="a"|' \
     270          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
     271          -e 's|libext="lib"|libext="a"|' \
    274272      libtool > conftest.bla
    275273
     
    278276      ;;
    279277  esac ]) # COIN_PATCH_LIBTOOL_CYGWIN
     278 
    280279
    281280
     
    306305                ADOL-C/examples/additional_examples/tapesave/Makefile
    307306                ADOL-C/examples/additional_examples/pow/Makefile
    308                 ADOL-C/examples/additional_examples/timing/Makefile)
     307                ADOL-C/examples/additional_examples/timing/Makefile
     308                ADOL-C/test/Makefile)
    309309
    310310AC_OUTPUT
    311311
    312 #call libtool for cygwin
    313 AC_COIN_PATCH_LIBTOOL_CYGWIN
     312#call libtool for cygwin 
     313AC_COIN_PATCH_LIBTOOL_CYGWIN 
    314314
    315315# echo configuration
Note: See TracChangeset for help on using the changeset viewer.