Changeset 519


Ignore:
Timestamp:
Aug 20, 2007 12:02:31 AM (13 years ago)
Author:
andreasw
Message:

merging changes from Bug Squashing Party Aug 2007 to regular trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r446 r519  
    462462  [if test "$enable_doscompile" != no; then
    463463     case $build in
    464        *-cygwin*) ;;
    465        *) AC_MSG_ERROR([--enable-doscompile option makes sense only under Cygwin]) ;;
     464       *-cygwin* | *-mingw*) ;;
     465       *) AC_MSG_ERROR([--enable-doscompile option makes sense only under Cygwin or MinGW]) ;;
    466466     esac
    467467   fi],
    468468  [enable_doscompile=no])
    469469 case "$enable_doscompile" in
    470    msvc|mingw|no) ;;
     470   mingw)
     471     case $build in
     472       *-mingw*) enable_doscompile=no ;;
     473     esac
     474     ;;
     475   msvc|no) ;;
    471476   yes) enable_doscompile=mingw ;;
    472477   *) AC_MSG_ERROR([Invalid value $enable_doscompile for --enable-doscompile.
     
    617622          xlC* | */xlC* | mpxlC* | */mpxlC*)
    618623            coin_opt_cxxflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
    619             coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna"
     624            coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036 -qsuppress=1500-029"
    620625            coin_dbg_cxxflags="-g"
    621626            ;;
     
    977982          xlc* | */xlc* | mpxlc* | */mpxlc*)
    978983            coin_opt_cflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
    979             coin_add_cflags="-bmaxdata:0x80000000"
     984            coin_add_cflags="-bmaxdata:0x80000000 -qsuppress=1500-036 -qsuppress=1500-029"
    980985            coin_dbg_cflags="-g"
    981986          ;;
     
    11931198          xlf* | */xlf* | mpxlf* | */mpxlf* )
    11941199            coin_opt_fflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
    1195             coin_add_fflags="-bmaxdata:0x80000000"
     1200            coin_add_fflags="-bmaxdata:0x80000000 -qsuppress=1500-036 -qsuppress=1500-029"
    11961201            coin_dbg_fflags="-g -C"
    11971202            ;;
     
    21002105AC_BEFORE([AC_COIN_PROG_CC],[$0])
    21012106AC_BEFORE([AC_COIN_PROG_F77],[$0])
    2102 AC_BEFORE([$0],[AC_COIN_FINISH])
     2107AC_BEFORE([$0],[AC_COIN_FINALIZE])
    21032108
    21042109coin_has_zlib=no
     
    21322137AC_BEFORE([AC_COIN_PROG_CC],[$0])
    21332138AC_BEFORE([AC_COIN_PROG_F77],[$0])
    2134 AC_BEFORE([$0],[AC_COIN_FINISH])
     2139AC_BEFORE([$0],[AC_COIN_FINALIZE])
    21352140
    21362141coin_has_bzlib=no
     
    21652170AC_BEFORE([AC_COIN_PROG_CC],[$0])
    21662171AC_BEFORE([AC_COIN_PROG_F77],[$0])
    2167 AC_BEFORE([$0],[AC_COIN_FINISH])
     2172AC_BEFORE([$0],[AC_COIN_FINALIZE])
    21682173
    21692174coin_has_readline=no
     
    22372242fi
    22382243]) # AC_COIN_HAS_DATA
     2244
     2245###########################################################################
     2246#                       COIN_LINK_FROM_FILELIST                           #
     2247###########################################################################
     2248
     2249# This macro creates links (or copies, if necessary) to files listed
     2250# as content in a text file (second argument) into a target directory
     2251# (first argument), which is created if it doesn't exist yet.  If s link
     2252# already exists, nothing happens.
     2253
     2254AC_DEFUN([AC_COIN_LINKCOPY_FROM_FILELIST],
     2255[cmd="$3"
     2256if test -e $srcdir/$2 ; then
     2257  my_target_dir="$1"
     2258  my_link_files=`cat $srcdir/$2`
     2259  my_dirname=`AS_DIRNAME($2)`
     2260#  if test -e $my_target_dir; then : ; else
     2261#    AS_MKDIR_P($my_target_dir)
     2262#  fi
     2263  for i in $my_link_files; do
     2264    #rm -rf $my_target_dir/$i
     2265    if test -e $my_target_dir/$i; then : ; else
     2266      dirn2=`AS_DIRNAME($my_target_dir/$i)`
     2267      if test -e $dirn2; then : ; else
     2268        AS_MKDIR_P($dirn2)
     2269      fi
     2270      $cmd $abs_source_dir/$my_dirname/$i $my_target_dir/$i
     2271    fi
     2272  done
     2273else
     2274  AC_MSG_WARN([File list file $2 missing!])
     2275fi
     2276])
     2277
     2278AC_DEFUN([AC_COIN_LINK_FROM_FILELIST],
     2279[
     2280AC_REQUIRE([AC_COIN_LINK_INPUT_CMD])
     2281echo Creating links in $1 ...
     2282AC_COIN_LINKCOPY_FROM_FILELIST($1, $2, $coin_link_input_cmd)
     2283])
     2284
     2285###########################################################################
     2286#                       COIN_COPY_FROM_FILELIST                           #
     2287###########################################################################
     2288
     2289# Like COIN_LINK_FROM_FILELIST, but copies the files.
     2290
     2291AC_DEFUN([AC_COIN_COPY_FROM_FILELIST],
     2292[
     2293echo Creating copies in $1 ...
     2294AC_COIN_LINKCOPY_FROM_FILELIST($1, $2, [cp])
     2295])
    22392296
    22402297###########################################################################
Note: See TracChangeset for help on using the changeset viewer.