From 0d9375ac641470f93a33014a0b75cd4c33a8202f Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Fri, 28 Nov 2014 14:45:11 +0100 Subject: [PATCH] configure.ac: add --disable-documentation option to speed up dev builds --- configure.ac | 15 ++++++++++++++- mediastreamer2 | 2 +- oRTP | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 368ff2947..2eabeb943 100644 --- a/configure.ac +++ b/configure.ac @@ -1015,7 +1015,20 @@ dnl ################################################## dnl # Check for doxygen dnl ################################################## -AC_CHECK_PROG(DOXYGEN,doxygen,doxygen,false) +AC_ARG_ENABLE(doxygen, + [AS_HELP_STRING([--disable-documentation], [Disable documentation generation using doxygen (default=no)])], + [case "${enableval}" in + yes) documentation_enabled=yes;; + no) documentation_enabled=no;; + *) AC_MSG_ERROR("Bad value for --disable-documentation");; + esac], + [documentation_enabled=yes] +) +if test "$documentation_enabled" = "yes" ; then + AC_CHECK_PROG(DOXYGEN,doxygen,doxygen,false) +else + DOXYGEN=false +fi AM_CONDITIONAL(HAVE_DOXYGEN, test "$DOXYGEN" != "false") diff --git a/mediastreamer2 b/mediastreamer2 index 0fd78ef6f..fc8d5b93f 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 0fd78ef6f133efab04b55e5a8e51aa68f3e015fa +Subproject commit fc8d5b93ff618bbeca005d6c631e9eb0b10f1cd2 diff --git a/oRTP b/oRTP index 29fb54f17..f21b5418b 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 29fb54f179f195d67a16e812bc26eed86089ff23 +Subproject commit f21b5418b62c8acbe7a8a3be4ddf569af537d35e