use --with-docs instead of --without-docs and fail if doxygen is missing
This commit is contained in:
+6
-6
@@ -47,13 +47,13 @@ AC_ARG_WITH(contrib, AS_HELP_STRING([--without-contrib], [disable inclusion of c
|
|||||||
if test "x$with_contrib" != "xno"; then
|
if test "x$with_contrib" != "xno"; then
|
||||||
AC_DEFINE_UNQUOTED(HAVE_CONTRIB, [1], [Defined if contributed sources are enabled.])
|
AC_DEFINE_UNQUOTED(HAVE_CONTRIB, [1], [Defined if contributed sources are enabled.])
|
||||||
fi
|
fi
|
||||||
AC_ARG_WITH(docs, AS_HELP_STRING([--without-docs], [disable generation of docs]), [], [with_docs=yes])
|
AC_ARG_WITH(docs, AS_HELP_STRING([--with-docs], [generate documentation]), [
|
||||||
if test "x$with_docs" != "xno"; then
|
|
||||||
AC_CHECK_PROGS([HAVE_DOXYGEN], [doxygen], [])
|
AC_CHECK_PROGS([HAVE_DOXYGEN], [doxygen], [])
|
||||||
if test -z "${HAVE_DOXYGEN}"; then
|
if test -z "$HAVE_DOXYGEN"; then
|
||||||
AC_MSG_WARN([Doxygen not found - continuing without Doxygen support.])
|
AC_MSG_ERROR([Could not find doxygen.])
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
], [])
|
||||||
|
|
||||||
AC_ARG_WITH(mqtt, AS_HELP_STRING([--without-mqtt], [disable support for MQTT handling]), [], [with_mqtt=yes])
|
AC_ARG_WITH(mqtt, AS_HELP_STRING([--without-mqtt], [disable support for MQTT handling]), [], [with_mqtt=yes])
|
||||||
if test "x$with_mqtt" != "xno"; then
|
if test "x$with_mqtt" != "xno"; then
|
||||||
AC_CHECK_LIB([mosquitto], [mosquitto_lib_init],
|
AC_CHECK_LIB([mosquitto], [mosquitto_lib_init],
|
||||||
@@ -162,7 +162,7 @@ else
|
|||||||
AC_DEFINE(REVISION, "[m4_esyscmd_s([git describe --always 2>/dev/null || (date +p%Y%m%d)])]", [The revision of the package.])
|
AC_DEFINE(REVISION, "[m4_esyscmd_s([git describe --always 2>/dev/null || (date +p%Y%m%d)])]", [The revision of the package.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "${HAVE_DOXYGEN}"])
|
AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$HAVE_DOXYGEN"])
|
||||||
AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([docs/Doxyfile])])
|
AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([docs/Doxyfile])])
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign subdir-objects])
|
AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign subdir-objects])
|
||||||
|
|||||||
Reference in New Issue
Block a user