Changeset 2428

Timestamp:

Sep 3, 2011 1:10:44 PM (8 years ago)

Author:

stefan

Message:

sync with trunk rev2426

Location:

ThirdParty/SoPlex/stable/1.0

Files:

• . (modified) (1 prop)
• configure (modified) (4 diffs)

ThirdParty/SoPlex/stable/1.0/configure

@@ -1099 +1099 @@
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-gnu-packages   compile with GNU packages (disabled by default)
+  --disable-zlib          do not compile with compression library zlib
 
 Optional Packages:
@@ -20746 +20746 @@
 ###########################################################################
 
-# Check whether --enable-gnu-packages or --disable-gnu-packages was given.
-if test "${enable_gnu_packages+set}" = set; then
-  enableval="$enable_gnu_packages"
-  coin_enable_gnu=$enableval
-else
-  coin_enable_gnu=no
+
+
+
+
+
+
+coin_has_zlib=no
+
+# Check whether --enable-zlib or --disable-zlib was given.
+if test "${enable_zlib+set}" = set; then
+  enableval="$enable_zlib"
+  coin_enable_zlib=$enableval
+else
+  coin_enable_zlib=yes
 fi;
 
-
-
-
-
-
-
-coin_has_zlib=no
-if test $coin_enable_gnu = yes; then
+if test $coin_enable_zlib = yes; then
   #if test x"" = x; then
 #  hdr="#include <zlib.h>"
@@ -20986 +20987 @@
 echo "${ECHO_T}$ac_cv_lib_z_gzopen" >&6
 if test $ac_cv_lib_z_gzopen = yes; then
+  :
+else
+  coin_has_zlib=no
+fi
+
+  fi
+
+  if test $coin_has_zlib = yes; then
 
                     SOPLEX_LIBS="-lz $SOPLEX_LIBS"
@@ -20991 +21000 @@
                     SOPLEX_LIBS_INSTALLED="-lz $SOPLEX_LIBS_INSTALLED"
 
-                 :
-else
-  coin_has_zlib=no
-fi
-
-  fi
-
-  if test $coin_has_zlib = yes; then
 
 cat >>confdefs.h <<\_ACEOF