Changeset 14
- Timestamp:
- May 17, 2006 1:01:38 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/coin.m4
r13 r14 130 130 131 131 AC_DEFUN([AC_COIN_SRCDIR_INIT], 132 [# Initialize the ADDLIBS variable (a number of library require -lm)133 ADDLIBS= "" #"-lm"132 [# Initialize the ADDLIBS variable 133 ADDLIBS= 134 134 AC_SUBST(ADDLIBS) 135 135 … … 245 245 case "$CXX" in 246 246 cl | */cl) 247 coin_opt_cxxflags='-O t1'248 coin_add_cxxflags='-nologo - EHsc-GR -MT'247 coin_opt_cxxflags='-O2' 248 coin_add_cxxflags='-nologo -GX -GR -MT' 249 249 coin_dbg_cxxflags='-Yd' 250 250 ;; … … 481 481 case "$CC" in 482 482 cl | */cl) 483 coin_opt_cflags='-O t1'483 coin_opt_cflags='-O2' 484 484 coin_add_cflags='-nologo' 485 485 coin_dbg_cflags='-Yd' … … 1001 1001 -e 's%lib /OUT:%lib -OUT:%' \ 1002 1002 -e "s%cygpath -w%$CYGPATH_W%" \ 1003 -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo\\`; echo dd\\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \1003 -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%' \ 1004 1004 -e 's/$AR t/lib -nologo -list/' \ 1005 -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \ 1005 1006 libtool > conftest.bla 1006 1007 … … 1097 1098 # to check if a user wants to compile GNU packges (such as readline or 1098 1099 # zlib) into the executable. By default, GNU packages are disabled. 1100 # This also defines the automake conditional COIN_ENABLE_GNU_PACKAGES 1099 1101 1100 1102 AC_DEFUN([AC_COIN_ENABLE_GNU_PACKAGES], … … 1119 1121 AC_BEFORE([$0],[AC_COIN_FINISH]) 1120 1122 1123 coin_has_zlib=no 1121 1124 if test $coin_enable_gnu = yes; then 1122 coin_has_zlib=no1123 1125 AC_COIN_CHECK_HEADER([zlib.h],[coin_has_zlib=yes]) 1124 1126 … … 1133 1135 fi 1134 1136 fi 1137 1138 AM_CONDITIONAL(COIN_HAS_ZLIB,test x$coin_has_zlib = xyes) 1135 1139 ]) # AC_COIN_CHECK_ZLIB 1136 1140 … … 1149 1153 AC_BEFORE([$0],[AC_COIN_FINISH]) 1150 1154 1155 coin_has_bzlib=no 1151 1156 if test $coin_enable_gnu = yes; then 1152 coin_has_bzlib=no1153 1157 AC_COIN_CHECK_HEADER([bzlib.h],[coin_has_bzlib=yes]) 1154 1158 … … 1182 1186 AC_BEFORE([$0],[AC_COIN_FINISH]) 1183 1187 1188 coin_has_readline=no 1184 1189 if test $coin_enable_gnu = yes; then 1185 coin_has_readline=no1186 1190 AC_COIN_CHECK_HEADER([readline/readline.h], 1187 1191 [coin_has_readline=yes],[], … … 1244 1248 # argument in an "ls" command) and sets up the variables EXAMPLE_FILES 1245 1249 # and EXAMPLE_CLEAN_FILES. If this is a VPATH configuration, it also 1246 # creates soft links to the example files 1250 # creates soft links to the example files. 1247 1251 1248 1252 AC_DEFUN([AC_COIN_EXAMPLE_FILES], 1249 [AC_REQUIRE([AC_COIN_CHECK_VPATH]) 1253 [AC_REQUIRE([AC_COIN_CHECK_ZLIB]) 1254 AC_REQUIRE([AC_COIN_CHECK_VPATH]) 1250 1255 files=`cd $srcdir; ls $1` 1251 1256 # We need to do the following loop to make sure that are no newlines … … 1266 1271 fi 1267 1272 1273 # In case there are compressed files, we create a variable with the 1274 # uncompressed names 1275 EXAMPLE_UNCOMPRESSED_FILES= 1276 for file in $EXAMPLE_FILES; do 1277 case $file in 1278 *.gz) 1279 EXAMPLE_UNCOMPRESSED_FILES="$EXAMPLE_UNCOMPRESSED_FILES `echo $file | sed -e s/.gz//`" 1280 ;; 1281 esac 1282 done 1283 1284 AC_SUBST(EXAMPLE_UNCOMPRESSED_FILES) 1268 1285 AC_SUBST(EXAMPLE_FILES) 1269 1286 AC_SUBST(EXAMPLE_CLEAN_FILES)
Note: See TracChangeset
for help on using the changeset viewer.