Changeset 14


Ignore:
Timestamp:
May 17, 2006 1:01:38 AM (14 years ago)
Author:
andreasw
Message:

several fixes for Cygwin; automatically gunzip data files of zlib not available

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r13 r14  
    130130
    131131AC_DEFUN([AC_COIN_SRCDIR_INIT],
    132 [# Initialize the ADDLIBS variable (a number of library require -lm)
    133 ADDLIBS="" #"-lm"
     132[# Initialize the ADDLIBS variable
     133ADDLIBS=
    134134AC_SUBST(ADDLIBS)
    135135
     
    245245        case "$CXX" in
    246246          cl | */cl)
    247             coin_opt_cxxflags='-Ot1'
    248             coin_add_cxxflags='-nologo -EHsc -GR -MT'
     247            coin_opt_cxxflags='-O2'
     248            coin_add_cxxflags='-nologo -GX -GR -MT'
    249249            coin_dbg_cxxflags='-Yd'
    250250            ;;
     
    481481        case "$CC" in
    482482          cl | */cl)
    483             coin_opt_cflags='-Ot1'
     483            coin_opt_cflags='-O2'
    484484            coin_add_cflags='-nologo'
    485485            coin_dbg_cflags='-Yd'
     
    10011001          -e 's%lib /OUT:%lib -OUT:%' \
    10021002          -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%' \
    10041004          -e 's/$AR t/lib -nologo -list/' \
     1005          -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
    10051006      libtool > conftest.bla
    10061007
     
    10971098# to check if a user wants to compile GNU packges (such as readline or
    10981099# zlib) into the executable.  By default, GNU packages are disabled.
     1100# This also defines the automake conditional COIN_ENABLE_GNU_PACKAGES
    10991101
    11001102AC_DEFUN([AC_COIN_ENABLE_GNU_PACKAGES],
     
    11191121AC_BEFORE([$0],[AC_COIN_FINISH])
    11201122
     1123coin_has_zlib=no
    11211124if test $coin_enable_gnu = yes; then
    1122   coin_has_zlib=no
    11231125  AC_COIN_CHECK_HEADER([zlib.h],[coin_has_zlib=yes])
    11241126
     
    11331135  fi
    11341136fi
     1137
     1138AM_CONDITIONAL(COIN_HAS_ZLIB,test x$coin_has_zlib = xyes)
    11351139]) # AC_COIN_CHECK_ZLIB
    11361140
     
    11491153AC_BEFORE([$0],[AC_COIN_FINISH])
    11501154
     1155coin_has_bzlib=no
    11511156if test $coin_enable_gnu = yes; then
    1152   coin_has_bzlib=no
    11531157  AC_COIN_CHECK_HEADER([bzlib.h],[coin_has_bzlib=yes])
    11541158
     
    11821186AC_BEFORE([$0],[AC_COIN_FINISH])
    11831187
     1188coin_has_readline=no
    11841189if test $coin_enable_gnu = yes; then
    1185   coin_has_readline=no
    11861190  AC_COIN_CHECK_HEADER([readline/readline.h],
    11871191                       [coin_has_readline=yes],[],
     
    12441248# argument in an "ls" command) and sets up the variables EXAMPLE_FILES
    12451249# 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.
    12471251
    12481252AC_DEFUN([AC_COIN_EXAMPLE_FILES],
    1249 [AC_REQUIRE([AC_COIN_CHECK_VPATH])
     1253[AC_REQUIRE([AC_COIN_CHECK_ZLIB])
     1254AC_REQUIRE([AC_COIN_CHECK_VPATH])
    12501255files=`cd $srcdir; ls $1`
    12511256# We need to do the following loop to make sure that are no newlines
     
    12661271fi
    12671272
     1273# In case there are compressed files, we create a variable with the
     1274# uncompressed names
     1275EXAMPLE_UNCOMPRESSED_FILES=
     1276for 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
     1282done
     1283
     1284AC_SUBST(EXAMPLE_UNCOMPRESSED_FILES)
    12681285AC_SUBST(EXAMPLE_FILES)
    12691286AC_SUBST(EXAMPLE_CLEAN_FILES)
Note: See TracChangeset for help on using the changeset viewer.