Refactoring on the doxygen generation

CHANGES

@@ -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]
  * Change from using rand() to thread-safe ap_random_pick.
    [Issue #1289 - Robert Bost]
  * Cosmetics: added comments on odd looking code to prevent future

configure.ac

@@ -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
 
 

doc/Makefile.am

@@ -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