Changeset 3493


Ignore:
Timestamp:
Jun 1, 2015 3:37:37 PM (6 years ago)
Author:
tkr
Message:

temporarily committing release candidate

Location:
ThirdParty/Glpk/stable/1.10
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r3099 r3493  
    438438# Files that are generated and should be cleaned with make distclean
    439439DISTCLEANFILES = $(MAKEOKFILE) $(am__append_2) $(VPATH_DISTCLEANFILES)
    440 DocFiles = README AUTHORS LICENSE
     440DocFiles = README AUTHORS LICENSE 
    441441DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
     442COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
     443COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    442444all: config_glpk.h
    443445        $(MAKE) $(AM_MAKEFLAGS) all-am
    … …  
    19101912        @echo "No test available for Glpk."
    19111913
    1912 install-doc: $(DocFiles)
     1914doxygen-docs:
     1915        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     1916          if test -d "doxydoc/"; then \
     1917            doxygen doxydoc/doxygen.conf;\
     1918          fi;\
     1919        fi
     1920
     1921pdf-doxygen-docs: doxygen-docs
     1922        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     1923          if test -d "doxydoc/latex"; then \
     1924            if test "$(COIN_HAS_LATEX)" = TRUE; then \
     1925              cd doxydoc/latex;\
     1926              $(MAKE) pdf;\
     1927              cd -;\
     1928            fi;\
     1929          fi;\
     1930        fi
     1931
     1932clean-doxygen-docs:
     1933        if test -d "doxydoc/"; then \
     1934          cd doxydoc ;\
     1935          rm -rf html latex *.log *.tag;\
     1936        fi
     1937
     1938install-doxygen-docs: doxygen-docs
     1939        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     1940          if test -d "doxydoc/"; then \
     1941            test -d "$(DESTDIR)$(DocInstallDir)/doxydoc" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \
     1942            $(INSTALL_DATA) @coin_doxy_tagname@ "$(DESTDIR)$(DocInstallDir)/@coin_doxy_tagname@";\
     1943            if test -f "doxydoc/latex/refman.pdf"; then \
     1944              $(INSTALL_DATA) doxydoc/latex/refman.pdf "$(DESTDIR)$(DocInstallDir)";\
     1945            fi;\
     1946            if test -d "doxydoc/html"; then \
     1947              test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/search/" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \
     1948              $(INSTALL_DATA) doxydoc/html/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc";\
     1949              $(INSTALL_DATA) doxydoc/html/search/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc/search";\
     1950            fi;\
     1951          fi;\
     1952        fi
     1953
     1954uninstall-doxygen-docs:
     1955        if test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/"; then \
     1956          rm -rf "$(DESTDIR)$(DocInstallDir)/doxydoc/"; \
     1957        fi
     1958        if test -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; then \
     1959          rm -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; \
     1960        fi
     1961
     1962all-doxygen-docs:
     1963        for dir in $(subdirs) ; do \
     1964          do_project=true;\
     1965          for proj in $(COIN_SKIP_DOXYGEN); do\
     1966            if test $$dir = $$proj; then\
     1967              do_project=false;\
     1968            fi;\
     1969          done;\
     1970          if test -r $$dir/doxydoc & $$do_project = true; then \
     1971            (cd $$dir ; $(MAKE) doxygen-docs) \
     1972          fi ; \
     1973        done ;
     1974
     1975clean-all-doxygen-docs:
     1976        for dir in $(subdirs) ; do \
     1977          if test -r $$dir/doxydoc ; then \
     1978            (cd $$dir ; $(MAKE) clean-doxygen-docs) \
     1979          fi ; \
     1980        done ;
     1981
     1982install-all-doxygen-docs: all-doxygen-docs
     1983        for dir in $(subdirs) ; do \
     1984          do_project=true;\
     1985          for proj in $(COIN_SKIP_DOXYGEN); do\
     1986            if test $$dir = $$proj; then\
     1987              do_project=false;\
     1988            fi;\
     1989          done;\
     1990          if test -r $$dir/doxydoc & $$do_project = true; then \
     1991            (cd $$dir ; $(MAKE) install-doxygen-docs) \
     1992          fi ; \
     1993        done ;
     1994
     1995uninstall-all-doxygen-docs:
     1996        for dir in $(subdirs) ; do \
     1997          if test -r $$dir/doxydoc ; then \
     1998            (cd $$dir ; $(MAKE) uninstall-doxygen-docs) \
     1999          fi ; \
     2000        done ;
     2001
     2002install-doc: $(DocFiles)
    19132003        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
    19142004        for file in $(DocFiles); do \
    19152005          if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
    19162006          if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \
    1917         done
     2007        done 
    19182008
    19192009uninstall-doc:

  • ThirdParty/Glpk/stable/1.10/configure

    r3447 r3493  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for ThirdPartyGlpk 1.10.
     3# Generated by GNU Autoconf 2.59 for ThirdPartyGlpk 1.10.3.
    44#
    55# Report bugs to <http://projects.coin-or.org/BuildTools/newticket>.
    … …  
    430430PACKAGE_NAME='ThirdPartyGlpk'
    431431PACKAGE_TARNAME='thirdpartyglpk'
    432 PACKAGE_VERSION='1.10'
    433 PACKAGE_STRING='ThirdPartyGlpk 1.10'
     432PACKAGE_VERSION='1.10.3'
     433PACKAGE_STRING='ThirdPartyGlpk 1.10.3'
    434434PACKAGE_BUGREPORT='http://projects.coin-or.org/BuildTools/newticket'
    435435
    … …  
    986986  # This message is too long to be a string in the A/UX 3.1 sh.
    987987  cat <<_ACEOF
    988 \`configure' configures ThirdPartyGlpk 1.10 to adapt to many kinds of systems.
     988\`configure' configures ThirdPartyGlpk 1.10.3 to adapt to many kinds of systems.
    989989
    990990Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    10521052if test -n "$ac_init_help"; then
    10531053  case $ac_init_help in
    1054      short | recursive ) echo "Configuration of ThirdPartyGlpk 1.10:";;
     1054     short | recursive ) echo "Configuration of ThirdPartyGlpk 1.10.3:";;
    10551055   esac
    10561056  cat <<\_ACEOF
    … …  
    12151215if $ac_init_version; then
    12161216  cat <<\_ACEOF
    1217 ThirdPartyGlpk configure 1.10
     1217ThirdPartyGlpk configure 1.10.3
    12181218generated by GNU Autoconf 2.59
    12191219
    … …  
    12351235running configure, to aid debugging if configure makes a mistake.
    12361236
    1237 It was created by ThirdPartyGlpk $as_me 1.10, which was
     1237It was created by ThirdPartyGlpk $as_me 1.10.3, which was
    12381238generated by GNU Autoconf 2.59.  Invocation command line was
    12391239
    … …  
    16941694
    16951695# Capture libtool library version, if given.
     1696 coin_libversion=11:3:10
    16961697
    16971698
    … …  
    38003801# Define the identity of the package.
    38013802 PACKAGE='thirdpartyglpk'
    3802  VERSION='1.10'
     3803 VERSION='1.10.3'
    38033804
    38043805
    … …  
    49874988*-*-irix6*)
    49884989  # Find out which ABI we are using.
    4989   echo '#line 4989 "configure"' > conftest.$ac_ext
     4990  echo '#line 4990 "configure"' > conftest.$ac_ext
    49904991  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    49914992  (eval $ac_compile) 2>&5
    … …  
    65866587
    65876588# Provide some information about the compiler.
    6588 echo "$as_me:6588:" \
     6589echo "$as_me:6589:" \
    65896590     "checking for Fortran 77 compiler version" >&5
    65906591ac_compiler=`set X $ac_compile; echo $2`
    … …  
    76537654   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    76547655   -e 's:$: $lt_compiler_flag:'`
    7655    (eval echo "\"\$as_me:7655: $lt_compile\"" >&5)
     7656   (eval echo "\"\$as_me:7656: $lt_compile\"" >&5)
    76567657   (eval "$lt_compile" 2>conftest.err)
    76577658   ac_status=$?
    76587659   cat conftest.err >&5
    7659    echo "$as_me:7659: \$? = $ac_status" >&5
     7660   echo "$as_me:7660: \$? = $ac_status" >&5
    76607661   if (exit $ac_status) && test -s "$ac_outfile"; then
    76617662     # The compiler can only warn and ignore the option if not recognized
    … …  
    79217922   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    79227923   -e 's:$: $lt_compiler_flag:'`
    7923    (eval echo "\"\$as_me:7923: $lt_compile\"" >&5)
     7924   (eval echo "\"\$as_me:7924: $lt_compile\"" >&5)
    79247925   (eval "$lt_compile" 2>conftest.err)
    79257926   ac_status=$?
    79267927   cat conftest.err >&5
    7927    echo "$as_me:7927: \$? = $ac_status" >&5
     7928   echo "$as_me:7928: \$? = $ac_status" >&5
    79287929   if (exit $ac_status) && test -s "$ac_outfile"; then
    79297930     # The compiler can only warn and ignore the option if not recognized
    … …  
    80258026   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80268027   -e 's:$: $lt_compiler_flag:'`
    8027    (eval echo "\"\$as_me:8027: $lt_compile\"" >&5)
     8028   (eval echo "\"\$as_me:8028: $lt_compile\"" >&5)
    80288029   (eval "$lt_compile" 2>out/conftest.err)
    80298030   ac_status=$?
    80308031   cat out/conftest.err >&5
    8031    echo "$as_me:8031: \$? = $ac_status" >&5
     8032   echo "$as_me:8032: \$? = $ac_status" >&5
    80328033   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    80338034   then
    … …  
    1037010371  lt_status=$lt_dlunknown
    1037110372  cat > conftest.$ac_ext <<EOF
    10372 #line 10372 "configure"
     10373#line 10373 "configure"
    1037310374#include "confdefs.h"
    1037410375
    … …  
    1047010471  lt_status=$lt_dlunknown
    1047110472  cat > conftest.$ac_ext <<EOF
    10472 #line 10472 "configure"
     10473#line 10473 "configure"
    1047310474#include "confdefs.h"
    1047410475
    … …  
    1281412815   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1281512816   -e 's:$: $lt_compiler_flag:'`
    12816    (eval echo "\"\$as_me:12816: $lt_compile\"" >&5)
     12817   (eval echo "\"\$as_me:12817: $lt_compile\"" >&5)
    1281712818   (eval "$lt_compile" 2>conftest.err)
    1281812819   ac_status=$?
    1281912820   cat conftest.err >&5
    12820    echo "$as_me:12820: \$? = $ac_status" >&5
     12821   echo "$as_me:12821: \$? = $ac_status" >&5
    1282112822   if (exit $ac_status) && test -s "$ac_outfile"; then
    1282212823     # The compiler can only warn and ignore the option if not recognized
    … …  
    1291812919   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1291912920   -e 's:$: $lt_compiler_flag:'`
    12920    (eval echo "\"\$as_me:12920: $lt_compile\"" >&5)
     12921   (eval echo "\"\$as_me:12921: $lt_compile\"" >&5)
    1292112922   (eval "$lt_compile" 2>out/conftest.err)
    1292212923   ac_status=$?
    1292312924   cat out/conftest.err >&5
    12924    echo "$as_me:12924: \$? = $ac_status" >&5
     12925   echo "$as_me:12925: \$? = $ac_status" >&5
    1292512926   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1292612927   then
    … …  
    1448814489   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1448914490   -e 's:$: $lt_compiler_flag:'`
    14490    (eval echo "\"\$as_me:14490: $lt_compile\"" >&5)
     14491   (eval echo "\"\$as_me:14491: $lt_compile\"" >&5)
    1449114492   (eval "$lt_compile" 2>conftest.err)
    1449214493   ac_status=$?
    1449314494   cat conftest.err >&5
    14494    echo "$as_me:14494: \$? = $ac_status" >&5
     14495   echo "$as_me:14495: \$? = $ac_status" >&5
    1449514496   if (exit $ac_status) && test -s "$ac_outfile"; then
    1449614497     # The compiler can only warn and ignore the option if not recognized
    … …  
    1459214593   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1459314594   -e 's:$: $lt_compiler_flag:'`
    14594    (eval echo "\"\$as_me:14594: $lt_compile\"" >&5)
     14595   (eval echo "\"\$as_me:14595: $lt_compile\"" >&5)
    1459514596   (eval "$lt_compile" 2>out/conftest.err)
    1459614597   ac_status=$?
    1459714598   cat out/conftest.err >&5
    14598    echo "$as_me:14598: \$? = $ac_status" >&5
     14599   echo "$as_me:14599: \$? = $ac_status" >&5
    1459914600   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1460014601   then
    … …  
    1679916800   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1680016801   -e 's:$: $lt_compiler_flag:'`
    16801    (eval echo "\"\$as_me:16801: $lt_compile\"" >&5)
     16802   (eval echo "\"\$as_me:16802: $lt_compile\"" >&5)
    1680216803   (eval "$lt_compile" 2>conftest.err)
    1680316804   ac_status=$?
    1680416805   cat conftest.err >&5
    16805    echo "$as_me:16805: \$? = $ac_status" >&5
     16806   echo "$as_me:16806: \$? = $ac_status" >&5
    1680616807   if (exit $ac_status) && test -s "$ac_outfile"; then
    1680716808     # The compiler can only warn and ignore the option if not recognized
    … …  
    1706717068   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1706817069   -e 's:$: $lt_compiler_flag:'`
    17069    (eval echo "\"\$as_me:17069: $lt_compile\"" >&5)
     17070   (eval echo "\"\$as_me:17070: $lt_compile\"" >&5)
    1707017071   (eval "$lt_compile" 2>conftest.err)
    1707117072   ac_status=$?
    1707217073   cat conftest.err >&5
    17073    echo "$as_me:17073: \$? = $ac_status" >&5
     17074   echo "$as_me:17074: \$? = $ac_status" >&5
    1707417075   if (exit $ac_status) && test -s "$ac_outfile"; then
    1707517076     # The compiler can only warn and ignore the option if not recognized
    … …  
    1717117172   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1717217173   -e 's:$: $lt_compiler_flag:'`
    17173    (eval echo "\"\$as_me:17173: $lt_compile\"" >&5)
     17174   (eval echo "\"\$as_me:17174: $lt_compile\"" >&5)
    1717417175   (eval "$lt_compile" 2>out/conftest.err)
    1717517176   ac_status=$?
    1717617177   cat out/conftest.err >&5
    17177    echo "$as_me:17177: \$? = $ac_status" >&5
     17178   echo "$as_me:17178: \$? = $ac_status" >&5
    1717817179   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1717917180   then
    … …  
    2246822469cat >&5 <<_CSEOF
    2246922470
    22470 This file was extended by ThirdPartyGlpk $as_me 1.10, which was
     22471This file was extended by ThirdPartyGlpk $as_me 1.10.3, which was
    2247122472generated by GNU Autoconf 2.59.  Invocation command line was
    2247222473
    … …  
    2253122532cat >>$CONFIG_STATUS <<_ACEOF
    2253222533ac_cs_version="\\
    22533 ThirdPartyGlpk config.status 1.10
     22534ThirdPartyGlpk config.status 1.10.3
    2253422535configured by $0, generated by GNU Autoconf 2.59,
    2253522536  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

  • ThirdParty/Glpk/stable/1.10/configure.ac

    r3447 r3493  
    1111AC_PREREQ(2.59)
    1212
    13 AC_INIT([ThirdPartyGlpk],[1.10],[http://projects.coin-or.org/BuildTools/newticket])
     13AC_INIT([ThirdPartyGlpk],[1.10.3],[http://projects.coin-or.org/BuildTools/newticket])
    1414
    1515AC_COPYRIGHT([
    … …  
    2929AC_PREFIX_DEFAULT([`pwd`])
    3030
    31 AC_COIN_PROJECTDIR_INIT(Glpk)
     31AC_COIN_PROJECTDIR_INIT(Glpk,11:3:10)
    3232
    3333#############################################################################
Note: See TracChangeset for help on using the changeset viewer.