Changeset 535

Timestamp:

Aug 21, 2007 2:05:00 PM (13 years ago)

Author:

andreasw

Message:

sychronizing trunk rev 534 with ASL/stable/1.0

Location:

ThirdParty/ASL/stable/1.0

Files:

• configure (modified) (4 diffs)
• configure.ac (modified) (1 diff)
• get.ASL (modified) (2 diffs)

ThirdParty/ASL/stable/1.0/configure

@@ -1436 +1436 @@
 
 
+#turn off warnings and pedantic mode since they could make trouble on some platforms,
+#and we couldn't fix them anyway
+coin_skip_warn_cflags=yes
+
 # Check if user wants to produce debugging code
 
@@ -1583 +1587 @@
   if test "$enable_doscompile" != no; then
      case $build in
-       *-cygwin*) ;;
-       *) { { echo "$as_me:$LINENO: error: --enable-doscompile option makes sense only under Cygwin" >&5
-echo "$as_me: error: --enable-doscompile option makes sense only under Cygwin" >&2;}
+       *-cygwin* | *-mingw*) ;;
+       *) { { echo "$as_me:$LINENO: error: --enable-doscompile option makes sense only under Cygwin or MinGW" >&5
+echo "$as_me: error: --enable-doscompile option makes sense only under Cygwin or MinGW" >&2;}
    { (exit 1); exit 1; }; } ;;
      esac
@@ -1593 +1597 @@
 fi;
  case "$enable_doscompile" in
-   msvc|mingw|no) ;;
+   mingw)
+     case $build in
+       *-mingw*) enable_doscompile=no ;;
+     esac
+     ;;
+   msvc|no) ;;
    yes) enable_doscompile=mingw ;;
    *) { { echo "$as_me:$LINENO: error: Invalid value $enable_doscompile for --enable-doscompile.
@@ -2543 +2552 @@
           xlc* | */xlc* | mpxlc* | */mpxlc*)
             coin_opt_cflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
-            coin_add_cflags="-bmaxdata:0x80000000"
+            coin_add_cflags="-bmaxdata:0x80000000 -qsuppress=1500-036 -qsuppress=1500-029"
             coin_dbg_cflags="-g"
           ;;

ThirdParty/ASL/stable/1.0/configure.ac

@@ -39 +39 @@
 # Get the system type
 AC_CANONICAL_BUILD
+
+#turn off warnings and pedantic mode since they could make trouble on some platforms,
+#and we couldn't fix them anyway
+coin_skip_warn_cflags=yes
 
 # Check if user wants to produce debugging code

ThirdParty/ASL/stable/1.0/get.ASL

@@ -1 +1 @@
 #!/bin/sh
 
+set -e
+
+wgetcmd=wget
 wgetcount=`which wget 2>/dev/null | wc -w`
 if test ! $wgetcount = 1; then
   echo "Utility wget not found in your PATH."
-  exit -1
+  if test `uname` = Darwin; then
+    wgetcmd=ftp
+    echo "Using ftp command instead."
+  else
+    exit -1
+  fi
 fi
 
@@ -13 +21 @@
 rm -f solvers.tar
 echo "Downloading the source code from www.netlib.org..."
-wget ftp://www.netlib.org/ampl/solvers.tar
+$wgetcmd ftp://www.netlib.org/ampl/solvers.tar
 
 echo "Unpacking the source code..."