3 files changed, 16 insertions, 19 deletions

diff --git a/bootstrap b/bootstrap
index cee9a1ff7..3fa6e67ad 100755
--- a/bootstrap
+++ b/bootstrap
@@ -90,7 +90,7 @@ check_libtool()
 sphinx ()
 {
     # Bootstrap Sphinx documentation
-    cd doc/sphinx; make man info ; cd -
+    cd doc/sphinx; make man info html >/dev/null; cd -
 }
 
 
diff --git a/configure.ac b/configure.ac
index f24ca77b2..bfaff3280 100644
--- a/configure.ac
+++ b/configure.ac
@@ -442,15 +442,10 @@ AC_ARG_ENABLE([documentation],
               [documentation=${enableval}],
               [documentation=yes])
 
-AC_CHECK_PROG([SPHINX_BINARY], [sphinx-build], [true], [false])
-AM_CONDITIONAL([HAVE_SPHINX_BINARY], [$SPHINX_BINARY])
+AC_CHECK_PROG([DOXY_BINARY], [doxygen], [true], [false])
+AM_CONDITIONAL([HAVE_DOXY_BINARY], [$DOXY_BINARY])
 
 AM_CONDITIONAL([DOCUMENTATION], [test "x$documentation" = "xyes"])
-AS_IF([test "x$documentation" = "xyes"],
-      [AS_IF([$SPHINX_BINARY],
-             [AC_DEFINE([DOCUMENTATION], [1], [Define to 1 if documentation is built])],
-             [AC_MSG_ERROR([Documentation requires sphinx])])],
-      [AC_DEFINE([DOCUMENTATION], [0], [Define to 1 if documentation is built])])
 
 AC_CHECK_PROGS([MANDOC_BINARY], [mandoc], [false])
 AM_CONDITIONAL([HAVE_MANDOC], [test "x$MANDOC_BINARY" != "xfalse"])
@@ -1458,10 +1453,10 @@ AS_IF([test "x$MANDOC_BINARY" = "xfalse"],
   [mandoc_msg="no"],
   [mandoc_msg="yes"])
 
-# sphinx
-AS_IF([test "x$documentation" = "xyes"],
-  [sphinx_msg="yes"],
-  [sphinx_msg="no"])
+# doxy
+AS_IF([$DOXY_BINARY],
+  [doxy_msg="yes"],
+  [doxy_msg="no"])
 
 # conversation
 conversation_msg="no"
@@ -1605,7 +1600,7 @@ gstreamer:                      ${gstreamer_msg}
 
 Java:                           ${java_msg}
 
-sphinx:                         ${sphinx_msg}
+doxygen:                        ${doxy_msg}
 mandoc:                         ${mandoc_msg}
 
 GNUnet configuration
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4194447fc..cfcb55453 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,14 +2,16 @@
 
 SUBDIRS = .
 
-if DOCUMENTATION
+if HAVE_DOXY_BINARY
   SUBDIRS += doxygen
-all-local:
-        cd sphinx && make html
+endif
+
+sphinx: Makefile
+        cd sphinx && make html man info
+
 install-data-hook:
         mkdir -p $(DESTDIR)$(docdir)
         cp -pr sphinx/_build/html $(DESTDIR)$(docdir)
-endif
 
 if INCLUDE_MANPAGES
 man_MANS = sphinx/_build/man/gnunet.1
@@ -20,8 +22,8 @@ info_TEXINFOS = \
   sphinx/_build/texinfo/gnunet.texi
 
 EXTRA_DIST = \
-    $(man_MANS) \
-    $(info_TEXINFOS) \
+        $(man_MANS) \
+        $(info_TEXINFOS) \
         system_specific/outdated-and-old-installation-instructions.txt \
         system_specific/FROM_SOURCE \
         sphinx/about.rst \