[MOAB-dev] commit/MOAB: janehu: Changed doxygen output directory to be just html instead of user/html;

[commits-noreply at bitbucket.org]

1 new commit in MOAB:

https://bitbucket.org/fathomteam/moab/commits/d2cba5f4a5c6/
Changeset:   d2cba5f4a5c6
Branch:      master
User:        janehu
Date:        2013-07-26 21:39:55
Summary:     Changed doxygen output directory to be just html instead of user/html;
Changed the configure logic such that --enable-doxygen is split into --enable-docs and --with-doxygen=DIR: When enable-docs flag is on, configure will check for doxygen installation either from $PATH or from --with-doxygen augument.

Affected #:  2 files

diff --git a/configure.ac b/configure.ac
index 8a308cb..24f425b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -451,13 +451,18 @@ AC_SUBST(PNETCDF_LIBS)
 #                             Documentation
 #################################################################################
 AC_ARG_ENABLE([docs],
-[AC_HELP_STRING([--enable-docs],[Specify directory where Doxygen program is installed])
-AC_HELP_STRING([--disable-docs],[Do not generate API documentation (default)])],
-                        [ENABLE_DOCS="$enableval"],[ENABLE_DOCS=no] )
-if test "x$ENABLE_DOCS" != "xno"; then
-  AC_PATH_PROG( [DOXYGEN], [doxygen], [no] )
+[AC_HELP_STRING([--enable-docs],[indicate to check for doxygen installation])],
+                        [ENABLE_DOCS=yes],[ENABLE_DOCS=no] )
+AC_ARG_WITH([doxygen],
+[AC_HELP_STRING([--with-doxygen=DIR], [Specify directory where Doxygen program is installed. By default, it is /usr/bin])],
+[WITH_DOXYGEN="$withval"], [WITH_DOXYGEN=no])
+
+if test "x$WITH_DOXYGEN" != "xno"; then
+  AC_PATH_PROGS( [DOXYGEN], [doxygen], [no],[$WITH_DOXYGEN] )
+else
+  AC_PATH_PROGS( [DOXYGEN], [doxygen], [no],[$PATH])
 fi
-if test "x$ENABLE_DOCS" != "xno"; then
+if test "x$ENABLE_DOCS" = "xyes"; then
   if test "x$DOXYGEN" = "xno"; then
     AC_MSG_ERROR("Doxygen executable not found.")
   fi

diff --git a/doc/user.dox.in b/doc/user.dox.in
index b9f7e0c..adb22ef 100644
--- a/doc/user.dox.in
+++ b/doc/user.dox.in
@@ -30,7 +30,7 @@ PROJECT_NUMBER         =
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = user
+OUTPUT_DIRECTORY       = 
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all 
 # documentation generated by doxygen is written. Doxygen will use this

Repository URL: https://bitbucket.org/fathomteam/moab/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.