Changeset 2427 for ThirdParty/Glpk


Ignore:
Timestamp:
Sep 3, 2011 1:10:14 PM (8 years ago)
Author:
stefan
Message:

sync with trunk rev2425

Location:
ThirdParty/Glpk/stable/1.8
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/stable/1.8

  • ThirdParty/Glpk/stable/1.8/config_glpk.h.in

    r2310 r2427  
    66/* Define to the debug verbosity level (0 is no output) */
    77#undef COIN_GLPK_VERBOSITY
     8
     9/* Define to 1 if GMP is available */
     10#undef COIN_HAS_GMP
    811
    912/* Define to 1 if zlib is available */
  • ThirdParty/Glpk/stable/1.8/configure

    r2376 r2427  
    10791079                          optimize for fast installation [default=yes]
    10801080  --disable-libtool-lock  avoid locking (might break parallel builds)
    1081   --enable-gnu-packages   compile with GNU packages (disabled by default)
     1081  --disable-zlib          do not compile with compression library zlib
     1082  --disable-gmp           do not compile with GNU multiple precision library
    10821083  --enable-odbc           enable MathProg ODBC support [default=auto]
    10831084  --enable-mysql          enable MathProg MySQL support [default=auto]
     
    50435044*-*-irix6*)
    50445045  # Find out which ABI we are using.
    5045   echo '#line 5045 "configure"' > conftest.$ac_ext
     5046  echo '#line 5046 "configure"' > conftest.$ac_ext
    50465047  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    50475048  (eval $ac_compile) 2>&5
     
    66426643
    66436644# Provide some information about the compiler.
    6644 echo "$as_me:6644:" \
     6645echo "$as_me:6645:" \
    66456646     "checking for Fortran 77 compiler version" >&5
    66466647ac_compiler=`set X $ac_compile; echo $2`
     
    77097710   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    77107711   -e 's:$: $lt_compiler_flag:'`
    7711    (eval echo "\"\$as_me:7711: $lt_compile\"" >&5)
     7712   (eval echo "\"\$as_me:7712: $lt_compile\"" >&5)
    77127713   (eval "$lt_compile" 2>conftest.err)
    77137714   ac_status=$?
    77147715   cat conftest.err >&5
    7715    echo "$as_me:7715: \$? = $ac_status" >&5
     7716   echo "$as_me:7716: \$? = $ac_status" >&5
    77167717   if (exit $ac_status) && test -s "$ac_outfile"; then
    77177718     # The compiler can only warn and ignore the option if not recognized
     
    79777978   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    79787979   -e 's:$: $lt_compiler_flag:'`
    7979    (eval echo "\"\$as_me:7979: $lt_compile\"" >&5)
     7980   (eval echo "\"\$as_me:7980: $lt_compile\"" >&5)
    79807981   (eval "$lt_compile" 2>conftest.err)
    79817982   ac_status=$?
    79827983   cat conftest.err >&5
    7983    echo "$as_me:7983: \$? = $ac_status" >&5
     7984   echo "$as_me:7984: \$? = $ac_status" >&5
    79847985   if (exit $ac_status) && test -s "$ac_outfile"; then
    79857986     # The compiler can only warn and ignore the option if not recognized
     
    80818082   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80828083   -e 's:$: $lt_compiler_flag:'`
    8083    (eval echo "\"\$as_me:8083: $lt_compile\"" >&5)
     8084   (eval echo "\"\$as_me:8084: $lt_compile\"" >&5)
    80848085   (eval "$lt_compile" 2>out/conftest.err)
    80858086   ac_status=$?
    80868087   cat out/conftest.err >&5
    8087    echo "$as_me:8087: \$? = $ac_status" >&5
     8088   echo "$as_me:8088: \$? = $ac_status" >&5
    80888089   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    80898090   then
     
    1042610427  lt_status=$lt_dlunknown
    1042710428  cat > conftest.$ac_ext <<EOF
    10428 #line 10428 "configure"
     10429#line 10429 "configure"
    1042910430#include "confdefs.h"
    1043010431
     
    1052610527  lt_status=$lt_dlunknown
    1052710528  cat > conftest.$ac_ext <<EOF
    10528 #line 10528 "configure"
     10529#line 10529 "configure"
    1052910530#include "confdefs.h"
    1053010531
     
    1287012871   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1287112872   -e 's:$: $lt_compiler_flag:'`
    12872    (eval echo "\"\$as_me:12872: $lt_compile\"" >&5)
     12873   (eval echo "\"\$as_me:12873: $lt_compile\"" >&5)
    1287312874   (eval "$lt_compile" 2>conftest.err)
    1287412875   ac_status=$?
    1287512876   cat conftest.err >&5
    12876    echo "$as_me:12876: \$? = $ac_status" >&5
     12877   echo "$as_me:12877: \$? = $ac_status" >&5
    1287712878   if (exit $ac_status) && test -s "$ac_outfile"; then
    1287812879     # The compiler can only warn and ignore the option if not recognized
     
    1297412975   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1297512976   -e 's:$: $lt_compiler_flag:'`
    12976    (eval echo "\"\$as_me:12976: $lt_compile\"" >&5)
     12977   (eval echo "\"\$as_me:12977: $lt_compile\"" >&5)
    1297712978   (eval "$lt_compile" 2>out/conftest.err)
    1297812979   ac_status=$?
    1297912980   cat out/conftest.err >&5
    12980    echo "$as_me:12980: \$? = $ac_status" >&5
     12981   echo "$as_me:12981: \$? = $ac_status" >&5
    1298112982   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1298212983   then
     
    1454414545   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1454514546   -e 's:$: $lt_compiler_flag:'`
    14546    (eval echo "\"\$as_me:14546: $lt_compile\"" >&5)
     14547   (eval echo "\"\$as_me:14547: $lt_compile\"" >&5)
    1454714548   (eval "$lt_compile" 2>conftest.err)
    1454814549   ac_status=$?
    1454914550   cat conftest.err >&5
    14550    echo "$as_me:14550: \$? = $ac_status" >&5
     14551   echo "$as_me:14551: \$? = $ac_status" >&5
    1455114552   if (exit $ac_status) && test -s "$ac_outfile"; then
    1455214553     # The compiler can only warn and ignore the option if not recognized
     
    1464814649   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1464914650   -e 's:$: $lt_compiler_flag:'`
    14650    (eval echo "\"\$as_me:14650: $lt_compile\"" >&5)
     14651   (eval echo "\"\$as_me:14651: $lt_compile\"" >&5)
    1465114652   (eval "$lt_compile" 2>out/conftest.err)
    1465214653   ac_status=$?
    1465314654   cat out/conftest.err >&5
    14654    echo "$as_me:14654: \$? = $ac_status" >&5
     14655   echo "$as_me:14655: \$? = $ac_status" >&5
    1465514656   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1465614657   then
     
    1685516856   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1685616857   -e 's:$: $lt_compiler_flag:'`
    16857    (eval echo "\"\$as_me:16857: $lt_compile\"" >&5)
     16858   (eval echo "\"\$as_me:16858: $lt_compile\"" >&5)
    1685816859   (eval "$lt_compile" 2>conftest.err)
    1685916860   ac_status=$?
    1686016861   cat conftest.err >&5
    16861    echo "$as_me:16861: \$? = $ac_status" >&5
     16862   echo "$as_me:16862: \$? = $ac_status" >&5
    1686216863   if (exit $ac_status) && test -s "$ac_outfile"; then
    1686316864     # The compiler can only warn and ignore the option if not recognized
     
    1712317124   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1712417125   -e 's:$: $lt_compiler_flag:'`
    17125    (eval echo "\"\$as_me:17125: $lt_compile\"" >&5)
     17126   (eval echo "\"\$as_me:17126: $lt_compile\"" >&5)
    1712617127   (eval "$lt_compile" 2>conftest.err)
    1712717128   ac_status=$?
    1712817129   cat conftest.err >&5
    17129    echo "$as_me:17129: \$? = $ac_status" >&5
     17130   echo "$as_me:17130: \$? = $ac_status" >&5
    1713017131   if (exit $ac_status) && test -s "$ac_outfile"; then
    1713117132     # The compiler can only warn and ignore the option if not recognized
     
    1722717228   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1722817229   -e 's:$: $lt_compiler_flag:'`
    17229    (eval echo "\"\$as_me:17229: $lt_compile\"" >&5)
     17230   (eval echo "\"\$as_me:17230: $lt_compile\"" >&5)
    1723017231   (eval "$lt_compile" 2>out/conftest.err)
    1723117232   ac_status=$?
    1723217233   cat out/conftest.err >&5
    17233    echo "$as_me:17233: \$? = $ac_status" >&5
     17234   echo "$as_me:17234: \$? = $ac_status" >&5
    1723417235   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1723517236   then
     
    2014820149
    2014920150###########################################################################
    20150 #                 GNU packages and C functions                            #
     20151#                 Other packages and C functions                          #
    2015120152###########################################################################
    2015220153
     
    2015820159
    2015920160
    20160 # Check whether --enable-gnu-packages or --disable-gnu-packages was given.
    20161 if test "${enable_gnu_packages+set}" = set; then
    20162   enableval="$enable_gnu_packages"
    20163   coin_enable_gnu=$enableval
    20164 else
    20165   coin_enable_gnu=no
     20161
     20162
     20163
     20164
     20165
     20166
     20167coin_has_zlib=no
     20168
     20169# Check whether --enable-zlib or --disable-zlib was given.
     20170if test "${enable_zlib+set}" = set; then
     20171  enableval="$enable_zlib"
     20172  coin_enable_zlib=$enableval
     20173else
     20174  coin_enable_zlib=yes
    2016620175fi;
    2016720176
    20168 
    20169 
    20170 
    20171 
    20172 
    20173 
    20174 coin_has_zlib=no
    20175 if test $coin_enable_gnu = yes; then
     20177if test $coin_enable_zlib = yes; then
    2017620178  #if test x"" = x; then
    2017720179#  hdr="#include <zlib.h>"
     
    2039820400echo "${ECHO_T}$ac_cv_lib_z_gzopen" >&6
    2039920401if test $ac_cv_lib_z_gzopen = yes; then
     20402  :
     20403else
     20404  coin_has_zlib=no
     20405fi
     20406
     20407  fi
     20408
     20409  if test $coin_has_zlib = yes; then
    2040020410
    2040120411                    GLPK_LIBS="-lz $GLPK_LIBS"
     
    2040320413                    GLPK_LIBS_INSTALLED="-lz $GLPK_LIBS_INSTALLED"
    2040420414
    20405                  :
    20406 else
    20407   coin_has_zlib=no
    20408 fi
    20409 
    20410   fi
    20411 
    20412   if test $coin_has_zlib = yes; then
    2041320415
    2041420416cat >>confdefs.h <<\_ACEOF
     
    2043820440fi
    2043920441
    20440 if test $coin_enable_gnu = yes; then
    20441   coin_has_gmp=no
     20442
     20443
     20444
     20445
     20446
     20447
     20448# Check whether --enable-gmp or --disable-gmp was given.
     20449if test "${enable_gmp+set}" = set; then
     20450  enableval="$enable_gmp"
     20451  coin_enable_gmp=$enableval
     20452else
     20453  coin_enable_gmp=yes
     20454fi;
     20455
     20456coin_has_gmp=no
     20457if test $coin_enable_gmp = yes; then
    2044220458  #if test x"" = x; then
    2044320459#  hdr="#include <gmp.h>"
     
    2066420680
    2066520681
    20666   if test $coin_has_gmp = yes; then
     20682
     20683  if test $coin_has_gmp = yes ; then
     20684
     20685                    GLPK_LIBS="-lgmp $GLPK_LIBS"
     20686                    GLPK_PCLIBS="-lgmp $GLPK_PCLIBS"
     20687                    GLPK_LIBS_INSTALLED="-lgmp $GLPK_LIBS_INSTALLED"
     20688
     20689
     20690cat >>confdefs.h <<\_ACEOF
     20691#define COIN_HAS_GMP 1
     20692_ACEOF
     20693
     20694  fi
     20695fi
     20696
     20697if test $coin_has_gmp = yes; then
    2066720698
    2066820699cat >>confdefs.h <<\_ACEOF
     
    2067020701_ACEOF
    2067120702
    20672     GLPK_LIBS="-lgmp $GLPK_LIBS"
    20673     GLPK_PCLIBS="-lgmp $GLPK_PCLIBS"
    20674   fi
    2067520703fi
    2067620704
  • ThirdParty/Glpk/stable/1.8/configure.ac

    r2376 r2427  
    6969
    7070###########################################################################
    71 #                 GNU packages and C functions                            #
     71#                 Other packages and C functions                          #
    7272###########################################################################
    7373
     
    7979fi
    8080
    81 if test $coin_enable_gnu = yes; then
    82   coin_has_gmp=no
    83   AC_COIN_CHECK_HEADER([gmp.h],[AC_CHECK_LIB([gmp],[__gmpz_init],[coin_has_gmp=yes])])
    84   if test $coin_has_gmp = yes; then
    85     AC_DEFINE([HAVE_GMP],[1],[Define to 1 if GMP is available])
    86     GLPK_LIBS="-lgmp $GLPK_LIBS"
    87     GLPK_PCLIBS="-lgmp $GLPK_PCLIBS"
    88   fi
     81AC_COIN_CHECK_GMP(Glpk)
     82if test $coin_has_gmp = yes; then
     83  AC_DEFINE([HAVE_GMP],[1],[Define to 1 if GMP is available])
    8984fi
    9085
Note: See TracChangeset for help on using the changeset viewer.