Default doxygen-doc to not enabled.

Also, don't default dot support to on and emit something to say if
the dogygen-doc target is enabled.
This commit is contained in:
Kevin Lyda 2014-02-17 09:24:51 +00:00
parent b9f94db3cc
commit 369f7e58a1
3 changed files with 10 additions and 2 deletions

View File

@ -166,6 +166,10 @@ install-data-hook:
cd $(DESTDIR)$(includedir)/google/protobuf-c && rm -vf protobuf-c.h 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 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) MOSTLYCLEANFILES = $(DX_CLEANFILES)
endif # DOXYGEN_TARGET

View File

@ -27,11 +27,14 @@ if test -n "$PKG_CONFIG"; then
else else
AC_MSG_ERROR([pkg-config is required!]) AC_MSG_ERROR([pkg-config is required!])
fi fi
DX_DOXYGEN_FEATURE(OFF)
DX_PDF_FEATURE(OFF) DX_PDF_FEATURE(OFF)
DX_PS_FEATURE(OFF) DX_PS_FEATURE(OFF)
DX_MAN_FEATURE(ON) DX_MAN_FEATURE(ON)
DX_DOT_FEATURE(ON)
DX_INIT_DOXYGEN([protobuf-c], [Doxyfile], [doxygen-doc]) 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], AC_ARG_ENABLE([protoc],
AS_HELP_STRING([--disable-protoc], [Disable building protoc_c (also disables tests)])) AS_HELP_STRING([--disable-protoc], [Disable building protoc_c (also disables tests)]))
@ -68,6 +71,7 @@ AC_MSG_RESULT([
libdir: ${libdir} libdir: ${libdir}
includedir: ${includedir} includedir: ${includedir}
pkgconfigdir: ${pkgconfigdir} pkgconfigdir: ${pkgconfigdir}
doxygen-doc: ${has_doxygen}
bigendian: ${ac_cv_c_bigendian} bigendian: ${ac_cv_c_bigendian}
protobuf version: ${PROTOBUF_VERSION} protobuf version: ${PROTOBUF_VERSION}