Changeset 2204


Ignore:
Timestamp:
Jul 4, 2015 9:30:54 AM (4 years ago)
Author:
stefan
Message:

have configure flags to enable nauty use (CbcSymmetry?); disable NAUTY_MAX_LEVEL for now: neither Cbc nor nauty seem to define the nauty_maxalllevel symbol

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Cbc/Makefile.in

    r2169 r2204  
    198198COIN_HAS_NETLIB_FALSE = @COIN_HAS_NETLIB_FALSE@
    199199COIN_HAS_NETLIB_TRUE = @COIN_HAS_NETLIB_TRUE@
     200COIN_HAS_NTY_FALSE = @COIN_HAS_NTY_FALSE@
     201COIN_HAS_NTY_TRUE = @COIN_HAS_NTY_TRUE@
    200202COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
    201203COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
    … …  
    304306NETLIB_LIBS = @NETLIB_LIBS@
    305307NETLIB_LIBS_INSTALLED = @NETLIB_LIBS_INSTALLED@
     308NTYINCDIR = @NTYINCDIR@
     309NTYLIB = @NTYLIB@
    306310OBJEXT = @OBJEXT@
    307311OPT_CFLAGS = @OPT_CFLAGS@
    … …  
    10011005            doxygen doxydoc/doxygen.conf;\
    10021006          fi;\
     1007        fi
     1008
     1009pdf-doxygen-docs: doxygen-docs
     1010        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
    10031011          if test -d "doxydoc/latex"; then \
    10041012            if test "$(COIN_HAS_LATEX)" = TRUE; then \
    … …  
    10191027        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
    10201028          if test -d "doxydoc/"; then \
     1029            test -d "$(DESTDIR)$(DocInstallDir)/doxydoc" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \
    10211030            $(INSTALL_DATA) @coin_doxy_tagname@ "$(DESTDIR)$(DocInstallDir)/@coin_doxy_tagname@";\
    1022             test -d "$(DocInstallDir)/doxydoc" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \
    10231031            if test -f "doxydoc/latex/refman.pdf"; then \
    10241032              $(INSTALL_DATA) doxydoc/latex/refman.pdf "$(DESTDIR)$(DocInstallDir)";\
    10251033            fi;\
    10261034            if test -d "doxydoc/html"; then \
    1027               test -d "$(DocInstallDir)/doxydoc/search/" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \
     1035              test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/search/" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \
    10281036              $(INSTALL_DATA) doxydoc/html/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc";\
    10291037              $(INSTALL_DATA) doxydoc/html/search/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc/search";\

  • trunk/Cbc/configure

    r2168 r2204  
    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 build build_cpu build_vendor build_os ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CBC_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 CBCLIB_CFLAGS CBCLIB_LIBS CBCLIB_PCLIBS CBCLIB_PCREQUIRES CBCLIB_DEPENDENCIES CBCLIB_CFLAGS_INSTALLED CBCLIB_LIBS_INSTALLED CBCGENERIC_CFLAGS CBCGENERIC_LIBS CBCGENERIC_PCLIBS CBCGENERIC_PCREQUIRES CBCGENERIC_DEPENDENCIES CBCGENERIC_CFLAGS_INSTALLED CBCGENERIC_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 OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA OSITESTS_DEPENDENCIES OSITESTS_LIBS_INSTALLED OSITESTS_CFLAGS_INSTALLED OSITESTS_DATA_INSTALLED COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_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 NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA NETLIB_DEPENDENCIES NETLIB_LIBS_INSTALLED NETLIB_CFLAGS_INSTALLED NETLIB_DATA_INSTALLED COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE MIPLIB3_LIBS MIPLIB3_CFLAGS MIPLIB3_DATA MIPLIB3_DEPENDENCIES MIPLIB3_LIBS_INSTALLED MIPLIB3_CFLAGS_INSTALLED MIPLIB3_DATA_INSTALLED COIN_HAS_MIPLIB3_TRUE COIN_HAS_MIPLIB3_FALSE DYLP_LIBS DYLP_CFLAGS DYLP_DATA DYLP_DEPENDENCIES DYLP_LIBS_INSTALLED DYLP_CFLAGS_INSTALLED DYLP_DATA_INSTALLED COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE VOL_LIBS VOL_CFLAGS VOL_DATA VOL_DEPENDENCIES VOL_LIBS_INSTALLED VOL_CFLAGS_INSTALLED VOL_DATA_INSTALLED COIN_HAS_VOL_TRUE COIN_HAS_VOL_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 GLPK_LIBS GLPK_CFLAGS GLPK_DATA GLPK_DEPENDENCIES GLPK_LIBS_INSTALLED GLPK_CFLAGS_INSTALLED GLPK_DATA_INSTALLED COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE GRB_LIBS GRB_CFLAGS GRB_DATA GRB_DEPENDENCIES GRB_LIBS_INSTALLED GRB_CFLAGS_INSTALLED GRB_DATA_INSTALLED COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE MSK_LIBS MSK_CFLAGS MSK_DATA MSK_DEPENDENCIES MSK_LIBS_INSTALLED MSK_CFLAGS_INSTALLED MSK_DATA_INSTALLED COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE SPX_LIBS SPX_CFLAGS SPX_DATA SPX_DEPENDENCIES SPX_LIBS_INSTALLED SPX_CFLAGS_INSTALLED SPX_DATA_INSTALLED COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPR_LIBS XPR_CFLAGS XPR_DATA XPR_DEPENDENCIES XPR_LIBS_INSTALLED XPR_CFLAGS_INSTALLED XPR_DATA_INSTALLED COIN_HAS_XPR_TRUE COIN_HAS_XPR_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 CBC_BUILD_CBC_GENERIC_TRUE CBC_BUILD_CBC_GENERIC_FALSE OSICBC_DFLT_SOLVER_CLP_TRUE OSICBC_DFLT_SOLVER_CLP_FALSE OSICBC_DFLT_SOLVER_CPX_TRUE OSICBC_DFLT_SOLVER_CPX_FALSE OSICBC_DFLT_SOLVER_DYLP_TRUE OSICBC_DFLT_SOLVER_DYLP_FALSE OSICBC_DFLT_SOLVER_GLPK_TRUE OSICBC_DFLT_SOLVER_GLPK_FALSE OSICBC_DFLT_SOLVER_GRB_TRUE OSICBC_DFLT_SOLVER_GRB_FALSE OSICBC_DFLT_SOLVER_MSK_TRUE OSICBC_DFLT_SOLVER_MSK_FALSE OSICBC_DFLT_SOLVER_SPX_TRUE OSICBC_DFLT_SOLVER_SPX_FALSE OSICBC_DFLT_SOLVER_SYM_TRUE OSICBC_DFLT_SOLVER_SYM_FALSE OSICBC_DFLT_SOLVER_VOL_TRUE OSICBC_DFLT_SOLVER_VOL_FALSE OSICBC_DFLT_SOLVER_XPR_TRUE OSICBC_DFLT_SOLVER_XPR_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 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 build build_cpu build_vendor build_os ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CBC_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 CBCLIB_CFLAGS CBCLIB_LIBS CBCLIB_PCLIBS CBCLIB_PCREQUIRES CBCLIB_DEPENDENCIES CBCLIB_CFLAGS_INSTALLED CBCLIB_LIBS_INSTALLED CBCGENERIC_CFLAGS CBCGENERIC_LIBS CBCGENERIC_PCLIBS CBCGENERIC_PCREQUIRES CBCGENERIC_DEPENDENCIES CBCGENERIC_CFLAGS_INSTALLED CBCGENERIC_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 OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA OSITESTS_DEPENDENCIES OSITESTS_LIBS_INSTALLED OSITESTS_CFLAGS_INSTALLED OSITESTS_DATA_INSTALLED COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_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 NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA NETLIB_DEPENDENCIES NETLIB_LIBS_INSTALLED NETLIB_CFLAGS_INSTALLED NETLIB_DATA_INSTALLED COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE MIPLIB3_LIBS MIPLIB3_CFLAGS MIPLIB3_DATA MIPLIB3_DEPENDENCIES MIPLIB3_LIBS_INSTALLED MIPLIB3_CFLAGS_INSTALLED MIPLIB3_DATA_INSTALLED COIN_HAS_MIPLIB3_TRUE COIN_HAS_MIPLIB3_FALSE DYLP_LIBS DYLP_CFLAGS DYLP_DATA DYLP_DEPENDENCIES DYLP_LIBS_INSTALLED DYLP_CFLAGS_INSTALLED DYLP_DATA_INSTALLED COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE VOL_LIBS VOL_CFLAGS VOL_DATA VOL_DEPENDENCIES VOL_LIBS_INSTALLED VOL_CFLAGS_INSTALLED VOL_DATA_INSTALLED COIN_HAS_VOL_TRUE COIN_HAS_VOL_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 GLPK_LIBS GLPK_CFLAGS GLPK_DATA GLPK_DEPENDENCIES GLPK_LIBS_INSTALLED GLPK_CFLAGS_INSTALLED GLPK_DATA_INSTALLED COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE GRB_LIBS GRB_CFLAGS GRB_DATA GRB_DEPENDENCIES GRB_LIBS_INSTALLED GRB_CFLAGS_INSTALLED GRB_DATA_INSTALLED COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE MSK_LIBS MSK_CFLAGS MSK_DATA MSK_DEPENDENCIES MSK_LIBS_INSTALLED MSK_CFLAGS_INSTALLED MSK_DATA_INSTALLED COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE SPX_LIBS SPX_CFLAGS SPX_DATA SPX_DEPENDENCIES SPX_LIBS_INSTALLED SPX_CFLAGS_INSTALLED SPX_DATA_INSTALLED COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPR_LIBS XPR_CFLAGS XPR_DATA XPR_DEPENDENCIES XPR_LIBS_INSTALLED XPR_CFLAGS_INSTALLED XPR_DATA_INSTALLED COIN_HAS_XPR_TRUE COIN_HAS_XPR_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 NTYINCDIR NTYLIB COIN_HAS_NTY_TRUE COIN_HAS_NTY_FALSE CBC_BUILD_CBC_GENERIC_TRUE CBC_BUILD_CBC_GENERIC_FALSE OSICBC_DFLT_SOLVER_CLP_TRUE OSICBC_DFLT_SOLVER_CLP_FALSE OSICBC_DFLT_SOLVER_CPX_TRUE OSICBC_DFLT_SOLVER_CPX_FALSE OSICBC_DFLT_SOLVER_DYLP_TRUE OSICBC_DFLT_SOLVER_DYLP_FALSE OSICBC_DFLT_SOLVER_GLPK_TRUE OSICBC_DFLT_SOLVER_GLPK_FALSE OSICBC_DFLT_SOLVER_GRB_TRUE OSICBC_DFLT_SOLVER_GRB_FALSE OSICBC_DFLT_SOLVER_MSK_TRUE OSICBC_DFLT_SOLVER_MSK_FALSE OSICBC_DFLT_SOLVER_SPX_TRUE OSICBC_DFLT_SOLVER_SPX_FALSE OSICBC_DFLT_SOLVER_SYM_TRUE OSICBC_DFLT_SOLVER_SYM_FALSE OSICBC_DFLT_SOLVER_VOL_TRUE OSICBC_DFLT_SOLVER_VOL_FALSE OSICBC_DFLT_SOLVER_XPR_TRUE OSICBC_DFLT_SOLVER_XPR_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 LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
    … …  
    11031103                          package linker flags
    11041104  --enable-gnu-packages   compile with GNU packages (disabled by default)
     1105  --disable-nauty-libcheck
     1106                          skip the link check at configuration time
    11051107  --enable-cbc-parallel   enables compilation of the SMP version of Cbc
    11061108
    … …  
    11681170  --with-asl-incdir directory with header files for using package ASL
    11691171  --with-asl-datadir directory with data files for using package ASL
     1172  --with-nauty-incdir specify the header file directory for library Nauty
     1173  --with-nauty-lib specify the flags used to link with the library Nauty
    11701174  --with-cbc-generic      specify whether to build cbc-generic (default: no)
    11711175  --with-cbc-generic-solver
    … …  
    58725876*-*-irix6*)
    58735877  # Find out which ABI we are using.
    5874   echo '#line 5874 "configure"' > conftest.$ac_ext
     5878  echo '#line 5878 "configure"' > conftest.$ac_ext
    58755879  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    58765880  (eval $ac_compile) 2>&5
    … …  
    70067010
    70077011# Provide some information about the compiler.
    7008 echo "$as_me:7008:" \
     7012echo "$as_me:7012:" \
    70097013     "checking for Fortran 77 compiler version" >&5
    70107014ac_compiler=`set X $ac_compile; echo $2`
    … …  
    80738077   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80748078   -e 's:$: $lt_compiler_flag:'`
    8075    (eval echo "\"\$as_me:8075: $lt_compile\"" >&5)
     8079   (eval echo "\"\$as_me:8079: $lt_compile\"" >&5)
    80768080   (eval "$lt_compile" 2>conftest.err)
    80778081   ac_status=$?
    80788082   cat conftest.err >&5
    8079    echo "$as_me:8079: \$? = $ac_status" >&5
     8083   echo "$as_me:8083: \$? = $ac_status" >&5
    80808084   if (exit $ac_status) && test -s "$ac_outfile"; then
    80818085     # The compiler can only warn and ignore the option if not recognized
    … …  
    83418345   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83428346   -e 's:$: $lt_compiler_flag:'`
    8343    (eval echo "\"\$as_me:8343: $lt_compile\"" >&5)
     8347   (eval echo "\"\$as_me:8347: $lt_compile\"" >&5)
    83448348   (eval "$lt_compile" 2>conftest.err)
    83458349   ac_status=$?
    83468350   cat conftest.err >&5
    8347    echo "$as_me:8347: \$? = $ac_status" >&5
     8351   echo "$as_me:8351: \$? = $ac_status" >&5
    83488352   if (exit $ac_status) && test -s "$ac_outfile"; then
    83498353     # The compiler can only warn and ignore the option if not recognized
    … …  
    84458449   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84468450   -e 's:$: $lt_compiler_flag:'`
    8447    (eval echo "\"\$as_me:8447: $lt_compile\"" >&5)
     8451   (eval echo "\"\$as_me:8451: $lt_compile\"" >&5)
    84488452   (eval "$lt_compile" 2>out/conftest.err)
    84498453   ac_status=$?
    84508454   cat out/conftest.err >&5
    8451    echo "$as_me:8451: \$? = $ac_status" >&5
     8455   echo "$as_me:8455: \$? = $ac_status" >&5
    84528456   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84538457   then
    … …  
    1079010794  lt_status=$lt_dlunknown
    1079110795  cat > conftest.$ac_ext <<EOF
    10792 #line 10792 "configure"
     10796#line 10796 "configure"
    1079310797#include "confdefs.h"
    1079410798
    … …  
    1089010894  lt_status=$lt_dlunknown
    1089110895  cat > conftest.$ac_ext <<EOF
    10892 #line 10892 "configure"
     10896#line 10896 "configure"
    1089310897#include "confdefs.h"
    1089410898
    … …  
    1323413238   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1323513239   -e 's:$: $lt_compiler_flag:'`
    13236    (eval echo "\"\$as_me:13236: $lt_compile\"" >&5)
     13240   (eval echo "\"\$as_me:13240: $lt_compile\"" >&5)
    1323713241   (eval "$lt_compile" 2>conftest.err)
    1323813242   ac_status=$?
    1323913243   cat conftest.err >&5
    13240    echo "$as_me:13240: \$? = $ac_status" >&5
     13244   echo "$as_me:13244: \$? = $ac_status" >&5
    1324113245   if (exit $ac_status) && test -s "$ac_outfile"; then
    1324213246     # The compiler can only warn and ignore the option if not recognized
    … …  
    1333813342   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1333913343   -e 's:$: $lt_compiler_flag:'`
    13340    (eval echo "\"\$as_me:13340: $lt_compile\"" >&5)
     13344   (eval echo "\"\$as_me:13344: $lt_compile\"" >&5)
    1334113345   (eval "$lt_compile" 2>out/conftest.err)
    1334213346   ac_status=$?
    1334313347   cat out/conftest.err >&5
    13344    echo "$as_me:13344: \$? = $ac_status" >&5
     13348   echo "$as_me:13348: \$? = $ac_status" >&5
    1334513349   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1334613350   then
    … …  
    1490814912   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1490914913   -e 's:$: $lt_compiler_flag:'`
    14910    (eval echo "\"\$as_me:14910: $lt_compile\"" >&5)
     14914   (eval echo "\"\$as_me:14914: $lt_compile\"" >&5)
    1491114915   (eval "$lt_compile" 2>conftest.err)
    1491214916   ac_status=$?
    1491314917   cat conftest.err >&5
    14914    echo "$as_me:14914: \$? = $ac_status" >&5
     14918   echo "$as_me:14918: \$? = $ac_status" >&5
    1491514919   if (exit $ac_status) && test -s "$ac_outfile"; then
    1491614920     # The compiler can only warn and ignore the option if not recognized
    … …  
    1501215016   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1501315017   -e 's:$: $lt_compiler_flag:'`
    15014    (eval echo "\"\$as_me:15014: $lt_compile\"" >&5)
     15018   (eval echo "\"\$as_me:15018: $lt_compile\"" >&5)
    1501515019   (eval "$lt_compile" 2>out/conftest.err)
    1501615020   ac_status=$?
    1501715021   cat out/conftest.err >&5
    15018    echo "$as_me:15018: \$? = $ac_status" >&5
     15022   echo "$as_me:15022: \$? = $ac_status" >&5
    1501915023   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1502015024   then
    … …  
    1721917223   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1722017224   -e 's:$: $lt_compiler_flag:'`
    17221    (eval echo "\"\$as_me:17221: $lt_compile\"" >&5)
     17225   (eval echo "\"\$as_me:17225: $lt_compile\"" >&5)
    1722217226   (eval "$lt_compile" 2>conftest.err)
    1722317227   ac_status=$?
    1722417228   cat conftest.err >&5
    17225    echo "$as_me:17225: \$? = $ac_status" >&5
     17229   echo "$as_me:17229: \$? = $ac_status" >&5
    1722617230   if (exit $ac_status) && test -s "$ac_outfile"; then
    1722717231     # The compiler can only warn and ignore the option if not recognized
    … …  
    1748717491   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1748817492   -e 's:$: $lt_compiler_flag:'`
    17489    (eval echo "\"\$as_me:17489: $lt_compile\"" >&5)
     17493   (eval echo "\"\$as_me:17493: $lt_compile\"" >&5)
    1749017494   (eval "$lt_compile" 2>conftest.err)
    1749117495   ac_status=$?
    1749217496   cat conftest.err >&5
    17493    echo "$as_me:17493: \$? = $ac_status" >&5
     17497   echo "$as_me:17497: \$? = $ac_status" >&5
    1749417498   if (exit $ac_status) && test -s "$ac_outfile"; then
    1749517499     # The compiler can only warn and ignore the option if not recognized
    … …  
    1759117595   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1759217596   -e 's:$: $lt_compiler_flag:'`
    17593    (eval echo "\"\$as_me:17593: $lt_compile\"" >&5)
     17597   (eval echo "\"\$as_me:17597: $lt_compile\"" >&5)
    1759417598   (eval "$lt_compile" 2>out/conftest.err)
    1759517599   ac_status=$?
    1759617600   cat out/conftest.err >&5
    17597    echo "$as_me:17597: \$? = $ac_status" >&5
     17601   echo "$as_me:17601: \$? = $ac_status" >&5
    1759817602   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1759917603   then
    … …  
    2964029644
    2964129645
     29646
     29647
     29648# Nauty library (for symmetry detection)
     29649ac_ext=c
     29650ac_cpp='$CPP $CPPFLAGS'
     29651ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     29652ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     29653ac_compiler_gnu=$ac_cv_c_compiler_gnu
     29654
     29655
     29656  echo "$as_me:$LINENO: checking if user provides library for Nauty" >&5
     29657echo $ECHO_N "checking if user provides library for Nauty... $ECHO_C" >&6
     29658
     29659# Check for header file directory
     29660
     29661
     29662# Check whether --with-nauty-incdir or --without-nauty-incdir was given.
     29663if test "${with_nauty_incdir+set}" = set; then
     29664  withval="$with_nauty_incdir"
     29665  NTYINCDIR=`cd $withval; pwd`
     29666fi;
     29667
     29668# Check for library directory
     29669
     29670
     29671# Check whether --with-nauty-lib or --without-nauty-lib was given.
     29672if test "${with_nauty_lib+set}" = set; then
     29673  withval="$with_nauty_lib"
     29674  NTYLIB=$withval
     29675fi;
     29676
     29677# Switch to disable library check if requested
     29678
     29679  # Check whether --enable-nauty-libcheck or --disable-nauty-libcheck was given.
     29680if test "${enable_nauty_libcheck+set}" = set; then
     29681  enableval="$enable_nauty_libcheck"
     29682  nauty_libcheck=$enableval
     29683else
     29684  nauty_libcheck=yes
     29685fi;
     29686
     29687# At this point, if we're going to use the library, both LBRYINCDIR and
     29688# LBRYLIB must be defined and not empty.
     29689
     29690  if test x"$NTYINCDIR" != x || test x"$NTYLIB" != x; then
     29691    if test x"$NTYINCDIR" = x || test x"$NTYLIB" = x; then
     29692      { { echo "$as_me:$LINENO: error: You need to specify both an include directory and link flags to use library Nauty. Use --with-nauty-incdir of environment variable $NTYINCDIR to specify the include directory. Use --with-nauty-lib or environment variable $NTYLIB to specify link flags." >&5
     29693echo "$as_me: error: You need to specify both an include directory and link flags to use library Nauty. Use --with-nauty-incdir of environment variable $NTYINCDIR to specify the include directory. Use --with-nauty-lib or environment variable $NTYLIB to specify link flags." >&2;}
     29694   { (exit 1); exit 1; }; }
     29695    fi
     29696    coin_has_nty=true
     29697    echo "$as_me:$LINENO: result: yes" >&5
     29698echo "${ECHO_T}yes" >&6
     29699  else
     29700    coin_has_nty=false
     29701    echo "$as_me:$LINENO: result: no" >&5
     29702echo "${ECHO_T}no" >&6
     29703  fi
     29704
     29705# If we have instructions for use, consider header and link checks.
     29706
     29707  if test $coin_has_nty = true; then
     29708
     29709# If argument 3 (file) is given, check for the file. Typically this will be a
     29710# header file, but that's not assumed.
     29711
     29712    if test -r $NTYINCDIR/nauty.h; then
     29713
     29714  :
     29715else
     29716  { { echo "$as_me:$LINENO: error: Cannot find file nauty.h in $NTYINCDIR" >&5
     29717echo "$as_me: error: Cannot find file nauty.h in $NTYINCDIR" >&2;}
     29718   { (exit 1); exit 1; }; }
     29719  :
     29720fi
     29721
     29722
     29723# Now see if we can link the function. There are arguments for and against
     29724# assuming argument 3 is a header file declaring the function. A correct
     29725# function declaration is the main argument in favour. Having to cope with
     29726# possible dependencies or other oddities are the main arguments against.
     29727# Force the use of C as the best single choice amongst C++, C, and Fortran.
     29728# Obviously, this has limits.
     29729
     29730    if test x"$nauty_libcheck" != xno; then
     29731           coin_save_LIBS="$LIBS"
     29732           LIBS="$NTYLIB "
     29733           coin_NTY_link=no
     29734           ac_ext=c
     29735ac_cpp='$CPP $CPPFLAGS'
     29736ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     29737ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     29738ac_compiler_gnu=$ac_cv_c_compiler_gnu
     29739
     29740           for fnm in nauty ; do
     29741             echo "$as_me:$LINENO: checking whether symbol $fnm is available with NTY" >&5
     29742echo $ECHO_N "checking whether symbol $fnm is available with NTY... $ECHO_C" >&6
     29743             cat >conftest.$ac_ext <<_ACEOF
     29744/* confdefs.h.  */
     29745_ACEOF
     29746cat confdefs.h >>conftest.$ac_ext
     29747cat >>conftest.$ac_ext <<_ACEOF
     29748/* end confdefs.h.  */
     29749
     29750int
     29751main ()
     29752{
     29753$fnm()
     29754  ;
     29755  return 0;
     29756}
     29757_ACEOF
     29758rm -f conftest.$ac_objext conftest$ac_exeext
     29759if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     29760  (eval $ac_link) 2>conftest.er1
     29761  ac_status=$?
     29762  grep -v '^ *+' conftest.er1 >conftest.err
     29763  rm -f conftest.er1
     29764  cat conftest.err >&5
     29765  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     29766  (exit $ac_status); } &&
     29767         { ac_try='test -z "$ac_c_werror_flag"
     29768                         || test ! -s conftest.err'
     29769  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     29770  (eval $ac_try) 2>&5
     29771  ac_status=$?
     29772  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     29773  (exit $ac_status); }; } &&
     29774         { ac_try='test -s conftest$ac_exeext'
     29775  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     29776  (eval $ac_try) 2>&5
     29777  ac_status=$?
     29778  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     29779  (exit $ac_status); }; }; then
     29780  echo "$as_me:$LINENO: result: yes" >&5
     29781echo "${ECHO_T}yes" >&6
     29782                  coin_NTY_link=yes
     29783                  break
     29784else
     29785  echo "$as_me: failed program was:" >&5
     29786sed 's/^/| /' conftest.$ac_ext >&5
     29787
     29788echo "$as_me:$LINENO: result: no" >&5
     29789echo "${ECHO_T}no" >&6
     29790fi
     29791rm -f conftest.err conftest.$ac_objext \
     29792      conftest$ac_exeext conftest.$ac_ext
     29793           done
     29794           ac_ext=c
     29795ac_cpp='$CPP $CPPFLAGS'
     29796ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     29797ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     29798ac_compiler_gnu=$ac_cv_c_compiler_gnu
     29799
     29800           LIBS="$coin_save_LIBS"
     29801           if test x"$coin_NTY_link" != xyes ; then
     29802             { { echo "$as_me:$LINENO: error: Cannot find symbol(s) nauty with NTY" >&5
     29803echo "$as_me: error: Cannot find symbol(s) nauty with NTY" >&2;}
     29804   { (exit 1); exit 1; }; }
     29805           fi
     29806         fi
     29807
     29808
     29809# If we make it this far, we've verified the file and linked the function. Add
     29810# the necessary link flags to CbcLib CbcGeneric_{PC}LIBS and define the preprocessor symbol
     29811# COIN_HAS_LBRY.
     29812
     29813
     29814      CBCLIB_LIBS="$NTYLIB $CBCLIB_LIBS"
     29815      CBCLIB_PCLIBS="$NTYLIB $CBCLIB_PCLIBS"
     29816      CBCLIB_LIBS_INSTALLED="$NTYLIB $CBCLIB_LIBS_INSTALLED"
     29817
     29818      CBCGENERIC_LIBS="$NTYLIB $CBCGENERIC_LIBS"
     29819      CBCGENERIC_PCLIBS="$NTYLIB $CBCGENERIC_PCLIBS"
     29820      CBCGENERIC_LIBS_INSTALLED="$NTYLIB $CBCGENERIC_LIBS_INSTALLED"
     29821
     29822
     29823
     29824cat >>confdefs.h <<\_ACEOF
     29825#define COIN_HAS_NTY 1
     29826_ACEOF
     29827
     29828  fi
     29829
     29830# Arrange for configure to substitute LBRYINCDIR and LBRYLIB and create the
     29831# automake conditional. These actions must occur unconditionally.
     29832
     29833
     29834
     29835
     29836
     29837if test $coin_has_nty = true; then
     29838  COIN_HAS_NTY_TRUE=
     29839  COIN_HAS_NTY_FALSE='#'
     29840else
     29841  COIN_HAS_NTY_TRUE='#'
     29842  COIN_HAS_NTY_FALSE=
     29843fi
     29844
     29845
     29846ac_ext=c
     29847ac_cpp='$CPP $CPPFLAGS'
     29848ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     29849ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     29850ac_compiler_gnu=$ac_cv_c_compiler_gnu
    2964229851
    2964329852
    … …  
    3087131080Usually this means the macro was only invoked conditionally." >&5
    3087231081echo "$as_me: error: conditional \"COIN_HAS_ASL\" was never defined.
     31082Usually this means the macro was only invoked conditionally." >&2;}
     31083   { (exit 1); exit 1; }; }
     31084fi
     31085if test -z "${COIN_HAS_NTY_TRUE}" && test -z "${COIN_HAS_NTY_FALSE}"; then
     31086  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_NTY\" was never defined.
     31087Usually this means the macro was only invoked conditionally." >&5
     31088echo "$as_me: error: conditional \"COIN_HAS_NTY\" was never defined.
    3087331089Usually this means the macro was only invoked conditionally." >&2;}
    3087431090   { (exit 1); exit 1; }; }
    … …  
    3176731983s,@COIN_HAS_ASL_TRUE@,$COIN_HAS_ASL_TRUE,;t t
    3176831984s,@COIN_HAS_ASL_FALSE@,$COIN_HAS_ASL_FALSE,;t t
     31985s,@NTYINCDIR@,$NTYINCDIR,;t t
     31986s,@NTYLIB@,$NTYLIB,;t t
     31987s,@COIN_HAS_NTY_TRUE@,$COIN_HAS_NTY_TRUE,;t t
     31988s,@COIN_HAS_NTY_FALSE@,$COIN_HAS_NTY_FALSE,;t t
    3176931989s,@CBC_BUILD_CBC_GENERIC_TRUE@,$CBC_BUILD_CBC_GENERIC_TRUE,;t t
    3177031990s,@CBC_BUILD_CBC_GENERIC_FALSE@,$CBC_BUILD_CBC_GENERIC_FALSE,;t t

  • trunk/Cbc/configure.ac

    r2113 r2204  
    105105# Ampl Solver library
    106106AC_COIN_CHECK_PACKAGE(ASL, [coinasl], [CbcLib CbcGeneric])
     107
     108# Nauty library (for symmetry detection)
     109AC_LANG_PUSH(C)
     110AC_COIN_CHECK_USER_LIBRARY([Nauty],[NTY],[nauty.h],[nauty],,[CbcLib CbcGeneric])
     111AC_LANG_POP(C)
    107112
    108113#############################################################################

  • trunk/Cbc/src/CbcSymmetry.cpp

    r2092 r2204  
    1010 */
    1111//#define PRINT_MORE 1
     12
     13#include "CbcConfig.h"
     14
     15#ifdef COIN_HAS_NTY
     16
     17extern "C" {
     18#include "nauty.h"
     19#include "nausparse.h"
     20#ifdef NTY_TRACES
     21#include "traces.h"
     22#endif
     23}
     24
    1225#include <stdio.h>
    13 
    14 #ifdef COIN_HAS_NTY
    15 
    1626#include <cassert>
    1727#include <vector>
    … …  
    2333#include "CbcBranchingObject.hpp"
    2434#include "CoinTime.hpp"
    25 #define NAUTY_MAX_LEVEL 2000
     35#define NAUTY_MAX_LEVEL 0
    2636#if NAUTY_MAX_LEVEL
    2737extern int nauty_maxalllevel;

  • trunk/Cbc/src/Makefile.am

    r2148 r2204  
    119119bin_PROGRAMS =
    120120AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_CFLAGS) $(ASL_CFLAGS)
     121
     122if COIN_HAS_NTY
     123AM_CPPFLAGS += -I$(NTYINCDIR)
     124endif
    121125
    122126########################################################################

  • trunk/Cbc/src/Makefile.in

    r2167 r2204  
    4646host_triplet = @host@
    4747bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
     48@COIN_HAS_NTY_TRUE@am__append_1 = -I$(NTYINCDIR)
    4849
    4950########################################################################
    … …  
    5354# Name of the executable compiled in this directory.  We want it to be
    5455# installed in the 'bin' directory
    55 @COIN_HAS_CLP_TRUE@am__append_1 = cbc
     56@COIN_HAS_CLP_TRUE@am__append_2 = cbc
    5657
    5758########################################################################
    … …  
    6162# Name of the executable compiled in this directory.  We want it to be
    6263# installed in the 'bin' directory
    63 @CBC_BUILD_CBC_GENERIC_TRUE@am__append_2 = cbc-generic
     64@CBC_BUILD_CBC_GENERIC_TRUE@am__append_3 = cbc-generic
    6465
    6566# List all additionally required solver and Osi libraries
    6667# the linker flags for all available LP solvers should already be included in $CBCGENERIC_LIBS,
    6768# so just add compiler flags here (all we can think of)
    68 @CBC_BUILD_CBC_GENERIC_TRUE@am__append_3 = $(DYLP_CFLAGS) $(GLPK_CFLAGS) $(MSK_CFLAGS) $(SPX_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS)
     69@CBC_BUILD_CBC_GENERIC_TRUE@am__append_4 = $(DYLP_CFLAGS) $(GLPK_CFLAGS) $(MSK_CFLAGS) $(SPX_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS)
    6970subdir = src
    7071DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
    … …  
    265266COIN_HAS_NETLIB_FALSE = @COIN_HAS_NETLIB_FALSE@
    266267COIN_HAS_NETLIB_TRUE = @COIN_HAS_NETLIB_TRUE@
     268COIN_HAS_NTY_FALSE = @COIN_HAS_NTY_FALSE@
     269COIN_HAS_NTY_TRUE = @COIN_HAS_NTY_TRUE@
    267270COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
    268271COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
    … …  
    371374NETLIB_LIBS = @NETLIB_LIBS@
    372375NETLIB_LIBS_INSTALLED = @NETLIB_LIBS_INSTALLED@
     376NTYINCDIR = @NTYINCDIR@
     377NTYLIB = @NTYLIB@
    373378OBJEXT = @OBJEXT@
    374379OPT_CFLAGS = @OPT_CFLAGS@
    … …  
    618623# List additional defines
    619624AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_CFLAGS) \
    620         $(ASL_CFLAGS) $(am__append_3) -DCOIN_NO_CLP_MESSAGE \
    621         -DUSE_CBCCONFIG
     625        $(ASL_CFLAGS) $(am__append_1) $(am__append_4) \
     626        -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
    622627
    623628# List all source files for this executable, including headers

  • trunk/Cbc/src/OsiCbc/Makefile.in

    r2167 r2204  
    191191COIN_HAS_NETLIB_FALSE = @COIN_HAS_NETLIB_FALSE@
    192192COIN_HAS_NETLIB_TRUE = @COIN_HAS_NETLIB_TRUE@
     193COIN_HAS_NTY_FALSE = @COIN_HAS_NTY_FALSE@
     194COIN_HAS_NTY_TRUE = @COIN_HAS_NTY_TRUE@
    193195COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
    194196COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
    … …  
    297299NETLIB_LIBS = @NETLIB_LIBS@
    298300NETLIB_LIBS_INSTALLED = @NETLIB_LIBS_INSTALLED@
     301NTYINCDIR = @NTYINCDIR@
     302NTYLIB = @NTYLIB@
    299303OBJEXT = @OBJEXT@
    300304OPT_CFLAGS = @OPT_CFLAGS@

  • trunk/Cbc/src/config.h.in

    r1899 r2204  
    5858/* Define to 1 if the Netlib package is available */
    5959#undef COIN_HAS_NETLIB
     60
     61/* Define to 1 if the Nauty package is available */
     62#undef COIN_HAS_NTY
    6063
    6164/* Define to 1 if the OsiTests package is available */

  • trunk/Cbc/test/Makefile.in

    r2167 r2204  
    185185COIN_HAS_NETLIB_FALSE = @COIN_HAS_NETLIB_FALSE@
    186186COIN_HAS_NETLIB_TRUE = @COIN_HAS_NETLIB_TRUE@
     187COIN_HAS_NTY_FALSE = @COIN_HAS_NTY_FALSE@
     188COIN_HAS_NTY_TRUE = @COIN_HAS_NTY_TRUE@
    187189COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
    188190COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
    … …  
    291293NETLIB_LIBS = @NETLIB_LIBS@
    292294NETLIB_LIBS_INSTALLED = @NETLIB_LIBS_INSTALLED@
     295NTYINCDIR = @NTYINCDIR@
     296NTYLIB = @NTYLIB@
    293297OBJEXT = @OBJEXT@
    294298OPT_CFLAGS = @OPT_CFLAGS@

  • trunk/Makefile.in

    r2109 r2204  
    114114COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
    115115COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
     116COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
     117COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
     118COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
     119COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
    116120COIN_SKIP_PROJECTS = @COIN_SKIP_PROJECTS@
    117121CPP = @CPP@
    … …  
    211215coin_doxy_usedot = @coin_doxy_usedot@
    212216coin_have_doxygen = @coin_have_doxygen@
     217coin_have_latex = @coin_have_latex@
    213218datadir = @datadir@
    214219exec_prefix = @exec_prefix@
    … …  
    256261DISTCLEANFILES = coin_subdirs.txt $(am__append_2) \
    257262        $(VPATH_DISTCLEANFILES)
    258 DocFiles = README AUTHORS LICENSE
     263DocFiles = README AUTHORS LICENSE 
    259264DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
     265COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
     266COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    260267all: all-recursive
    261268
    … …  
    733740.PHONY: test unitTest tests unitTests doxydoc
    734741
    735 install-doc: $(DocFiles)
     742doxygen-docs:
     743        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     744          if test -d "doxydoc/"; then \
     745            doxygen doxydoc/doxygen.conf;\
     746          fi;\
     747        fi
     748
     749pdf-doxygen-docs: doxygen-docs
     750        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     751          if test -d "doxydoc/latex"; then \
     752            if test "$(COIN_HAS_LATEX)" = TRUE; then \
     753              cd doxydoc/latex;\
     754              $(MAKE) pdf;\
     755              cd -;\
     756            fi;\
     757          fi;\
     758        fi
     759
     760clean-doxygen-docs:
     761        if test -d "doxydoc/"; then \
     762          cd doxydoc ;\
     763          rm -rf html latex *.log *.tag;\
     764        fi
     765
     766install-doxygen-docs: doxygen-docs
     767        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     768          if test -d "doxydoc/"; then \
     769            test -d "$(DESTDIR)$(DocInstallDir)/doxydoc" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \
     770            $(INSTALL_DATA) @coin_doxy_tagname@ "$(DESTDIR)$(DocInstallDir)/@coin_doxy_tagname@";\
     771            if test -f "doxydoc/latex/refman.pdf"; then \
     772              $(INSTALL_DATA) doxydoc/latex/refman.pdf "$(DESTDIR)$(DocInstallDir)";\
     773            fi;\
     774            if test -d "doxydoc/html"; then \
     775              test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/search/" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \
     776              $(INSTALL_DATA) doxydoc/html/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc";\
     777              $(INSTALL_DATA) doxydoc/html/search/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc/search";\
     778            fi;\
     779          fi;\
     780        fi
     781
     782uninstall-doxygen-docs:
     783        if test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/"; then \
     784          rm -rf "$(DESTDIR)$(DocInstallDir)/doxydoc/"; \
     785        fi
     786        if test -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; then \
     787          rm -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; \
     788        fi
     789
     790all-doxygen-docs:
     791        for dir in $(subdirs) ; do \
     792          do_project=true;\
     793          for proj in $(COIN_SKIP_DOXYGEN); do\
     794            if test $$dir = $$proj; then\
     795              do_project=false;\
     796            fi;\
     797          done;\
     798          if test -r $$dir/doxydoc & $$do_project = true; then \
     799            (cd $$dir ; $(MAKE) doxygen-docs) \
     800          fi ; \
     801        done ;
     802
     803clean-all-doxygen-docs:
     804        for dir in $(subdirs) ; do \
     805          if test -r $$dir/doxydoc ; then \
     806            (cd $$dir ; $(MAKE) clean-doxygen-docs) \
     807          fi ; \
     808        done ;
     809
     810install-all-doxygen-docs: all-doxygen-docs
     811        for dir in $(subdirs) ; do \
     812          do_project=true;\
     813          for proj in $(COIN_SKIP_DOXYGEN); do\
     814            if test $$dir = $$proj; then\
     815              do_project=false;\
     816            fi;\
     817          done;\
     818          if test -r $$dir/doxydoc & $$do_project = true; then \
     819            (cd $$dir ; $(MAKE) install-doxygen-docs) \
     820          fi ; \
     821        done ;
     822
     823uninstall-all-doxygen-docs:
     824        for dir in $(subdirs) ; do \
     825          if test -r $$dir/doxydoc ; then \
     826            (cd $$dir ; $(MAKE) uninstall-doxygen-docs) \
     827          fi ; \
     828        done ;
     829
     830install-doc: $(DocFiles)
    736831        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
    737832        for file in $(DocFiles); do \
    738833          if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
    739834          if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \
    740         done
     835        done 
    741836
    742837uninstall-doc:

  • trunk/configure

    r2126 r2204  
    490490ac_subdirs_all="$ac_subdirs_all Cgl"
    491491ac_subdirs_all="$ac_subdirs_all Cbc"
    492 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 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 ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 ac_ct_F77 FFLAGS MPIF77 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 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS COIN_SKIP_PROJECTS subdirs coin_have_doxygen coin_doxy_usedot coin_doxy_tagname coin_doxy_logname coin_doxy_tagfiles coin_doxy_excludes LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     492ac_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 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 ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 ac_ct_F77 FFLAGS MPIF77 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 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS COIN_SKIP_PROJECTS subdirs 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 LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    493493ac_subst_files=''
    494494
    … …  
    2281322813fi
    2281422814
     22815# Extract the first word of "latex", so it can be a program name with args.
     22816set dummy latex; ac_word=$2
     22817echo "$as_me:$LINENO: checking for $ac_word" >&5
     22818echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     22819if test "${ac_cv_prog_coin_have_latex+set}" = set; then
     22820  echo $ECHO_N "(cached) $ECHO_C" >&6
     22821else
     22822  if test -n "$coin_have_latex"; then
     22823  ac_cv_prog_coin_have_latex="$coin_have_latex" # Let the user override the test.
     22824else
     22825as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     22826for as_dir in $PATH
     22827do
     22828  IFS=$as_save_IFS
     22829  test -z "$as_dir" && as_dir=.
     22830  for ac_exec_ext in '' $ac_executable_extensions; do
     22831  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     22832    ac_cv_prog_coin_have_latex="yes"
     22833    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     22834    break 2
     22835  fi
     22836done
     22837done
     22838
     22839  test -z "$ac_cv_prog_coin_have_latex" && ac_cv_prog_coin_have_latex="no"
     22840fi
     22841fi
     22842coin_have_latex=$ac_cv_prog_coin_have_latex
     22843if test -n "$coin_have_latex"; then
     22844  echo "$as_me:$LINENO: result: $coin_have_latex" >&5
     22845echo "${ECHO_T}$coin_have_latex" >&6
     22846else
     22847  echo "$as_me:$LINENO: result: no" >&5
     22848echo "${ECHO_T}no" >&6
     22849fi
     22850
    2281522851
    2281622852# Look for the dot tool from the graphviz package, unless the user has
    … …  
    2287722913
    2287822914
     22915
     22916if test $coin_have_doxygen = yes; then
     22917  COIN_HAS_DOXYGEN_TRUE=
     22918  COIN_HAS_DOXYGEN_FALSE='#'
     22919else
     22920  COIN_HAS_DOXYGEN_TRUE='#'
     22921  COIN_HAS_DOXYGEN_FALSE=
     22922fi
     22923
     22924
     22925
     22926if test $coin_have_latex = yes; then
     22927  COIN_HAS_LATEX_TRUE=
     22928  COIN_HAS_LATEX_FALSE='#'
     22929else
     22930  COIN_HAS_LATEX_TRUE='#'
     22931  COIN_HAS_LATEX_FALSE=
     22932fi
     22933
     22934
    2287922935# Process the list of project names and massage them into possible doxygen
    2288022936# doc'n directories. Prefer 1) classic external, source processed using
    … …  
    2289622952  doxytag=${lc_proj}_doxy.tag
    2289722953  doxyfound=no
    22898   for chkProj in $coin_subdirs ; do
    22899     if test "$chkProj" = "$proj" ; then
    22900       # proj will be configured, hence doxydoc present in build tree
    22901       doxysrcdir="${srcdir}/${proj}"
    22902       # AC_MSG_NOTICE([Considering $doxysrcdir (base)])
    22903       if test -d "$doxysrcdir" ; then
    22904         # with a doxydoc directory?
    22905         doxydir="$doxysrcdir/doxydoc"
    22906         # AC_MSG_NOTICE([Considering $doxydir (base)])
    22907         # AC_MSG_NOTICE([Subdirs: $coin_subdirs)])
    22908         if test -d "$doxydir" ; then
    22909           # use tag file; don't process source
    22910           eval doxydir="`pwd`/${proj}/doxydoc"
    22911           coin_doxy_tagfiles="$coin_doxy_tagfiles $doxydir/$doxytag=$doxydir/html"
    22912           echo "$as_me:$LINENO: result: $doxydir (tag)" >&5
     22954  # proj will be configured, hence doxydoc present in build tree
     22955  doxysrcdir="${srcdir}/../${proj}"
     22956  # AC_MSG_NOTICE([Considering $doxysrcdir (base)])
     22957  if test -d "$doxysrcdir" ; then
     22958    # with a doxydoc directory?
     22959    doxydir="$doxysrcdir/doxydoc"
     22960    # AC_MSG_NOTICE([Considering $doxydir (base)])
     22961    # AC_MSG_NOTICE([Subdirs: $coin_subdirs)])
     22962    if test -d "$doxydir" ; then
     22963      # use tag file; don't process source
     22964      doxydir="../${proj}/doxydoc"
     22965      coin_doxy_tagfiles="$coin_doxy_tagfiles $doxydir/$doxytag=../../$doxydir/html"
     22966      echo "$as_me:$LINENO: result: $doxydir (tag)" >&5
    2291322967echo "${ECHO_T}$doxydir (tag)" >&6
    22914           coin_doxy_excludes="$coin_doxy_excludes */${proj}"
    22915         else
    22916           # will process the source -- nothing further to be done here
    22917           echo "$as_me:$LINENO: result: $doxysrcdir (src)" >&5
     22968      coin_doxy_excludes="$coin_doxy_excludes */${proj}"
     22969    else
     22970      # will process the source -- nothing further to be done here
     22971      echo "$as_me:$LINENO: result: $doxysrcdir (src)" >&5
    2291822972echo "${ECHO_T}$doxysrcdir (src)" >&6
    22919         fi
    22920         doxyfound=yes
    22921       fi
    2292222973    fi
    22923   done
     22974    doxyfound=yes
     22975  fi
    2292422976  # Not built, fall back to installed tag file
    2292522977  if test $doxyfound = no ; then
    … …  
    2318623238Usually this means the macro was only invoked conditionally." >&5
    2318723239echo "$as_me: error: conditional \"DEPENDENCY_LINKING\" was never defined.
     23240Usually this means the macro was only invoked conditionally." >&2;}
     23241   { (exit 1); exit 1; }; }
     23242fi
     23243if test -z "${COIN_HAS_DOXYGEN_TRUE}" && test -z "${COIN_HAS_DOXYGEN_FALSE}"; then
     23244  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_DOXYGEN\" was never defined.
     23245Usually this means the macro was only invoked conditionally." >&5
     23246echo "$as_me: error: conditional \"COIN_HAS_DOXYGEN\" was never defined.
     23247Usually this means the macro was only invoked conditionally." >&2;}
     23248   { (exit 1); exit 1; }; }
     23249fi
     23250if test -z "${COIN_HAS_LATEX_TRUE}" && test -z "${COIN_HAS_LATEX_FALSE}"; then
     23251  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_LATEX\" was never defined.
     23252Usually this means the macro was only invoked conditionally." >&5
     23253echo "$as_me: error: conditional \"COIN_HAS_LATEX\" was never defined.
    2318823254Usually this means the macro was only invoked conditionally." >&2;}
    2318923255   { (exit 1); exit 1; }; }
    … …  
    2382323889s,@subdirs@,$subdirs,;t t
    2382423890s,@coin_have_doxygen@,$coin_have_doxygen,;t t
     23891s,@coin_have_latex@,$coin_have_latex,;t t
    2382523892s,@coin_doxy_usedot@,$coin_doxy_usedot,;t t
    2382623893s,@coin_doxy_tagname@,$coin_doxy_tagname,;t t
    2382723894s,@coin_doxy_logname@,$coin_doxy_logname,;t t
     23895s,@COIN_HAS_DOXYGEN_TRUE@,$COIN_HAS_DOXYGEN_TRUE,;t t
     23896s,@COIN_HAS_DOXYGEN_FALSE@,$COIN_HAS_DOXYGEN_FALSE,;t t
     23897s,@COIN_HAS_LATEX_TRUE@,$COIN_HAS_LATEX_TRUE,;t t
     23898s,@COIN_HAS_LATEX_FALSE@,$COIN_HAS_LATEX_FALSE,;t t
    2382823899s,@coin_doxy_tagfiles@,$coin_doxy_tagfiles,;t t
    2382923900s,@coin_doxy_excludes@,$coin_doxy_excludes,;t t
Note: See TracChangeset for help on using the changeset viewer.