diff options
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rw-r--r-- | configure.ac | 19 | ||||
| -rw-r--r-- | m4/ax_prog_doxygen.m4 | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 10 |
5 files changed, 20 insertions, 15 deletions
diff --git a/.gitattributes b/.gitattributes index 2ad5b6e..f72b49c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -365,6 +365,7 @@ m4/ax_check_rqrd_class.m4 -text m4/ax_java_check_class.m4 -text m4/ax_java_options.m4 -text m4/ax_jni_include_dir.m4 -text +m4/ax_prog_doxygen.m4 -text m4/ax_prog_jar.m4 -text m4/ax_prog_java.m4 -text m4/ax_prog_java_cc.m4 -text @@ -50,6 +50,7 @@ ./m4/ax_java_check_class.m4 ./m4/ax_java_options.m4 ./m4/ax_jni_include_dir.m4 +./m4/ax_prog_doxygen.m4 ./m4/ax_prog_jar.m4 ./m4/ax_prog_java_cc.m4 ./m4/ax_prog_java_works.m4 diff --git a/configure.ac b/configure.ac index 13c23b7..96defc3 100644 --- a/configure.ac +++ b/configure.ac @@ -1024,7 +1024,10 @@ AC_ARG_ENABLE([tests], [HDF5_TESTS=$enableval]) if test "X$HDF5_TESTS" = "Xno"; then + AC_MSG_RESULT([yes]) echo "Building HDF5 tests is disabled" +else + AC_MSG_RESULT([no]) fi ## ---------------------------------------------------------------------- @@ -1045,7 +1048,10 @@ AC_ARG_ENABLE([tools], [HDF5_TOOLS=$enableval]) if test "X$HDF5_TOOLS" = "Xno"; then + AC_MSG_RESULT([yes]) echo "Building HDF5 tools is disabled" +else + AC_MSG_RESULT([no]) fi ## ---------------------------------------------------------------------- @@ -1066,15 +1072,16 @@ AC_ARG_ENABLE([doxygen], [HDF5_DOXYGEN=$enableval]) if test "X$HDF5_DOXYGEN" = "Xyes"; then + AC_MSG_RESULT([yes]) DX_DOXYGEN_FEATURE(ON) DX_DOT_FEATURE(OFF) DX_HTML_FEATURE(ON) DX_CHM_FEATURE(OFF) DX_CHI_FEATURE(OFF) - DX_MAN_FEATURE(OFF) + DX_MAN_FEATURE(ON) DX_RTF_FEATURE(OFF) DX_XML_FEATURE(OFF) - DX_PDF_FEATURE(ON) + DX_PDF_FEATURE(OFF) DX_PS_FEATURE(OFF) AC_SUBST([DOXYGEN_PACKAGE]) @@ -1085,7 +1092,7 @@ if test "X$HDF5_DOXYGEN" = "Xyes"; then AC_SUBST([DOXYGEN_INPUT_DIRECTORY]) AC_SUBST([DOXYGEN_OPTIMIZE_OUTPUT_FOR_C]) AC_SUBST([DOXYGEN_MACRO_EXPANSION]) - AC_SUBST([DOXYGEN_OUTPUT_DIR]) + AC_SUBST([DOXYGEN_OUTPUT_DIRECTORY]) DOXYGEN_PACKAGE=${PACKAGE_NAME} DOXYGEN_VERSION_STRING=${PACKAGE_VERSION} @@ -1095,13 +1102,12 @@ if test "X$HDF5_DOXYGEN" = "Xyes"; then DOXYGEN_INPUT_DIRECTORY='$(SRCDIR) $(SRCDIR)/doxygen/dox' DOXYGEN_OPTIMIZE_OUTPUT_FOR_C=YES DOXYGEN_MACRO_EXPANSION=YES - DOXYGEN_OUTPUT_DIR=hdf5lib_docs + DOXYGEN_OUTPUT_DIRECTORY=hdf5lib_docs DX_INIT_DOXYGEN([HDF5], [doxygen/Doxyfile], [hdf5lib_docs]) - #AC_SUBST([DOXYGEN_OUTPUT_DIR], [hdf5lib_docs]) - else + AC_MSG_RESULT([no]) echo "Doxygen support is disabled" fi @@ -3819,6 +3825,7 @@ AM_CONDITIONAL([BUILD_HDF5_HL_CONDITIONAL], [test "X$HDF5_HL" = "Xyes"]) AM_CONDITIONAL([BUILD_TESTS_CONDITIONAL], [test "X$HDF5_TESTS" = "Xyes"]) AM_CONDITIONAL([BUILD_TESTS_PARALLEL_CONDITIONAL], [test -n "$TESTPARALLEL"]) AM_CONDITIONAL([BUILD_TOOLS_CONDITIONAL], [test "X$HDF5_TOOLS" = "Xyes"]) +AM_CONDITIONAL([BUILD_DOXYGEN_CONDITIONAL], [test "X$HDF5_DOXYGEN" = "Xyes"]) ## ---------------------------------------------------------------------- ## Build the Makefiles. diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4 index 3af4956..1ad3854 100644 --- a/m4/ax_prog_doxygen.m4 +++ b/m4/ax_prog_doxygen.m4 @@ -546,9 +546,9 @@ doxygen-doc: doxygen-run \$(DX_PS_GOAL) \$(DX_PDF_GOAL) ]m4_foreach([DX_i], [DX_loop], [[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag: \$(DX_CONFIG]DX_i[) \$(pkginclude_HEADERS) - \$(A""M_V_at)rm -rf \$(DX_DOCDIR]DX_i[) + rm -rf \$(DX_DOCDIR]DX_i[) \$(DX_V_DXGEN)\$(DX_ENV) DOCDIR=\$(DX_DOCDIR]DX_i[) \$(DX_DOXYGEN) \$(DX_CONFIG]DX_i[) - \$(A""M_V_at)echo Timestamp >\$][@ + echo Timestamp >\$][@ ]])dnl [DX_CLEANFILES = \\] diff --git a/src/Makefile.am b/src/Makefile.am index 40e5233..f61b2a6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -204,13 +204,9 @@ $(top_srcdir)/src/H5overflow.h: $(top_srcdir)/src/H5overflow.txt perl $(top_srcdir)/bin/make_overflow $? # doxygen support -doxygen: - rm -fr $(top_builddir)/hdf5lib_docs - env $(DX_ENV) \ - PROJECT_NAME="HDF5" \ - SRCDIR=$(top_srcdir) \ - OUTPUTDIR=$(top_builddir)/hdf5lib_docs \ - $(DX_DOXYGEN) $(top_builddir)/$(DX_CONFIG) +if BUILD_DOXYGEN_CONDITIONAL +doxygen: doxygen-doc +endif # Add TRACE macros to library source files. This is done via the trace script # in the hdf5/bin directory. If the file contains HDF5 API macros, a "clean" |