Changeset 1581 for trunk/Clp


Ignore:
Timestamp:
Jul 27, 2010 2:16:45 PM (9 years ago)
Author:
lou
Message:

New doxygen documentation structure.

Location:
trunk/Clp
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.in

    r1579 r1581  
    6262        $(srcdir)/Makefile.in $(srcdir)/clp-uninstalled.pc.in \
    6363        $(srcdir)/clp.pc.in $(top_srcdir)/configure \
     64        $(top_srcdir)/doxydoc/doxygen.conf.in \
    6465        $(top_srcdir)/examples/Makefile.in \
    6566        $(top_srcdir)/inc/config_clp.h.in \
     
    7980CONFIG_HEADER = $(top_builddir)/inc/config_clp.h
    8081CONFIG_CLEAN_FILES = examples/Makefile clp.pc clp-uninstalled.pc \
    81         osi-clp-uninstalled.pc
     82        osi-clp-uninstalled.pc doxydoc/doxygen.conf
    8283SOURCES =
    8384DIST_SOURCES =
     
    252253build_os = @build_os@
    253254build_vendor = @build_vendor@
     255coin_doxy_excludes = @coin_doxy_excludes@
     256coin_doxy_logname = @coin_doxy_logname@
     257coin_doxy_tagfiles = @coin_doxy_tagfiles@
     258coin_doxy_tagname = @coin_doxy_tagname@
     259coin_doxy_usedot = @coin_doxy_usedot@
     260coin_have_doxygen = @coin_have_doxygen@
    254261datadir = @datadir@
    255262exec_prefix = @exec_prefix@
     
    386393        cd $(top_builddir) && $(SHELL) ./config.status $@
    387394osi-clp-uninstalled.pc: $(top_builddir)/config.status $(top_srcdir)/src/OsiClp/osi-clp-uninstalled.pc.in
     395        cd $(top_builddir) && $(SHELL) ./config.status $@
     396doxydoc/doxygen.conf: $(top_builddir)/config.status $(top_srcdir)/doxydoc/doxygen.conf.in
    388397        cd $(top_builddir) && $(SHELL) ./config.status $@
    389398
     
    550559        $(am__remove_distdir)
    551560        mkdir $(distdir)
    552         $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/doc $(distdir)/doc/Howto $(distdir)/examples $(distdir)/inc $(distdir)/src/OsiClp
     561        $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/doc $(distdir)/doc/Howto $(distdir)/doxydoc $(distdir)/examples $(distdir)/inc $(distdir)/src/OsiClp
    553562        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    554563        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  • trunk/Clp/configure

    r1580 r1581  
    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 ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CLP_SVN_REV CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE 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 LN_S 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 LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA REQUIREDPACKAGES COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSI_LIBS OSI_CFLAGS OSI_DATA COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE 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 ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CLP_SVN_REV CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE 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 LN_S 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 LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA REQUIREDPACKAGES COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSI_LIBS OSI_CFLAGS OSI_DATA COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE coin_have_doxygen coin_doxy_usedot coin_doxy_tagname coin_doxy_logname coin_doxy_tagfiles coin_doxy_excludes LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    11301130  --with-netlib-datadir directory with data files for using module Netlib
    11311131  --with-wsmp             specify WSMP library
     1132  --with-dot              use dot (from graphviz) when creating documentation
     1133                          with doxygen if available; --without-dot to disable
    11321134
    11331135Some influential environment variables:
     
    58755877*-*-irix6*)
    58765878  # Find out which ABI we are using.
    5877   echo '#line 5877 "configure"' > conftest.$ac_ext
     5879  echo '#line 5879 "configure"' > conftest.$ac_ext
    58785880  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    58795881  (eval $ac_compile) 2>&5
     
    70097011
    70107012# Provide some information about the compiler.
    7011 echo "$as_me:7011:" \
     7013echo "$as_me:7013:" \
    70127014     "checking for Fortran 77 compiler version" >&5
    70137015ac_compiler=`set X $ac_compile; echo $2`
     
    80768078   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80778079   -e 's:$: $lt_compiler_flag:'`
    8078    (eval echo "\"\$as_me:8078: $lt_compile\"" >&5)
     8080   (eval echo "\"\$as_me:8080: $lt_compile\"" >&5)
    80798081   (eval "$lt_compile" 2>conftest.err)
    80808082   ac_status=$?
    80818083   cat conftest.err >&5
    8082    echo "$as_me:8082: \$? = $ac_status" >&5
     8084   echo "$as_me:8084: \$? = $ac_status" >&5
    80838085   if (exit $ac_status) && test -s "$ac_outfile"; then
    80848086     # The compiler can only warn and ignore the option if not recognized
     
    83448346   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83458347   -e 's:$: $lt_compiler_flag:'`
    8346    (eval echo "\"\$as_me:8346: $lt_compile\"" >&5)
     8348   (eval echo "\"\$as_me:8348: $lt_compile\"" >&5)
    83478349   (eval "$lt_compile" 2>conftest.err)
    83488350   ac_status=$?
    83498351   cat conftest.err >&5
    8350    echo "$as_me:8350: \$? = $ac_status" >&5
     8352   echo "$as_me:8352: \$? = $ac_status" >&5
    83518353   if (exit $ac_status) && test -s "$ac_outfile"; then
    83528354     # The compiler can only warn and ignore the option if not recognized
     
    84488450   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84498451   -e 's:$: $lt_compiler_flag:'`
    8450    (eval echo "\"\$as_me:8450: $lt_compile\"" >&5)
     8452   (eval echo "\"\$as_me:8452: $lt_compile\"" >&5)
    84518453   (eval "$lt_compile" 2>out/conftest.err)
    84528454   ac_status=$?
    84538455   cat out/conftest.err >&5
    8454    echo "$as_me:8454: \$? = $ac_status" >&5
     8456   echo "$as_me:8456: \$? = $ac_status" >&5
    84558457   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84568458   then
     
    1079310795  lt_status=$lt_dlunknown
    1079410796  cat > conftest.$ac_ext <<EOF
    10795 #line 10795 "configure"
     10797#line 10797 "configure"
    1079610798#include "confdefs.h"
    1079710799
     
    1089310895  lt_status=$lt_dlunknown
    1089410896  cat > conftest.$ac_ext <<EOF
    10895 #line 10895 "configure"
     10897#line 10897 "configure"
    1089610898#include "confdefs.h"
    1089710899
     
    1323713239   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1323813240   -e 's:$: $lt_compiler_flag:'`
    13239    (eval echo "\"\$as_me:13239: $lt_compile\"" >&5)
     13241   (eval echo "\"\$as_me:13241: $lt_compile\"" >&5)
    1324013242   (eval "$lt_compile" 2>conftest.err)
    1324113243   ac_status=$?
    1324213244   cat conftest.err >&5
    13243    echo "$as_me:13243: \$? = $ac_status" >&5
     13245   echo "$as_me:13245: \$? = $ac_status" >&5
    1324413246   if (exit $ac_status) && test -s "$ac_outfile"; then
    1324513247     # The compiler can only warn and ignore the option if not recognized
     
    1334113343   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1334213344   -e 's:$: $lt_compiler_flag:'`
    13343    (eval echo "\"\$as_me:13343: $lt_compile\"" >&5)
     13345   (eval echo "\"\$as_me:13345: $lt_compile\"" >&5)
    1334413346   (eval "$lt_compile" 2>out/conftest.err)
    1334513347   ac_status=$?
    1334613348   cat out/conftest.err >&5
    13347    echo "$as_me:13347: \$? = $ac_status" >&5
     13349   echo "$as_me:13349: \$? = $ac_status" >&5
    1334813350   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1334913351   then
     
    1491114913   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1491214914   -e 's:$: $lt_compiler_flag:'`
    14913    (eval echo "\"\$as_me:14913: $lt_compile\"" >&5)
     14915   (eval echo "\"\$as_me:14915: $lt_compile\"" >&5)
    1491414916   (eval "$lt_compile" 2>conftest.err)
    1491514917   ac_status=$?
    1491614918   cat conftest.err >&5
    14917    echo "$as_me:14917: \$? = $ac_status" >&5
     14919   echo "$as_me:14919: \$? = $ac_status" >&5
    1491814920   if (exit $ac_status) && test -s "$ac_outfile"; then
    1491914921     # The compiler can only warn and ignore the option if not recognized
     
    1501515017   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1501615018   -e 's:$: $lt_compiler_flag:'`
    15017    (eval echo "\"\$as_me:15017: $lt_compile\"" >&5)
     15019   (eval echo "\"\$as_me:15019: $lt_compile\"" >&5)
    1501815020   (eval "$lt_compile" 2>out/conftest.err)
    1501915021   ac_status=$?
    1502015022   cat out/conftest.err >&5
    15021    echo "$as_me:15021: \$? = $ac_status" >&5
     15023   echo "$as_me:15023: \$? = $ac_status" >&5
    1502215024   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1502315025   then
     
    1722217224   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1722317225   -e 's:$: $lt_compiler_flag:'`
    17224    (eval echo "\"\$as_me:17224: $lt_compile\"" >&5)
     17226   (eval echo "\"\$as_me:17226: $lt_compile\"" >&5)
    1722517227   (eval "$lt_compile" 2>conftest.err)
    1722617228   ac_status=$?
    1722717229   cat conftest.err >&5
    17228    echo "$as_me:17228: \$? = $ac_status" >&5
     17230   echo "$as_me:17230: \$? = $ac_status" >&5
    1722917231   if (exit $ac_status) && test -s "$ac_outfile"; then
    1723017232     # The compiler can only warn and ignore the option if not recognized
     
    1749017492   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1749117493   -e 's:$: $lt_compiler_flag:'`
    17492    (eval echo "\"\$as_me:17492: $lt_compile\"" >&5)
     17494   (eval echo "\"\$as_me:17494: $lt_compile\"" >&5)
    1749317495   (eval "$lt_compile" 2>conftest.err)
    1749417496   ac_status=$?
    1749517497   cat conftest.err >&5
    17496    echo "$as_me:17496: \$? = $ac_status" >&5
     17498   echo "$as_me:17498: \$? = $ac_status" >&5
    1749717499   if (exit $ac_status) && test -s "$ac_outfile"; then
    1749817500     # The compiler can only warn and ignore the option if not recognized
     
    1759417596   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1759517597   -e 's:$: $lt_compiler_flag:'`
    17596    (eval echo "\"\$as_me:17596: $lt_compile\"" >&5)
     17598   (eval echo "\"\$as_me:17598: $lt_compile\"" >&5)
    1759717599   (eval "$lt_compile" 2>out/conftest.err)
    1759817600   ac_status=$?
    1759917601   cat out/conftest.err >&5
    17600    echo "$as_me:17600: \$? = $ac_status" >&5
     17602   echo "$as_me:17602: \$? = $ac_status" >&5
    1760117603   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1760217604   then
     
    2252022522# input files for the examples are available in the VPATH directory.
    2252122523
     22524
    2252222525echo "$as_me:$LINENO: checking whether this is a VPATH configuration" >&5
    2252322526echo $ECHO_N "checking whether this is a VPATH configuration... $ECHO_C" >&6
     
    2253122534
    2253222535
     22536
     22537# Allow for newlines in the parameter
    2253322538if test $coin_vpath_config = yes; then
    22534   # echo converts newlines in parameter to spaces
    22535   coin_vpath_link_files="$coin_vpath_link_files `echo examples/hello.mps`"
    22536 fi
    22537 
    22538 
     22539  cvl_tmp="examples/hello.mps"
     22540  coin_vpath_link_files=
     22541  for file in $cvl_tmp ; do
     22542    coin_vpath_link_files="$coin_vpath_link_files $file"
     22543  done
     22544fi
     22545
     22546
     22547
     22548# Allow for newlines in the parameter
    2253922549if test $coin_vpath_config = yes; then
    22540   # echo converts newlines in parameter to spaces
    22541   coin_vpath_link_files="$coin_vpath_link_files `echo examples/input.130`"
    22542 fi
     22550  cvl_tmp="examples/input.130"
     22551  coin_vpath_link_files=
     22552  for file in $cvl_tmp ; do
     22553    coin_vpath_link_files="$coin_vpath_link_files $file"
     22554  done
     22555fi
     22556
     22557
     22558#############################################################################
     22559#                  Check for doxygen                                        #
     22560#############################################################################
     22561
     22562
     22563
     22564{ echo "$as_me:$LINENO: configuring doxygen documentation options" >&5
     22565echo "$as_me: configuring doxygen documentation options" >&6;}
     22566
     22567# Check to see if doxygen is available.
     22568
     22569# Extract the first word of "doxygen", so it can be a program name with args.
     22570set dummy doxygen; ac_word=$2
     22571echo "$as_me:$LINENO: checking for $ac_word" >&5
     22572echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     22573if test "${ac_cv_prog_coin_have_doxygen+set}" = set; then
     22574  echo $ECHO_N "(cached) $ECHO_C" >&6
     22575else
     22576  if test -n "$coin_have_doxygen"; then
     22577  ac_cv_prog_coin_have_doxygen="$coin_have_doxygen" # Let the user override the test.
     22578else
     22579as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     22580for as_dir in $PATH
     22581do
     22582  IFS=$as_save_IFS
     22583  test -z "$as_dir" && as_dir=.
     22584  for ac_exec_ext in '' $ac_executable_extensions; do
     22585  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     22586    ac_cv_prog_coin_have_doxygen="yes"
     22587    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     22588    break 2
     22589  fi
     22590done
     22591done
     22592
     22593  test -z "$ac_cv_prog_coin_have_doxygen" && ac_cv_prog_coin_have_doxygen="no"
     22594fi
     22595fi
     22596coin_have_doxygen=$ac_cv_prog_coin_have_doxygen
     22597if test -n "$coin_have_doxygen"; then
     22598  echo "$as_me:$LINENO: result: $coin_have_doxygen" >&5
     22599echo "${ECHO_T}$coin_have_doxygen" >&6
     22600else
     22601  echo "$as_me:$LINENO: result: no" >&5
     22602echo "${ECHO_T}no" >&6
     22603fi
     22604
     22605
     22606# Look for the dot tool from the graphviz package, unless the user has
     22607# disabled it.
     22608
     22609
     22610# Check whether --with-dot or --without-dot was given.
     22611if test "${with_dot+set}" = set; then
     22612  withval="$with_dot"
     22613
     22614else
     22615  withval=yes
     22616fi;
     22617if test x$withval = xno ; then
     22618  coin_doxy_usedot=NO
     22619  echo "$as_me:$LINENO: checking for dot " >&5
     22620echo $ECHO_N "checking for dot ... $ECHO_C" >&6
     22621  echo "$as_me:$LINENO: result: disabled" >&5
     22622echo "${ECHO_T}disabled" >&6
     22623else
     22624  # Extract the first word of "dot", so it can be a program name with args.
     22625set dummy dot; ac_word=$2
     22626echo "$as_me:$LINENO: checking for $ac_word" >&5
     22627echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     22628if test "${ac_cv_prog_coin_doxy_usedot+set}" = set; then
     22629  echo $ECHO_N "(cached) $ECHO_C" >&6
     22630else
     22631  if test -n "$coin_doxy_usedot"; then
     22632  ac_cv_prog_coin_doxy_usedot="$coin_doxy_usedot" # Let the user override the test.
     22633else
     22634as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     22635for as_dir in $PATH
     22636do
     22637  IFS=$as_save_IFS
     22638  test -z "$as_dir" && as_dir=.
     22639  for ac_exec_ext in '' $ac_executable_extensions; do
     22640  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     22641    ac_cv_prog_coin_doxy_usedot="YES"
     22642    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     22643    break 2
     22644  fi
     22645done
     22646done
     22647
     22648  test -z "$ac_cv_prog_coin_doxy_usedot" && ac_cv_prog_coin_doxy_usedot="NO"
     22649fi
     22650fi
     22651coin_doxy_usedot=$ac_cv_prog_coin_doxy_usedot
     22652if test -n "$coin_doxy_usedot"; then
     22653  echo "$as_me:$LINENO: result: $coin_doxy_usedot" >&5
     22654echo "${ECHO_T}$coin_doxy_usedot" >&6
     22655else
     22656  echo "$as_me:$LINENO: result: no" >&5
     22657echo "${ECHO_T}no" >&6
     22658fi
     22659
     22660fi
     22661
     22662# Generate a tag file name and a log file name
     22663
     22664coin_doxy_tagname=doxydoc/${PACKAGE}_doxy.tag
     22665
     22666coin_doxy_logname=doxydoc/${PACKAGE}_doxy.log
     22667
     22668
     22669# Process the list of project names and massage them into possible doxygen
     22670# doc'n directories. Prefer 1) classic external, source processed using
     22671# a project-specific doxygen.conf, we use the tag file; 2) classic
     22672# external, source processed using package doxygen.conf; 3) installed
     22673# doxydoc. Alternatives 1) and 2) are only possible if the directory will be
     22674# configured, which we can't know unless this is the package base configure,
     22675# since coin_subdirs is only set there. Hence it's sufficient to check for
     22676# membership. If we use a tag file from a classic external, exclude the
     22677# source from doxygen processing when doxygen runs in the base directory.
     22678
     22679coin_doxy_tagfiles=
     22680coin_doxy_excludes=
     22681tmp="CoinUtils Osi"
     22682for proj in $tmp ; do
     22683  lc_proj=`echo $proj | tr [A-Z] [a-z]`
     22684  echo "$as_me:$LINENO: checking for doxygen doc'n for $proj " >&5
     22685echo $ECHO_N "checking for doxygen doc'n for $proj ... $ECHO_C" >&6
     22686  doxytag=${lc_proj}_doxy.tag
     22687  doxyfound=no
     22688  for chkProj in $coin_subdirs ; do
     22689    if test "$chkProj" = "$proj" ; then
     22690      # proj will be configured, hence doxydoc present in build tree
     22691      doxysrcdir="${srcdir}/${proj}"
     22692      { echo "$as_me:$LINENO: Considering $doxysrcdir (base)" >&5
     22693echo "$as_me: Considering $doxysrcdir (base)" >&6;}
     22694      if test -d "$doxysrcdir" ; then
     22695        # with a doxydoc directory?
     22696        doxydir="$doxysrcdir/doxydoc"
     22697        { echo "$as_me:$LINENO: Considering $doxydir (base)" >&5
     22698echo "$as_me: Considering $doxydir (base)" >&6;}
     22699        { echo "$as_me:$LINENO: Subdirs: $coin_subdirs)" >&5
     22700echo "$as_me: Subdirs: $coin_subdirs)" >&6;}
     22701        if test -d "$doxydir" ; then
     22702          # use tag file; don't process source
     22703          eval doxydir="`pwd`/${proj}/doxydoc"
     22704          coin_doxy_tagfiles="$coin_doxy_tagfiles $doxydir/$doxytag=$doxydir/html"
     22705          echo "$as_me:$LINENO: result: $doxydir (tag)" >&5
     22706echo "${ECHO_T}$doxydir (tag)" >&6
     22707          coin_doxy_excludes="$coin_doxy_excludes */${proj}*"
     22708        else
     22709          # will process the source -- nothing further to be done here
     22710          echo "$as_me:$LINENO: result: $doxysrcdir (src)" >&5
     22711echo "${ECHO_T}$doxysrcdir (src)" >&6
     22712        fi
     22713        doxyfound=yes
     22714      fi
     22715    fi
     22716  done
     22717  # Not built, fall back to installed tag file
     22718  if test $doxyfound = no ; then
     22719    eval doxydir="${datadir}/coin/doc/${proj}/doxydoc"
     22720    { echo "$as_me:$LINENO: Considering $doxydir (install)" >&5
     22721echo "$as_me: Considering $doxydir (install)" >&6;}
     22722    { echo "$as_me:$LINENO: Subdirs: $coin_subdirs)" >&5
     22723echo "$as_me: Subdirs: $coin_subdirs)" >&6;}
     22724    coin_doxy_tagfiles="$coin_doxy_tagfiles $doxydir/$doxytag=$doxydir/html"
     22725    echo "$as_me:$LINENO: result: $doxydir (tag)" >&5
     22726echo "${ECHO_T}$doxydir (tag)" >&6
     22727  fi
     22728done
     22729
     22730
     22731
    2254322732
    2254422733
     
    2255622745
    2255722746fi
     22747
     22748          ac_config_files="$ac_config_files doxydoc/doxygen.conf"
     22749
    2255822750
    2255922751# Here put the location and name of the configuration header file
     
    2329323485  "src/OsiClp/osi-clp.pc" ) CONFIG_FILES="$CONFIG_FILES src/OsiClp/osi-clp.pc" ;;
    2329423486  "osi-clp-uninstalled.pc" ) CONFIG_FILES="$CONFIG_FILES osi-clp-uninstalled.pc:src/OsiClp/osi-clp-uninstalled.pc.in" ;;
     23487  "doxydoc/doxygen.conf" ) CONFIG_FILES="$CONFIG_FILES doxydoc/doxygen.conf" ;;
    2329523488  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    2329623489  "inc/config_clp.h" ) CONFIG_HEADERS="$CONFIG_HEADERS inc/config_clp.h" ;;
     
    2351423707s,@COIN_HAS_NETLIB_TRUE@,$COIN_HAS_NETLIB_TRUE,;t t
    2351523708s,@COIN_HAS_NETLIB_FALSE@,$COIN_HAS_NETLIB_FALSE,;t t
     23709s,@coin_have_doxygen@,$coin_have_doxygen,;t t
     23710s,@coin_doxy_usedot@,$coin_doxy_usedot,;t t
     23711s,@coin_doxy_tagname@,$coin_doxy_tagname,;t t
     23712s,@coin_doxy_logname@,$coin_doxy_logname,;t t
     23713s,@coin_doxy_tagfiles@,$coin_doxy_tagfiles,;t t
     23714s,@coin_doxy_excludes@,$coin_doxy_excludes,;t t
    2351623715s,@LIBEXT@,$LIBEXT,;t t
    2351723716s,@VPATH_DISTCLEANFILES@,$VPATH_DISTCLEANFILES,;t t
  • trunk/Clp/configure.ac

    r1580 r1581  
    114114AC_COIN_VPATH_LINK(examples/input.130)
    115115
     116#############################################################################
     117#                  Check for doxygen                                        #
     118#############################################################################
     119
     120AC_COIN_DOXYGEN(CoinUtils Osi)
     121
    116122##############################################################################
    117123#                   Finishing up by writing all the output                   #
     
    133139fi
    134140
     141AC_CONFIG_FILES([doxydoc/doxygen.conf])
     142
    135143# Here put the location and name of the configuration header file
    136144AC_CONFIG_HEADER([inc/config_clp.h])
  • trunk/Clp/src/Makefile.in

    r1577 r1581  
    269269build_os = @build_os@
    270270build_vendor = @build_vendor@
     271coin_doxy_excludes = @coin_doxy_excludes@
     272coin_doxy_logname = @coin_doxy_logname@
     273coin_doxy_tagfiles = @coin_doxy_tagfiles@
     274coin_doxy_tagname = @coin_doxy_tagname@
     275coin_doxy_usedot = @coin_doxy_usedot@
     276coin_have_doxygen = @coin_have_doxygen@
    271277datadir = @datadir@
    272278exec_prefix = @exec_prefix@
  • trunk/Clp/src/OsiClp/Makefile.in

    r1577 r1581  
    237237build_os = @build_os@
    238238build_vendor = @build_vendor@
     239coin_doxy_excludes = @coin_doxy_excludes@
     240coin_doxy_logname = @coin_doxy_logname@
     241coin_doxy_tagfiles = @coin_doxy_tagfiles@
     242coin_doxy_tagname = @coin_doxy_tagname@
     243coin_doxy_usedot = @coin_doxy_usedot@
     244coin_have_doxygen = @coin_have_doxygen@
    239245datadir = @datadir@
    240246exec_prefix = @exec_prefix@
  • trunk/Clp/test/Makefile.in

    r1577 r1581  
    225225build_os = @build_os@
    226226build_vendor = @build_vendor@
     227coin_doxy_excludes = @coin_doxy_excludes@
     228coin_doxy_logname = @coin_doxy_logname@
     229coin_doxy_tagfiles = @coin_doxy_tagfiles@
     230coin_doxy_tagname = @coin_doxy_tagname@
     231coin_doxy_usedot = @coin_doxy_usedot@
     232coin_have_doxygen = @coin_have_doxygen@
    227233datadir = @datadir@
    228234exec_prefix = @exec_prefix@
Note: See TracChangeset for help on using the changeset viewer.