Changeset 2068 for ThirdParty/Glpk


Ignore:
Timestamp:
Jan 1, 2011 1:22:47 PM (9 years ago)
Author:
stefan
Message:

sync with trunk rev2066

Location:
ThirdParty/Glpk/stable/1.8
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/stable/1.8

  • ThirdParty/Glpk/stable/1.8/Makefile.in

    r2004 r2068  
    138138ABSBUILDDIR = @ABSBUILDDIR@
    139139ACLOCAL = @ACLOCAL@
    140 ADDLIBS = @ADDLIBS@
    141140ADD_CFLAGS = @ADD_CFLAGS@
    142141ALWAYS_FALSE_FALSE = @ALWAYS_FALSE_FALSE@
     
    181180EXEEXT = @EXEEXT@
    182181F77 = @F77@
    183 FADDLIBS = @FADDLIBS@
    184182FFLAGS = @FFLAGS@
    185183GLPKDIR = @GLPKDIR@
     
    215213PACKAGE_VERSION = @PACKAGE_VERSION@
    216214PATH_SEPARATOR = @PATH_SEPARATOR@
    217 PCADDLIBS = @PCADDLIBS@
    218215PKG_CONFIG = @PKG_CONFIG@
    219216RANLIB = @RANLIB@
  • ThirdParty/Glpk/stable/1.8/coinglpk-uninstalled.pc.in

    r1904 r2068  
    44Name: Glpk
    55Description: Gnu Linear Programming Kit
     6URL: https://projects.coin-or.org/BuildTools
    67Version: @glpkmajorver@.@glpkminorver@
    78Libs: ${libdir}/libcoinglpk.la @GLPK_PCLIBS@
  • ThirdParty/Glpk/stable/1.8/coinglpk.pc.in

    r2004 r2068  
    66Name: Glpk
    77Description: Gnu Linear Programming Kit
     8URL: https://projects.coin-or.org/BuildTools
    89Version: @glpkmajorver@.@glpkminorver@
    910Libs: -L${libdir} -lcoinglpk @GLPK_PCLIBS@
  • ThirdParty/Glpk/stable/1.8/configure

    r2027 r2068  
    473473#endif"
    474474
    475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion GLPK_SVN_REV build build_cpu build_vendor build_os COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS glpkmajorver glpkminorver COIN_HAS_ZLIB_TRUE COIN_HAS_ZLIB_FALSE GLPKDIR GLPK_PCLIBS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     475ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion GLPK_SVN_REV build build_cpu build_vendor build_os COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS glpkmajorver glpkminorver COIN_HAS_ZLIB_TRUE COIN_HAS_ZLIB_FALSE GLPKDIR GLPK_PCLIBS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    15831583
    15841584
    1585 # Initialize the ADDLIBS variable
    1586 ADDLIBS="-lm $LIBS"
    1587 
    1588 
    1589 # Initialize the PCADDLIBS variable.
    1590 # This variable is used to setup library flags for the "Libs:" section in a .pc file.
    1591 # In certain cases, it may contain more flags than the ADDLIBS variable.
    1592 PCADDLIBS=""
    1593 
    15941585
    15951586# As backup, we make sure we don't loose an FLIBS if it has been set
    15961587# by the user
    15971588save_FLIBS="$FLIBS"
    1598 
    1599 # Initialize the FADDLIBS variable (which is to be used with a fortran
    1600 # compiler and will not include FLIBS)
    1601 FADDLIBS="$LIBS"
    1602 
    16031589
    16041590# A useful makefile conditional that is always false
     
    20212007             fi
    20222008             ;;
     2009  *-linux-gnu*) comps="gcc cc pgcc icc xlc" ;;
    20232010  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
    20242011  *)         comps="xlc_r xlc cc gcc pgcc icc" ;;
     
    31603147fi
    31613148
    3162 # Correct ADDLIBS initialization if we are using the MS compiler
     3149# Correct the LD variable if we are using the MS or Intel-windows compiler
    31633150case "$CC" in
    31643151  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    3165     ADDLIBS=
    31663152    case $build in
    31673153  *-mingw*)
     
    33653351        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    33663352      fi
     3353      if test -d ../$i/pkgconfig ; then
     3354        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
     3355      fi
    33673356    done
    33683357  fi
     
    33723361      if test -d ../../$i ; then
    33733362        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
     3363      fi
     3364      if test -d ../../$i/pkgconfig ; then
     3365        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    33743366      fi
    33753367    done
     
    50145006*-*-irix6*)
    50155007  # Find out which ABI we are using.
    5016   echo '#line 5016 "configure"' > conftest.$ac_ext
     5008  echo '#line 5008 "configure"' > conftest.$ac_ext
    50175009  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    50185010  (eval $ac_compile) 2>&5
     
    66136605
    66146606# Provide some information about the compiler.
    6615 echo "$as_me:6615:" \
     6607echo "$as_me:6607:" \
    66166608     "checking for Fortran 77 compiler version" >&5
    66176609ac_compiler=`set X $ac_compile; echo $2`
     
    76807672   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    76817673   -e 's:$: $lt_compiler_flag:'`
    7682    (eval echo "\"\$as_me:7682: $lt_compile\"" >&5)
     7674   (eval echo "\"\$as_me:7674: $lt_compile\"" >&5)
    76837675   (eval "$lt_compile" 2>conftest.err)
    76847676   ac_status=$?
    76857677   cat conftest.err >&5
    7686    echo "$as_me:7686: \$? = $ac_status" >&5
     7678   echo "$as_me:7678: \$? = $ac_status" >&5
    76877679   if (exit $ac_status) && test -s "$ac_outfile"; then
    76887680     # The compiler can only warn and ignore the option if not recognized
     
    79487940   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    79497941   -e 's:$: $lt_compiler_flag:'`
    7950    (eval echo "\"\$as_me:7950: $lt_compile\"" >&5)
     7942   (eval echo "\"\$as_me:7942: $lt_compile\"" >&5)
    79517943   (eval "$lt_compile" 2>conftest.err)
    79527944   ac_status=$?
    79537945   cat conftest.err >&5
    7954    echo "$as_me:7954: \$? = $ac_status" >&5
     7946   echo "$as_me:7946: \$? = $ac_status" >&5
    79557947   if (exit $ac_status) && test -s "$ac_outfile"; then
    79567948     # The compiler can only warn and ignore the option if not recognized
     
    80528044   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80538045   -e 's:$: $lt_compiler_flag:'`
    8054    (eval echo "\"\$as_me:8054: $lt_compile\"" >&5)
     8046   (eval echo "\"\$as_me:8046: $lt_compile\"" >&5)
    80558047   (eval "$lt_compile" 2>out/conftest.err)
    80568048   ac_status=$?
    80578049   cat out/conftest.err >&5
    8058    echo "$as_me:8058: \$? = $ac_status" >&5
     8050   echo "$as_me:8050: \$? = $ac_status" >&5
    80598051   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    80608052   then
     
    1039710389  lt_status=$lt_dlunknown
    1039810390  cat > conftest.$ac_ext <<EOF
    10399 #line 10399 "configure"
     10391#line 10391 "configure"
    1040010392#include "confdefs.h"
    1040110393
     
    1049710489  lt_status=$lt_dlunknown
    1049810490  cat > conftest.$ac_ext <<EOF
    10499 #line 10499 "configure"
     10491#line 10491 "configure"
    1050010492#include "confdefs.h"
    1050110493
     
    1284112833   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1284212834   -e 's:$: $lt_compiler_flag:'`
    12843    (eval echo "\"\$as_me:12843: $lt_compile\"" >&5)
     12835   (eval echo "\"\$as_me:12835: $lt_compile\"" >&5)
    1284412836   (eval "$lt_compile" 2>conftest.err)
    1284512837   ac_status=$?
    1284612838   cat conftest.err >&5
    12847    echo "$as_me:12847: \$? = $ac_status" >&5
     12839   echo "$as_me:12839: \$? = $ac_status" >&5
    1284812840   if (exit $ac_status) && test -s "$ac_outfile"; then
    1284912841     # The compiler can only warn and ignore the option if not recognized
     
    1294512937   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1294612938   -e 's:$: $lt_compiler_flag:'`
    12947    (eval echo "\"\$as_me:12947: $lt_compile\"" >&5)
     12939   (eval echo "\"\$as_me:12939: $lt_compile\"" >&5)
    1294812940   (eval "$lt_compile" 2>out/conftest.err)
    1294912941   ac_status=$?
    1295012942   cat out/conftest.err >&5
    12951    echo "$as_me:12951: \$? = $ac_status" >&5
     12943   echo "$as_me:12943: \$? = $ac_status" >&5
    1295212944   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1295312945   then
     
    1451514507   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1451614508   -e 's:$: $lt_compiler_flag:'`
    14517    (eval echo "\"\$as_me:14517: $lt_compile\"" >&5)
     14509   (eval echo "\"\$as_me:14509: $lt_compile\"" >&5)
    1451814510   (eval "$lt_compile" 2>conftest.err)
    1451914511   ac_status=$?
    1452014512   cat conftest.err >&5
    14521    echo "$as_me:14521: \$? = $ac_status" >&5
     14513   echo "$as_me:14513: \$? = $ac_status" >&5
    1452214514   if (exit $ac_status) && test -s "$ac_outfile"; then
    1452314515     # The compiler can only warn and ignore the option if not recognized
     
    1461914611   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1462014612   -e 's:$: $lt_compiler_flag:'`
    14621    (eval echo "\"\$as_me:14621: $lt_compile\"" >&5)
     14613   (eval echo "\"\$as_me:14613: $lt_compile\"" >&5)
    1462214614   (eval "$lt_compile" 2>out/conftest.err)
    1462314615   ac_status=$?
    1462414616   cat out/conftest.err >&5
    14625    echo "$as_me:14625: \$? = $ac_status" >&5
     14617   echo "$as_me:14617: \$? = $ac_status" >&5
    1462614618   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1462714619   then
     
    1682616818   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1682716819   -e 's:$: $lt_compiler_flag:'`
    16828    (eval echo "\"\$as_me:16828: $lt_compile\"" >&5)
     16820   (eval echo "\"\$as_me:16820: $lt_compile\"" >&5)
    1682916821   (eval "$lt_compile" 2>conftest.err)
    1683016822   ac_status=$?
    1683116823   cat conftest.err >&5
    16832    echo "$as_me:16832: \$? = $ac_status" >&5
     16824   echo "$as_me:16824: \$? = $ac_status" >&5
    1683316825   if (exit $ac_status) && test -s "$ac_outfile"; then
    1683416826     # The compiler can only warn and ignore the option if not recognized
     
    1709417086   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1709517087   -e 's:$: $lt_compiler_flag:'`
    17096    (eval echo "\"\$as_me:17096: $lt_compile\"" >&5)
     17088   (eval echo "\"\$as_me:17088: $lt_compile\"" >&5)
    1709717089   (eval "$lt_compile" 2>conftest.err)
    1709817090   ac_status=$?
    1709917091   cat conftest.err >&5
    17100    echo "$as_me:17100: \$? = $ac_status" >&5
     17092   echo "$as_me:17092: \$? = $ac_status" >&5
    1710117093   if (exit $ac_status) && test -s "$ac_outfile"; then
    1710217094     # The compiler can only warn and ignore the option if not recognized
     
    1719817190   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1719917191   -e 's:$: $lt_compiler_flag:'`
    17200    (eval echo "\"\$as_me:17200: $lt_compile\"" >&5)
     17192   (eval echo "\"\$as_me:17192: $lt_compile\"" >&5)
    1720117193   (eval "$lt_compile" 2>out/conftest.err)
    1720217194   ac_status=$?
    1720317195   cat out/conftest.err >&5
    17204    echo "$as_me:17204: \$? = $ac_status" >&5
     17196   echo "$as_me:17196: \$? = $ac_status" >&5
    1720517197   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1720617198   then
     
    2036920361echo "${ECHO_T}$ac_cv_lib_z_gzopen" >&6
    2037020362if test $ac_cv_lib_z_gzopen = yes; then
    20371   ADDLIBS="-lz $ADDLIBS"
    2037220363
    2037320364                    GLPK_LIBS="-lz $GLPK_LIBS"
     
    2037520366                    GLPK_LIBS_INSTALLED="-lz $GLPK_LIBS_INSTALLED"
    2037620367
    20377 
     20368                 :
    2037820369else
    2037920370  coin_has_zlib=no
     
    2221822209if test x$coin_skip_ac_output != xyes; then
    2221922210
    22220   FADDLIBS="$ADDLIBS"
    22221   if test x"$coin_need_flibs" = xyes; then
    22222     ADDLIBS="$ADDLIBS $FLIBS"
    22223   fi
    22224   PCADDLIBS="$PCADDLIBS $ADDLIBS"
    22225 
    2222622211  # library extension
    2222722212
     
    2295322938s,@ECHO_T@,$ECHO_T,;t t
    2295422939s,@LIBS@,$LIBS,;t t
    22955 s,@ADDLIBS@,$ADDLIBS,;t t
    22956 s,@PCADDLIBS@,$PCADDLIBS,;t t
    22957 s,@FADDLIBS@,$FADDLIBS,;t t
    2295822940s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t
    2295922941s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
Note: See TracChangeset for help on using the changeset viewer.