diff --git a/Makefile.am b/Makefile.am
index 24abb46..96c81ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -166,6 +166,10 @@ install-data-hook:
 	cd $(DESTDIR)$(includedir)/google/protobuf-c && rm -vf protobuf-c.h
 	cd $(DESTDIR)$(includedir)/google/protobuf-c && $(LN_S) ../../protobuf-c/protobuf-c.h protobuf-c.h
 
-include m4/aminclude_doxygen.am
+if DOXYGEN_TARGET
+
+include aminclude_doxygen.am
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
+
+endif # DOXYGEN_TARGET
diff --git a/m4/aminclude_doxygen.am b/aminclude_doxygen.am
similarity index 100%
rename from m4/aminclude_doxygen.am
rename to aminclude_doxygen.am
diff --git a/configure.ac b/configure.ac
index 869eb71..1631624 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,11 +27,14 @@ if test -n "$PKG_CONFIG"; then
 else
     AC_MSG_ERROR([pkg-config is required!])
 fi
+
+DX_DOXYGEN_FEATURE(OFF)
 DX_PDF_FEATURE(OFF)
 DX_PS_FEATURE(OFF)
 DX_MAN_FEATURE(ON)
-DX_DOT_FEATURE(ON)
 DX_INIT_DOXYGEN([protobuf-c], [Doxyfile], [doxygen-doc])
+AS_IF([test "x$DX_DOXYGEN" != "x"], [has_doxygen=yes], [has_doxygen=no])
+AM_CONDITIONAL([DOXYGEN_TARGET], [test "x$has_doxygen" = "xyes"])
 
 AC_ARG_ENABLE([protoc],
   AS_HELP_STRING([--disable-protoc], [Disable building protoc_c (also disables tests)]))
@@ -68,6 +71,7 @@ AC_MSG_RESULT([
         libdir:                 ${libdir}
         includedir:             ${includedir}
         pkgconfigdir:           ${pkgconfigdir}
+        doxygen-doc:            ${has_doxygen}
 
         bigendian:              ${ac_cv_c_bigendian}
         protobuf version:       ${PROTOBUF_VERSION}