Skip to content

Fix --enable-docs #1415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
DD MMM YYYY - 2.9.2 - To be released
------------------------------------

* Fix --enable-docs adding missing Makefile, modifying autoconf and filenames
[Issue #1322 - @victorhora]
* Cosmetics: added comments on odd looking code to prevent future
scrutiny
[Issue #1279 - Coty Sutherland]
Expand Down
15 changes: 14 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,20 @@ AC_ARG_ENABLE(docs,
])
AM_CONDITIONAL([BUILD_DOCS], [test "$build_docs" -eq 1])
if test "$build_docs" -eq 1; then
TOPLEVEL_SUBDIRS="$TOPLEVEL_SUBDIRS docs"
TOPLEVEL_SUBDIRS="$TOPLEVEL_SUBDIRS doc"
AC_CHECK_PROGS([DOXYGEN], [doxygen])
if test -z "$DOXYGEN"; then
AC_MSG_WARN([Doxygen not found - continue without Doxygen support])
fi
if test "$build_apache2_module" -eq 1; then
AC_CONFIG_FILES([doc/doxygen-apache])
fi
if test "$build_standalone_module" -eq 1; then
AC_CONFIG_FILES([doc/doxygen-nginx])
AC_CONFIG_FILES([doc/doxygen-iis])
AC_CONFIG_FILES([doc/doxygen-standalone])
fi
AC_CONFIG_FILES([doc/Makefile])
fi


Expand Down
27 changes: 27 additions & 0 deletions doc/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
apache:
$(DOXYGEN) doxygen-apache
touch apache.stamp

iis:
$(DOXYGEN) doxygen-iis
touch iis.stamp

nginx:
$(DOXYGEN) doxygen-nginx
touch nginx.stamp

standalone:
$(DOXYGEN) doxygen-standalone
touch standalone.stamp


if BUILD_APACHE2_MODULE
all-local: apache
endif

if BUILD_STANDALONE_MODULE
all-local: iis nginx standalone
endif

clean-local:
rm -rf apache iis nginx standalone
Loading