From 53f27e26828ad1617ca22feab476d5b918c02f0b Mon Sep 17 00:00:00 2001 From: Ted Ralphs Date: Sat, 4 Apr 2015 19:46:43 +0000 Subject: [PATCH] temporarily committing release candidate --- Dip/Makefile.in | 152 ++++++++++++++-- Dip/configure | 324 +++++++++++++++++++++++++++++++---- Dip/configure.ac | 4 +- Dip/src/Makefile.in | 11 ++ Dip/src/config_dip_default.h | 8 +- Dip/src/dippy/Makefile.in | 11 ++ Dip/test/Makefile.in | 11 ++ Makefile.in | 96 ++++++++++- configure | 20 +-- configure.ac | 2 +- 10 files changed, 566 insertions(+), 73 deletions(-) diff --git a/Dip/Makefile.in b/Dip/Makefile.in index 1c27301c..cb5eb392 100644 --- a/Dip/Makefile.in +++ b/Dip/Makefile.in @@ -70,6 +70,7 @@ DIST_COMMON = README $(am__configure_deps) \ $(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/dip-uninstalled.pc.in \ $(srcdir)/dip.pc.in $(top_srcdir)/configure \ + $(top_srcdir)/doxydoc/doxygen.conf.in \ $(top_srcdir)/examples/ATM/Makefile.in \ $(top_srcdir)/examples/ATM/atm.parm.in \ $(top_srcdir)/examples/ATM/data_extract.sh.in \ @@ -164,7 +165,7 @@ CONFIG_CLEAN_FILES = examples/Makefile.Examples examples/TSP/Makefile \ examples/ExternalSolvers/VRP/get.cvrpsep \ examples/ExternalSolvers/Graph/get.boost \ examples/ExternalSolvers/TSP/get.concorde dip.pc \ - dip-uninstalled.pc + dip-uninstalled.pc doxydoc/doxygen.conf SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -273,8 +274,12 @@ COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@ COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@ COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@ COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@ +COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@ +COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@ COIN_HAS_HMETIS_FALSE = @COIN_HAS_HMETIS_FALSE@ COIN_HAS_HMETIS_TRUE = @COIN_HAS_HMETIS_TRUE@ +COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@ +COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@ COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@ COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@ COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@ @@ -425,6 +430,13 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +coin_doxy_excludes = @coin_doxy_excludes@ +coin_doxy_logname = @coin_doxy_logname@ +coin_doxy_tagfiles = @coin_doxy_tagfiles@ +coin_doxy_tagname = @coin_doxy_tagname@ +coin_doxy_usedot = @coin_doxy_usedot@ +coin_have_doxygen = @coin_have_doxygen@ +coin_have_latex = @coin_have_latex@ datadir = @datadir@ exec_prefix = @exec_prefix@ have_autoconf = @have_autoconf@ @@ -483,8 +495,10 @@ addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Dip # Files that are generated and should be cleaned with make distclean DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES) -DocFiles = README AUTHORS LICENSE +DocFiles = README AUTHORS LICENSE DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME) +COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE +COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE all: all-recursive .SUFFIXES: @@ -621,6 +635,8 @@ dip.pc: $(top_builddir)/config.status $(srcdir)/dip.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ dip-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/dip-uninstalled.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ +doxydoc/doxygen.conf: $(top_builddir)/config.status $(top_srcdir)/doxydoc/doxygen.conf.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo @@ -784,7 +800,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/examples $(distdir)/examples/ATM $(distdir)/examples/ExternalSolvers/Graph $(distdir)/examples/ExternalSolvers/Knapsack/Pisinger $(distdir)/examples/ExternalSolvers/TSP $(distdir)/examples/ExternalSolvers/VRP $(distdir)/examples/GAP $(distdir)/examples/MCF $(distdir)/examples/MILP $(distdir)/examples/MMKP $(distdir)/examples/SDPUC $(distdir)/examples/SmallIP $(distdir)/examples/TSP $(distdir)/examples/VRP + $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/doxydoc $(distdir)/examples $(distdir)/examples/ATM $(distdir)/examples/ExternalSolvers/Graph $(distdir)/examples/ExternalSolvers/Knapsack/Pisinger $(distdir)/examples/ExternalSolvers/TSP $(distdir)/examples/ExternalSolvers/VRP $(distdir)/examples/GAP $(distdir)/examples/MCF $(distdir)/examples/MILP $(distdir)/examples/MMKP $(distdir)/examples/SDPUC $(distdir)/examples/SmallIP $(distdir)/examples/TSP $(distdir)/examples/VRP @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -980,7 +996,7 @@ install-data-am: install-pkgconfiglibDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook -install-exec-am: +install-exec-am: install-exec-local install-info: install-info-recursive @@ -1006,7 +1022,8 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am uninstall-pkgconfiglibDATA +uninstall-am: uninstall-info-am uninstall-local \ + uninstall-pkgconfiglibDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook @@ -1020,14 +1037,15 @@ uninstall-info: uninstall-info-recursive distclean-recursive distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ - install-data-hook install-exec install-exec-am install-info \ - install-info-am install-man install-pkgconfiglibDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-hook \ - uninstall-info-am uninstall-pkgconfiglibDATA + install-data-hook install-exec install-exec-am \ + install-exec-local install-info install-info-am install-man \ + install-pkgconfiglibDATA install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-libtool \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-hook uninstall-info-am \ + uninstall-local uninstall-pkgconfiglibDATA ######################################################################## @@ -1039,13 +1057,25 @@ test: all unitTest: test -clean-local: +# Doxygen documentation + +doxydoc: + doxygen doxydoc/doxygen.conf + +clean-doxydoc: + ( cd doxydoc ; rm -rf html *.log *.tag ) + +clean-local: clean-doxydoc if test -r test/Makefile; then cd test; $(MAKE) clean; fi distclean-local: if test -r test/Makefile; then cd test; $(MAKE) distclean; fi -.PHONY: test unitTest +install-exec-local: install-doc + +uninstall-local: uninstall-doc + +.PHONY: test unitTest doxydoc install-data-hook: @$(mkdir_p) "$(addlibsdir)" @@ -1057,12 +1087,100 @@ install-data-hook: uninstall-hook: rm -f $(addlibsdir)/dip_addlibs.txt -install-doc: $(DocFiles) +doxygen-docs: + if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \ + if test -d "doxydoc/"; then \ + doxygen doxydoc/doxygen.conf;\ + fi;\ + fi + +pdf-doxygen-docs: doxygen-docs + if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \ + if test -d "doxydoc/latex"; then \ + if test "$(COIN_HAS_LATEX)" = TRUE; then \ + cd doxydoc/latex;\ + $(MAKE) pdf;\ + cd -;\ + fi;\ + fi;\ + fi + +clean-doxygen-docs: + if test -d "doxydoc/"; then \ + cd doxydoc ;\ + rm -rf html latex *.log *.tag;\ + fi + +install-doxygen-docs: doxygen-docs + if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \ + if test -d "doxydoc/"; then \ + test -d "$(DESTDIR)$(DocInstallDir)/doxydoc" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \ + $(INSTALL_DATA) @coin_doxy_tagname@ "$(DESTDIR)$(DocInstallDir)/@coin_doxy_tagname@";\ + if test -f "doxydoc/latex/refman.pdf"; then \ + $(INSTALL_DATA) doxydoc/latex/refman.pdf "$(DESTDIR)$(DocInstallDir)";\ + fi;\ + if test -d "doxydoc/html"; then \ + test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/search/" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \ + $(INSTALL_DATA) doxydoc/html/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc";\ + $(INSTALL_DATA) doxydoc/html/search/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc/search";\ + fi;\ + fi;\ + fi + +uninstall-doxygen-docs: + if test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/"; then \ + rm -rf "$(DESTDIR)$(DocInstallDir)/doxydoc/"; \ + fi + if test -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; then \ + rm -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; \ + fi + +all-doxygen-docs: + for dir in $(subdirs) ; do \ + do_project=true;\ + for proj in $(COIN_SKIP_DOXYGEN); do\ + if test $$dir = $$proj; then\ + do_project=false;\ + fi;\ + done;\ + if test -r $$dir/doxydoc & $$do_project = true; then \ + (cd $$dir ; $(MAKE) doxygen-docs) \ + fi ; \ + done ; + +clean-all-doxygen-docs: + for dir in $(subdirs) ; do \ + if test -r $$dir/doxydoc ; then \ + (cd $$dir ; $(MAKE) clean-doxygen-docs) \ + fi ; \ + done ; + +install-all-doxygen-docs: all-doxygen-docs + for dir in $(subdirs) ; do \ + do_project=true;\ + for proj in $(COIN_SKIP_DOXYGEN); do\ + if test $$dir = $$proj; then\ + do_project=false;\ + fi;\ + done;\ + if test -r $$dir/doxydoc & $$do_project = true; then \ + (cd $$dir ; $(MAKE) install-doxygen-docs) \ + fi ; \ + done ; + +uninstall-all-doxygen-docs: + for dir in $(subdirs) ; do \ + if test -r $$dir/doxydoc ; then \ + (cd $$dir ; $(MAKE) uninstall-doxygen-docs) \ + fi ; \ + done ; + +install-doc: $(DocFiles) test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)" for file in $(DocFiles); do \ if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \ if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \ - done + done uninstall-doc: for file in $(DocFiles); do \ diff --git a/Dip/configure b/Dip/configure index 558169a3..15ef913c 100755 --- a/Dip/configure +++ b/Dip/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for Dip trunk. +# Generated by GNU Autoconf 2.59 for Dip 0.91.3. # # Report bugs to . # @@ -440,8 +440,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Dip' PACKAGE_TARNAME='dip' -PACKAGE_VERSION='trunk' -PACKAGE_STRING='Dip trunk' +PACKAGE_VERSION='0.91.3' +PACKAGE_STRING='Dip 0.91.3' PACKAGE_BUGREPORT='dip@lists.coin-or.org' ac_unique_file="src/DecompApp.h" @@ -483,7 +483,7 @@ ac_includes_default="\ # include #endif" -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 build build_cpu build_vendor build_os ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion DIP_SVN_REV CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX EGREP LN_S 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 CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_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 ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS PKG_CONFIG ac_ct_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED COINDEPEND_LIBS COINDEPEND_CFLAGS COINDEPEND_DATA COINDEPEND_DEPENDENCIES COINDEPEND_LIBS_INSTALLED COINDEPEND_CFLAGS_INSTALLED COINDEPEND_DATA_INSTALLED DIPLIB_CFLAGS DIPLIB_LIBS DIPLIB_PCLIBS DIPLIB_PCREQUIRES DIPLIB_DEPENDENCIES DIPLIB_CFLAGS_INSTALLED DIPLIB_LIBS_INSTALLED COIN_HAS_COINDEPEND_TRUE COIN_HAS_COINDEPEND_FALSE CLP_LIBS CLP_CFLAGS CLP_DATA CLP_DEPENDENCIES CLP_LIBS_INSTALLED CLP_CFLAGS_INSTALLED CLP_DATA_INSTALLED COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA SAMPLE_DEPENDENCIES SAMPLE_LIBS_INSTALLED SAMPLE_CFLAGS_INSTALLED SAMPLE_DATA_INSTALLED COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE CGL_LIBS CGL_CFLAGS CGL_DATA CGL_DEPENDENCIES CGL_LIBS_INSTALLED CGL_CFLAGS_INSTALLED CGL_DATA_INSTALLED COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE CBC_LIBS CBC_CFLAGS CBC_DATA CBC_DEPENDENCIES CBC_LIBS_INSTALLED CBC_CFLAGS_INSTALLED CBC_DATA_INSTALLED COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE CPX_LIBS CPX_CFLAGS CPX_DATA CPX_DEPENDENCIES CPX_LIBS_INSTALLED CPX_CFLAGS_INSTALLED CPX_DATA_INSTALLED COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE SYMPHONY_LIBS SYMPHONY_CFLAGS SYMPHONY_DATA SYMPHONY_DEPENDENCIES SYMPHONY_LIBS_INSTALLED SYMPHONY_CFLAGS_INSTALLED SYMPHONY_DATA_INSTALLED COIN_HAS_SYMPHONY_TRUE COIN_HAS_SYMPHONY_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA ASL_DEPENDENCIES ASL_LIBS_INSTALLED ASL_CFLAGS_INSTALLED ASL_DATA_INSTALLED COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE HMETISINCDIR HMETISLIB COIN_HAS_HMETIS_TRUE COIN_HAS_HMETIS_FALSE OPENMP_TRUE OPENMP_FALSE DIP_OPENMP_FLAGS DIP_OPENMP_LIBS PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir HAVE_PYTHON_TRUE HAVE_PYTHON_FALSE PYTHON_LIBS PYTHON_CFLAGS CLP_LP_SOLVER_TRUE CLP_LP_SOLVER_FALSE CPLEX_LP_SOLVER_TRUE CPLEX_LP_SOLVER_FALSE CBC_IP_SOLVER_TRUE CBC_IP_SOLVER_FALSE CPLEX_IP_SOLVER_TRUE CPLEX_IP_SOLVER_FALSE SYMPHONY_IP_SOLVER_TRUE SYMPHONY_IP_SOLVER_FALSE DIPINCDIR DIPSRCDIR DipDEFS ARCH COIN_HAS_CLP LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS' +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 build build_cpu build_vendor build_os ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion DIP_SVN_REV CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX EGREP LN_S 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 CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_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 ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS PKG_CONFIG ac_ct_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED COINDEPEND_LIBS COINDEPEND_CFLAGS COINDEPEND_DATA COINDEPEND_DEPENDENCIES COINDEPEND_LIBS_INSTALLED COINDEPEND_CFLAGS_INSTALLED COINDEPEND_DATA_INSTALLED DIPLIB_CFLAGS DIPLIB_LIBS DIPLIB_PCLIBS DIPLIB_PCREQUIRES DIPLIB_DEPENDENCIES DIPLIB_CFLAGS_INSTALLED DIPLIB_LIBS_INSTALLED COIN_HAS_COINDEPEND_TRUE COIN_HAS_COINDEPEND_FALSE CLP_LIBS CLP_CFLAGS CLP_DATA CLP_DEPENDENCIES CLP_LIBS_INSTALLED CLP_CFLAGS_INSTALLED CLP_DATA_INSTALLED COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA SAMPLE_DEPENDENCIES SAMPLE_LIBS_INSTALLED SAMPLE_CFLAGS_INSTALLED SAMPLE_DATA_INSTALLED COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE CGL_LIBS CGL_CFLAGS CGL_DATA CGL_DEPENDENCIES CGL_LIBS_INSTALLED CGL_CFLAGS_INSTALLED CGL_DATA_INSTALLED COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE CBC_LIBS CBC_CFLAGS CBC_DATA CBC_DEPENDENCIES CBC_LIBS_INSTALLED CBC_CFLAGS_INSTALLED CBC_DATA_INSTALLED COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE CPX_LIBS CPX_CFLAGS CPX_DATA CPX_DEPENDENCIES CPX_LIBS_INSTALLED CPX_CFLAGS_INSTALLED CPX_DATA_INSTALLED COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE SYMPHONY_LIBS SYMPHONY_CFLAGS SYMPHONY_DATA SYMPHONY_DEPENDENCIES SYMPHONY_LIBS_INSTALLED SYMPHONY_CFLAGS_INSTALLED SYMPHONY_DATA_INSTALLED COIN_HAS_SYMPHONY_TRUE COIN_HAS_SYMPHONY_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA ASL_DEPENDENCIES ASL_LIBS_INSTALLED ASL_CFLAGS_INSTALLED ASL_DATA_INSTALLED COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE HMETISINCDIR HMETISLIB COIN_HAS_HMETIS_TRUE COIN_HAS_HMETIS_FALSE OPENMP_TRUE OPENMP_FALSE DIP_OPENMP_FLAGS DIP_OPENMP_LIBS PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir HAVE_PYTHON_TRUE HAVE_PYTHON_FALSE PYTHON_LIBS PYTHON_CFLAGS CLP_LP_SOLVER_TRUE CLP_LP_SOLVER_FALSE CPLEX_LP_SOLVER_TRUE CPLEX_LP_SOLVER_FALSE CBC_IP_SOLVER_TRUE CBC_IP_SOLVER_FALSE CPLEX_IP_SOLVER_TRUE CPLEX_IP_SOLVER_FALSE SYMPHONY_IP_SOLVER_TRUE SYMPHONY_IP_SOLVER_FALSE coin_have_doxygen coin_have_latex coin_doxy_usedot coin_doxy_tagname coin_doxy_logname COIN_HAS_DOXYGEN_TRUE COIN_HAS_DOXYGEN_FALSE COIN_HAS_LATEX_TRUE COIN_HAS_LATEX_FALSE coin_doxy_tagfiles coin_doxy_excludes DIPINCDIR DIPSRCDIR DipDEFS ARCH COIN_HAS_CLP LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1016,7 +1016,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Dip trunk to adapt to many kinds of systems. +\`configure' configures Dip 0.91.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1082,7 +1082,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Dip trunk:";; + short | recursive ) echo "Configuration of Dip 0.91.3:";; esac cat <<\_ACEOF @@ -1166,6 +1166,8 @@ Optional Packages: --with-dip-ip-solver[=ipsolver] specify the IP solver in small letters(default ipsolver=cbc) + --with-dot use dot (from graphviz) when creating documentation + with doxygen if available; --without-dot to disable Some influential environment variables: CDEFS Additional -D flags to be used when compiling C code. @@ -1294,7 +1296,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Dip configure trunk +Dip configure 0.91.3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1325,7 +1327,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Dip $as_me trunk, which was +It was created by Dip $as_me 0.91.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1851,6 +1853,7 @@ _ACEOF # Capture libtool library version, if given. + coin_libversion=6:3:5 @@ -4580,7 +4583,7 @@ fi # Define the identity of the package. PACKAGE='dip' - VERSION='trunk' + VERSION='0.91.3' cat >>confdefs.h <<_ACEOF @@ -5876,7 +5879,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5879 "configure"' > conftest.$ac_ext + echo '#line 5882 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7010,7 +7013,7 @@ fi # Provide some information about the compiler. -echo "$as_me:7013:" \ +echo "$as_me:7016:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -8077,11 +8080,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8080: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8083: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8084: \$? = $ac_status" >&5 + echo "$as_me:8087: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8345,11 +8348,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8348: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8351: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8352: \$? = $ac_status" >&5 + echo "$as_me:8355: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8449,11 +8452,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8452: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8455: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8456: \$? = $ac_status" >&5 + echo "$as_me:8459: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10794,7 +10797,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13244: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13245: \$? = $ac_status" >&5 + echo "$as_me:13248: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13342,11 +13345,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13345: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13348: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13349: \$? = $ac_status" >&5 + echo "$as_me:13352: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14912,11 +14915,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14915: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14918: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14919: \$? = $ac_status" >&5 + echo "$as_me:14922: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15016,11 +15019,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15019: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15022: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15023: \$? = $ac_status" >&5 + echo "$as_me:15026: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17223,11 +17226,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17226: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17229: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17230: \$? = $ac_status" >&5 + echo "$as_me:17233: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17491,11 +17494,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17494: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17497: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17498: \$? = $ac_status" >&5 + echo "$as_me:17501: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17595,11 +17598,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17598: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17601: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17602: \$? = $ac_status" >&5 + echo "$as_me:17605: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -25614,6 +25617,229 @@ echo "$as_me:$LINENO: result: $coin_link_input_cmd" >&5 echo "${ECHO_T}$coin_link_input_cmd" >&6 +############################################################################# +# Check for doxygen # +############################################################################# + + + +{ echo "$as_me:$LINENO: configuring doxygen documentation options" >&5 +echo "$as_me: configuring doxygen documentation options" >&6;} + +# Check to see if doxygen is available. + +# Extract the first word of "doxygen", so it can be a program name with args. +set dummy doxygen; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_coin_have_doxygen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$coin_have_doxygen"; then + ac_cv_prog_coin_have_doxygen="$coin_have_doxygen" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_coin_have_doxygen="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_coin_have_doxygen" && ac_cv_prog_coin_have_doxygen="no" +fi +fi +coin_have_doxygen=$ac_cv_prog_coin_have_doxygen +if test -n "$coin_have_doxygen"; then + echo "$as_me:$LINENO: result: $coin_have_doxygen" >&5 +echo "${ECHO_T}$coin_have_doxygen" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +# Extract the first word of "latex", so it can be a program name with args. +set dummy latex; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_coin_have_latex+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$coin_have_latex"; then + ac_cv_prog_coin_have_latex="$coin_have_latex" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_coin_have_latex="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_coin_have_latex" && ac_cv_prog_coin_have_latex="no" +fi +fi +coin_have_latex=$ac_cv_prog_coin_have_latex +if test -n "$coin_have_latex"; then + echo "$as_me:$LINENO: result: $coin_have_latex" >&5 +echo "${ECHO_T}$coin_have_latex" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + +# Look for the dot tool from the graphviz package, unless the user has +# disabled it. + + +# Check whether --with-dot or --without-dot was given. +if test "${with_dot+set}" = set; then + withval="$with_dot" + +else + withval=yes +fi; +if test x"$withval" = xno ; then + coin_doxy_usedot=NO + echo "$as_me:$LINENO: checking for dot " >&5 +echo $ECHO_N "checking for dot ... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: disabled" >&5 +echo "${ECHO_T}disabled" >&6 +else + # Extract the first word of "dot", so it can be a program name with args. +set dummy dot; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_coin_doxy_usedot+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$coin_doxy_usedot"; then + ac_cv_prog_coin_doxy_usedot="$coin_doxy_usedot" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_coin_doxy_usedot="YES" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_coin_doxy_usedot" && ac_cv_prog_coin_doxy_usedot="NO" +fi +fi +coin_doxy_usedot=$ac_cv_prog_coin_doxy_usedot +if test -n "$coin_doxy_usedot"; then + echo "$as_me:$LINENO: result: $coin_doxy_usedot" >&5 +echo "${ECHO_T}$coin_doxy_usedot" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi + +# Generate a tag file name and a log file name + +coin_doxy_tagname=doxydoc/${PACKAGE}_doxy.tag + +coin_doxy_logname=doxydoc/${PACKAGE}_doxy.log + + + +if test $coin_have_doxygen = yes; then + COIN_HAS_DOXYGEN_TRUE= + COIN_HAS_DOXYGEN_FALSE='#' +else + COIN_HAS_DOXYGEN_TRUE='#' + COIN_HAS_DOXYGEN_FALSE= +fi + + + +if test $coin_have_latex = yes; then + COIN_HAS_LATEX_TRUE= + COIN_HAS_LATEX_FALSE='#' +else + COIN_HAS_LATEX_TRUE='#' + COIN_HAS_LATEX_FALSE= +fi + + +# Process the list of project names and massage them into possible doxygen +# doc'n directories. Prefer 1) classic external, source processed using +# a project-specific doxygen.conf, we use the tag file; 2) classic +# external, source processed using package doxygen.conf; 3) installed +# doxydoc. Alternatives 1) and 2) are only possible if the directory will be +# configured, which we can't know unless this is the package base configure, +# since coin_subdirs is only set there. Hence it's sufficient to check for +# membership. If we use a tag file from a classic external, exclude the +# source from doxygen processing when doxygen runs in the base directory. + +coin_doxy_tagfiles= +coin_doxy_excludes= +tmp="CoinUtils Osi Clp Cgl Cbc Alps" +for proj in $tmp ; do + lc_proj=`echo $proj | tr [A-Z] [a-z]` + echo "$as_me:$LINENO: checking for doxygen doc'n for $proj " >&5 +echo $ECHO_N "checking for doxygen doc'n for $proj ... $ECHO_C" >&6 + doxytag=${lc_proj}_doxy.tag + doxyfound=no + # proj will be configured, hence doxydoc present in build tree + doxysrcdir="${srcdir}/../${proj}" + # AC_MSG_NOTICE([Considering $doxysrcdir (base)]) + if test -d "$doxysrcdir" ; then + # with a doxydoc directory? + doxydir="$doxysrcdir/doxydoc" + # AC_MSG_NOTICE([Considering $doxydir (base)]) + # AC_MSG_NOTICE([Subdirs: $coin_subdirs)]) + if test -d "$doxydir" ; then + # use tag file; don't process source + doxydir="../${proj}/doxydoc" + coin_doxy_tagfiles="$coin_doxy_tagfiles $doxydir/$doxytag=../../$doxydir/html" + echo "$as_me:$LINENO: result: $doxydir (tag)" >&5 +echo "${ECHO_T}$doxydir (tag)" >&6 + coin_doxy_excludes="$coin_doxy_excludes */${proj}" + else + # will process the source -- nothing further to be done here + echo "$as_me:$LINENO: result: $doxysrcdir (src)" >&5 +echo "${ECHO_T}$doxysrcdir (src)" >&6 + fi + doxyfound=yes + fi + # Not built, fall back to installed tag file + if test $doxyfound = no ; then + eval doxydir="${datadir}/coin/doc/${proj}/doxydoc" + # AC_MSG_NOTICE([Considering $doxydir (install)]) + # AC_MSG_NOTICE([Subdirs: $coin_subdirs)]) + coin_doxy_tagfiles="$coin_doxy_tagfiles $doxydir/$doxytag=$doxydir/html" + echo "$as_me:$LINENO: result: $doxydir (tag)" >&5 +echo "${ECHO_T}$doxydir (tag)" >&6 + fi +done + + + + + ############################################################################## # Finishing up by writing all the output # ############################################################################## @@ -25656,7 +25882,7 @@ esac # Here list all the files that configure should create (except for the # configuration header file) - ac_config_files="$ac_config_files Makefile src/Makefile src/dippy/Makefile examples/Makefile.Examples examples/TSP/Makefile examples/TSP/tsp.parm examples/TSP/data_extract.sh examples/TSP/get_boost.sh examples/TSP/get_concorde.sh examples/SmallIP/Makefile examples/SmallIP/smallip.parm examples/SmallIP/README.txt examples/SmallIP/test.sh examples/MILP/Makefile examples/MILP/milp.parm examples/MILP/data_extract.sh examples/MILP/README.txt examples/GAP/Makefile examples/GAP/gap.parm examples/GAP/data_extract.sh examples/GAP/get_pisinger.sh examples/GAP/README.txt examples/MCF/Makefile examples/MCF/mcf.parm examples/MCF/data_extract.sh examples/MCF/README.txt examples/MMKP/Makefile examples/MMKP/mmkp.parm examples/MMKP/data_extract.sh examples/MMKP/get_pisinger.sh examples/MMKP/README.txt examples/VRP/Makefile examples/VRP/vrp.parm examples/VRP/data_extract.sh examples/VRP/get_boost.sh examples/VRP/get_concorde.sh examples/VRP/get_cvrpsep.sh examples/ATM/Makefile examples/ATM/atm.parm examples/ATM/data_extract.sh examples/SDPUC/Makefile examples/SDPUC/sdpuc.parm examples/SDPUC/data_extract.sh examples/SDPUC/README.txt examples/ExternalSolvers/Knapsack/Pisinger/Makefile examples/ExternalSolvers/Knapsack/Pisinger/get.pisinger examples/ExternalSolvers/Knapsack/Pisinger/patch.pisinger examples/ExternalSolvers/Knapsack/Pisinger/mcknap.h examples/ExternalSolvers/VRP/get.cvrpsep examples/ExternalSolvers/Graph/get.boost examples/ExternalSolvers/TSP/get.concorde test/Makefile dip.pc dip-uninstalled.pc" + ac_config_files="$ac_config_files Makefile src/Makefile src/dippy/Makefile examples/Makefile.Examples examples/TSP/Makefile examples/TSP/tsp.parm examples/TSP/data_extract.sh examples/TSP/get_boost.sh examples/TSP/get_concorde.sh examples/SmallIP/Makefile examples/SmallIP/smallip.parm examples/SmallIP/README.txt examples/SmallIP/test.sh examples/MILP/Makefile examples/MILP/milp.parm examples/MILP/data_extract.sh examples/MILP/README.txt examples/GAP/Makefile examples/GAP/gap.parm examples/GAP/data_extract.sh examples/GAP/get_pisinger.sh examples/GAP/README.txt examples/MCF/Makefile examples/MCF/mcf.parm examples/MCF/data_extract.sh examples/MCF/README.txt examples/MMKP/Makefile examples/MMKP/mmkp.parm examples/MMKP/data_extract.sh examples/MMKP/get_pisinger.sh examples/MMKP/README.txt examples/VRP/Makefile examples/VRP/vrp.parm examples/VRP/data_extract.sh examples/VRP/get_boost.sh examples/VRP/get_concorde.sh examples/VRP/get_cvrpsep.sh examples/ATM/Makefile examples/ATM/atm.parm examples/ATM/data_extract.sh examples/SDPUC/Makefile examples/SDPUC/sdpuc.parm examples/SDPUC/data_extract.sh examples/SDPUC/README.txt examples/ExternalSolvers/Knapsack/Pisinger/Makefile examples/ExternalSolvers/Knapsack/Pisinger/get.pisinger examples/ExternalSolvers/Knapsack/Pisinger/patch.pisinger examples/ExternalSolvers/Knapsack/Pisinger/mcknap.h examples/ExternalSolvers/VRP/get.cvrpsep examples/ExternalSolvers/Graph/get.boost examples/ExternalSolvers/TSP/get.concorde test/Makefile dip.pc dip-uninstalled.pc doxydoc/doxygen.conf" @@ -26041,6 +26267,20 @@ echo "$as_me: error: conditional \"SYMPHONY_IP_SOLVER\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${COIN_HAS_DOXYGEN_TRUE}" && test -z "${COIN_HAS_DOXYGEN_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_DOXYGEN\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"COIN_HAS_DOXYGEN\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${COIN_HAS_LATEX_TRUE}" && test -z "${COIN_HAS_LATEX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_LATEX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"COIN_HAS_LATEX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -26312,7 +26552,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by Dip $as_me trunk, which was +This file was extended by Dip $as_me 0.91.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26378,7 +26618,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Dip config.status trunk +Dip config.status 0.91.3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -26542,6 +26782,7 @@ do "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "dip.pc" ) CONFIG_FILES="$CONFIG_FILES dip.pc" ;; "dip-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES dip-uninstalled.pc" ;; + "doxydoc/doxygen.conf" ) CONFIG_FILES="$CONFIG_FILES doxydoc/doxygen.conf" ;; "test/MILP_DecompApp.cpp" ) CONFIG_LINKS="$CONFIG_LINKS test/MILP_DecompApp.cpp:examples/MILP/MILP_DecompApp.cpp" ;; "test/MILP_DecompApp.h" ) CONFIG_LINKS="$CONFIG_LINKS test/MILP_DecompApp.h:examples/MILP/MILP_DecompApp.h" ;; "test/MILP_Main.cpp" ) CONFIG_LINKS="$CONFIG_LINKS test/MILP_Main.cpp:examples/MILP/MILP_Main.cpp" ;; @@ -26856,6 +27097,17 @@ s,@CPLEX_IP_SOLVER_TRUE@,$CPLEX_IP_SOLVER_TRUE,;t t s,@CPLEX_IP_SOLVER_FALSE@,$CPLEX_IP_SOLVER_FALSE,;t t s,@SYMPHONY_IP_SOLVER_TRUE@,$SYMPHONY_IP_SOLVER_TRUE,;t t s,@SYMPHONY_IP_SOLVER_FALSE@,$SYMPHONY_IP_SOLVER_FALSE,;t t +s,@coin_have_doxygen@,$coin_have_doxygen,;t t +s,@coin_have_latex@,$coin_have_latex,;t t +s,@coin_doxy_usedot@,$coin_doxy_usedot,;t t +s,@coin_doxy_tagname@,$coin_doxy_tagname,;t t +s,@coin_doxy_logname@,$coin_doxy_logname,;t t +s,@COIN_HAS_DOXYGEN_TRUE@,$COIN_HAS_DOXYGEN_TRUE,;t t +s,@COIN_HAS_DOXYGEN_FALSE@,$COIN_HAS_DOXYGEN_FALSE,;t t +s,@COIN_HAS_LATEX_TRUE@,$COIN_HAS_LATEX_TRUE,;t t +s,@COIN_HAS_LATEX_FALSE@,$COIN_HAS_LATEX_FALSE,;t t +s,@coin_doxy_tagfiles@,$coin_doxy_tagfiles,;t t +s,@coin_doxy_excludes@,$coin_doxy_excludes,;t t s,@DIPINCDIR@,$DIPINCDIR,;t t s,@DIPSRCDIR@,$DIPSRCDIR,;t t s,@DipDEFS@,$DipDEFS,;t t diff --git a/Dip/configure.ac b/Dip/configure.ac index eaebe455..688d525c 100644 --- a/Dip/configure.ac +++ b/Dip/configure.ac @@ -20,7 +20,7 @@ AC_PREREQ(2.59) # name of project, version number, contact info -AC_INIT([Dip],[trunk],[dip@lists.coin-or.org]) +AC_INIT([Dip],[0.91.3],[dip@lists.coin-or.org]) # copyright for configure script AC_COPYRIGHT([ @@ -60,7 +60,7 @@ AC_CANONICAL_BUILD # the source root directory contains definition of where to find those # externals. The following macro ensures that those externals are # retrieved by svn if they are not there yet. -AC_COIN_PROJECTDIR_INIT(Dip) +AC_COIN_PROJECTDIR_INIT(Dip,6:3:5) # Check if user wants to produce debugging code AC_COIN_DEBUG_COMPILE(Dip) diff --git a/Dip/src/Makefile.in b/Dip/src/Makefile.in index 74a45f78..e4ecea86 100644 --- a/Dip/src/Makefile.in +++ b/Dip/src/Makefile.in @@ -216,8 +216,12 @@ COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@ COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@ COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@ COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@ +COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@ +COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@ COIN_HAS_HMETIS_FALSE = @COIN_HAS_HMETIS_FALSE@ COIN_HAS_HMETIS_TRUE = @COIN_HAS_HMETIS_TRUE@ +COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@ +COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@ COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@ COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@ COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@ @@ -368,6 +372,13 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +coin_doxy_excludes = @coin_doxy_excludes@ +coin_doxy_logname = @coin_doxy_logname@ +coin_doxy_tagfiles = @coin_doxy_tagfiles@ +coin_doxy_tagname = @coin_doxy_tagname@ +coin_doxy_usedot = @coin_doxy_usedot@ +coin_have_doxygen = @coin_have_doxygen@ +coin_have_latex = @coin_have_latex@ datadir = @datadir@ exec_prefix = @exec_prefix@ have_autoconf = @have_autoconf@ diff --git a/Dip/src/config_dip_default.h b/Dip/src/config_dip_default.h index 33cbe267..1029da91 100644 --- a/Dip/src/config_dip_default.h +++ b/Dip/src/config_dip_default.h @@ -19,14 +19,14 @@ /***************************************************************************/ /* Version number of project */ -#define DIP_VERSION "trunk" +#define DIP_VERSION "0.91.3" /* Major Version number of project */ -#define DIP_VERSION_MAJOR 9999 +#define DIP_VERSION_MAJOR 0 /* Minor Version number of project */ -#define DIP_VERSION_MINOR 9999 +#define DIP_VERSION_MINOR 91 /* Release Version number of project */ -#define DIP_VERSION_RELEASE 9999 +#define DIP_VERSION_RELEASE 3 diff --git a/Dip/src/dippy/Makefile.in b/Dip/src/dippy/Makefile.in index 45048e17..17c837cf 100644 --- a/Dip/src/dippy/Makefile.in +++ b/Dip/src/dippy/Makefile.in @@ -197,8 +197,12 @@ COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@ COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@ COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@ COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@ +COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@ +COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@ COIN_HAS_HMETIS_FALSE = @COIN_HAS_HMETIS_FALSE@ COIN_HAS_HMETIS_TRUE = @COIN_HAS_HMETIS_TRUE@ +COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@ +COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@ COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@ COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@ COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@ @@ -349,6 +353,13 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +coin_doxy_excludes = @coin_doxy_excludes@ +coin_doxy_logname = @coin_doxy_logname@ +coin_doxy_tagfiles = @coin_doxy_tagfiles@ +coin_doxy_tagname = @coin_doxy_tagname@ +coin_doxy_usedot = @coin_doxy_usedot@ +coin_have_doxygen = @coin_have_doxygen@ +coin_have_latex = @coin_have_latex@ datadir = @datadir@ exec_prefix = @exec_prefix@ have_autoconf = @have_autoconf@ diff --git a/Dip/test/Makefile.in b/Dip/test/Makefile.in index 90515073..23b7196a 100644 --- a/Dip/test/Makefile.in +++ b/Dip/test/Makefile.in @@ -133,8 +133,12 @@ COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@ COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@ COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@ COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@ +COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@ +COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@ COIN_HAS_HMETIS_FALSE = @COIN_HAS_HMETIS_FALSE@ COIN_HAS_HMETIS_TRUE = @COIN_HAS_HMETIS_TRUE@ +COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@ +COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@ COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@ COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@ COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@ @@ -285,6 +289,13 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +coin_doxy_excludes = @coin_doxy_excludes@ +coin_doxy_logname = @coin_doxy_logname@ +coin_doxy_tagfiles = @coin_doxy_tagfiles@ +coin_doxy_tagname = @coin_doxy_tagname@ +coin_doxy_usedot = @coin_doxy_usedot@ +coin_have_doxygen = @coin_have_doxygen@ +coin_have_latex = @coin_have_latex@ datadir = @datadir@ exec_prefix = @exec_prefix@ have_autoconf = @have_autoconf@ diff --git a/Makefile.in b/Makefile.in index 4efaf0d9..6a5b665e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -260,8 +260,10 @@ SUBDIRS_DOXY = $(SUBDIRS) all # Files that are generated and should be cleaned with make distclean DISTCLEANFILES = coin_subdirs.txt $(am__append_2) \ $(VPATH_DISTCLEANFILES) -DocFiles = README AUTHORS LICENSE +DocFiles = README AUTHORS LICENSE DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME) +COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE +COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE all: all-recursive .SUFFIXES: @@ -709,12 +711,100 @@ unitTests: tests .PHONY: test tests unitTests doxydoc doxydocd -install-doc: $(DocFiles) +doxygen-docs: + if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \ + if test -d "doxydoc/"; then \ + doxygen doxydoc/doxygen.conf;\ + fi;\ + fi + +pdf-doxygen-docs: doxygen-docs + if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \ + if test -d "doxydoc/latex"; then \ + if test "$(COIN_HAS_LATEX)" = TRUE; then \ + cd doxydoc/latex;\ + $(MAKE) pdf;\ + cd -;\ + fi;\ + fi;\ + fi + +clean-doxygen-docs: + if test -d "doxydoc/"; then \ + cd doxydoc ;\ + rm -rf html latex *.log *.tag;\ + fi + +install-doxygen-docs: doxygen-docs + if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \ + if test -d "doxydoc/"; then \ + test -d "$(DESTDIR)$(DocInstallDir)/doxydoc" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \ + $(INSTALL_DATA) @coin_doxy_tagname@ "$(DESTDIR)$(DocInstallDir)/@coin_doxy_tagname@";\ + if test -f "doxydoc/latex/refman.pdf"; then \ + $(INSTALL_DATA) doxydoc/latex/refman.pdf "$(DESTDIR)$(DocInstallDir)";\ + fi;\ + if test -d "doxydoc/html"; then \ + test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/search/" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \ + $(INSTALL_DATA) doxydoc/html/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc";\ + $(INSTALL_DATA) doxydoc/html/search/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc/search";\ + fi;\ + fi;\ + fi + +uninstall-doxygen-docs: + if test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/"; then \ + rm -rf "$(DESTDIR)$(DocInstallDir)/doxydoc/"; \ + fi + if test -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; then \ + rm -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; \ + fi + +all-doxygen-docs: + for dir in $(subdirs) ; do \ + do_project=true;\ + for proj in $(COIN_SKIP_DOXYGEN); do\ + if test $$dir = $$proj; then\ + do_project=false;\ + fi;\ + done;\ + if test -r $$dir/doxydoc & $$do_project = true; then \ + (cd $$dir ; $(MAKE) doxygen-docs) \ + fi ; \ + done ; + +clean-all-doxygen-docs: + for dir in $(subdirs) ; do \ + if test -r $$dir/doxydoc ; then \ + (cd $$dir ; $(MAKE) clean-doxygen-docs) \ + fi ; \ + done ; + +install-all-doxygen-docs: all-doxygen-docs + for dir in $(subdirs) ; do \ + do_project=true;\ + for proj in $(COIN_SKIP_DOXYGEN); do\ + if test $$dir = $$proj; then\ + do_project=false;\ + fi;\ + done;\ + if test -r $$dir/doxydoc & $$do_project = true; then \ + (cd $$dir ; $(MAKE) install-doxygen-docs) \ + fi ; \ + done ; + +uninstall-all-doxygen-docs: + for dir in $(subdirs) ; do \ + if test -r $$dir/doxydoc ; then \ + (cd $$dir ; $(MAKE) uninstall-doxygen-docs) \ + fi ; \ + done ; + +install-doc: $(DocFiles) test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)" for file in $(DocFiles); do \ if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \ if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \ - done + done uninstall-doc: for file in $(DocFiles); do \ diff --git a/configure b/configure index f94e40d1..0e73f17d 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac 0.8. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for Dip trunk. +# Generated by GNU Autoconf 2.59 for Dip 0.91.3. # # Report bugs to . # @@ -441,8 +441,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Dip' PACKAGE_TARNAME='dip' -PACKAGE_VERSION='trunk' -PACKAGE_STRING='Dip trunk' +PACKAGE_VERSION='0.91.3' +PACKAGE_STRING='Dip 0.91.3' PACKAGE_BUGREPORT='dip@lists.coin-or.org' ac_unique_file="configure.ac" @@ -1044,7 +1044,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Dip trunk to adapt to many kinds of systems. +\`configure' configures Dip 0.91.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1110,7 +1110,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Dip trunk:";; + short | recursive ) echo "Configuration of Dip 0.91.3:";; esac cat <<\_ACEOF @@ -1320,7 +1320,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Dip configure trunk +Dip configure 0.91.3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1351,7 +1351,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Dip $as_me trunk, which was +It was created by Dip $as_me 0.91.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -5120,7 +5120,7 @@ fi # Define the identity of the package. PACKAGE='dip' - VERSION='trunk' + VERSION='0.91.3' cat >>confdefs.h <<_ACEOF @@ -22673,7 +22673,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by Dip $as_me trunk, which was +This file was extended by Dip $as_me 0.91.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22731,7 +22731,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Dip config.status trunk +Dip config.status 0.91.3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index c8179dcd..629f116e 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_PREREQ(2.59) # name of project, version number, contact info -AC_INIT([Dip],[trunk],[dip@lists.coin-or.org]) +AC_INIT([Dip],[0.91.3],[dip@lists.coin-or.org]) # copyright for configure script AC_COPYRIGHT([