From patchwork Wed Mar 23 18:37:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 64259 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp202743lbc; Wed, 23 Mar 2016 11:50:33 -0700 (PDT) X-Received: by 10.107.150.70 with SMTP id y67mr5387331iod.65.1458759033225; Wed, 23 Mar 2016 11:50:33 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id lp2si5454657igb.57.2016.03.23.11.50.32; Wed, 23 Mar 2016 11:50:33 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id A9637617E2; Wed, 23 Mar 2016 18:50:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 341C76182D; Wed, 23 Mar 2016 18:46:04 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 78A116182C; Wed, 23 Mar 2016 18:45:57 +0000 (UTC) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com [209.85.217.173]) by lists.linaro.org (Postfix) with ESMTPS id 0BEC4617E2 for ; Wed, 23 Mar 2016 18:44:53 +0000 (UTC) Received: by mail-lb0-f173.google.com with SMTP id oe12so16247075lbc.0 for ; Wed, 23 Mar 2016 11:44:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0gSXx51HMEhEzxs5+2t8aA2cYbIhYnSHhmIu8faZFmo=; b=EkSlikaCgCvTDmoAGkq7Y1nd9bme0OgX8Ibx2LGl/AUbZj+71Q+gEcXZG+dmYZ/FGf +a+CTOKGMaJ+9Z/b/s3cH0RzJtxs9XvJbgP2gddnf/VTbVEbp8dmZiE7OyJJjfX5Bu/Y sliovBw/kpqBBzVjwhyiNLS9dGUSkezuiAYTdIF9JFOFaN28ZjtfTAtbYQNmKlUQ73H/ BwnzwbAa1fBIzJe33IBQ47Yw14M67WDf0xwj7jigb6y+9W8ifHHgy0+B4eF9vs/oUsV9 yF+6YWnnlUKugTw35vebQj8S2CADHwUKkwsJf4wiMZ38QNd7AeDbdmRJ+0DsX+irkjXv TxfA== X-Gm-Message-State: AD7BkJIr0Y/9AasA24RSLa3s2oc8XwQ6X15sSi+qjJxRA0HxRy7XeYECTE+Cb9S3RH4QHzrrTpM= X-Received: by 10.112.46.136 with SMTP id v8mr1532198lbm.38.1458758691871; Wed, 23 Mar 2016 11:44:51 -0700 (PDT) Received: from localhost (c-c82171d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.113.33.200]) by smtp.gmail.com with ESMTPSA id p134sm592728lfb.48.2016.03.23.11.44.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Mar 2016 11:44:51 -0700 (PDT) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Wed, 23 Mar 2016 19:37:31 +0100 Message-Id: <1458758254-4703-8-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458758254-4703-1-git-send-email-anders.roxell@linaro.org> References: <1458758254-4703-1-git-send-email-anders.roxell@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 07/10] configure: move docs to its own m4 file X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Anders Roxell --- configure.ac | 49 ++++--------------------------------------------- doc/m4/configure.m4 | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 45 deletions(-) diff --git a/configure.ac b/configure.ac index 55c7b59..3c4747f 100644 --- a/configure.ac +++ b/configure.ac @@ -84,6 +84,7 @@ AC_SUBST([platform_with_platform_test], ["platform/${with_platform}/test"]) ########################################################################## # Include m4 files ########################################################################## +m4_include([./doc/m4/configure.m4]) m4_include([./helper/m4/configure.m4]) m4_include([./test/m4/configure.m4]) @@ -142,6 +143,9 @@ AM_CONDITIONAL([test_installdir], [test "$testdir" != ""]) AM_CONDITIONAL([test_perf], [test x$test_perf = xyes ]) AM_CONDITIONAL([test_cpp], [test x$test_cpp = xyes ]) AM_CONDITIONAL([test_helper], [test x$test_helper = xyes ]) +AM_CONDITIONAL([HAVE_DOXYGEN], [test "x${DOXYGEN}" = "xdoxygen"]) +AM_CONDITIONAL([user_guide], [test "x${user_guides}" = "xyes" ]) +AM_CONDITIONAL([HAVE_MSCGEN], [test "x${MSCGEN}" = "xmscgen"]) ########################################################################## # Setup doxygen documentation @@ -197,50 +201,6 @@ AC_ARG_ENABLE([debug], ODP_CFLAGS="$ODP_CFLAGS -DODP_DEBUG=$ODP_DEBUG" ########################################################################## -# Check for doxygen availability -########################################################################## -AC_CHECK_PROGS([DOXYGEN], [doxygen]) -if test -z "$DOXYGEN"; - then AC_MSG_WARN([Doxygen not found - continuing without Doxygen support]) -fi - -AM_CONDITIONAL([HAVE_DOXYGEN], [test "x${DOXYGEN}" = "xdoxygen"]) - -########################################################################## -# Check for asciidoc availability -########################################################################## -AC_CHECK_PROGS([ASCIIDOC], [asciidoc]) -if test -z "$ASCIIDOC"; - then AC_MSG_WARN([asciidoc not found - continuing without asciidoc support]) -fi - -########################################################################## -# Enable/disable user guide generation -########################################################################## -user_guides=no -AC_ARG_ENABLE([user-guides], - [ --enable-user-guides generate supplemental users guides], - [if test "x$enableval" = "xyes"; then - if test -z "$ASCIIDOC"; - then AC_MSG_ERROR([cannot generate user guides without asciidoc]) - else - user_guides=yes - fi - fi]) - -AM_CONDITIONAL([user_guide], [test "x${user_guides}" = "xyes" ]) - -########################################################################## -# Check for mscgen availability -########################################################################## - AC_CHECK_PROGS([MSCGEN], [mscgen]) - if test -z "$MSCGEN"; - then AC_MSG_WARN([mscgen not found - continuing without sequence message support]) - fi - -AM_CONDITIONAL([HAVE_MSCGEN], [test "x${MSCGEN}" = "xmscgen"]) - -########################################################################## # Save and set temporary compilation flags ########################################################################## OLD_LDFLAGS=$LDFLAGS @@ -294,7 +254,6 @@ AC_CONFIG_FILES([Makefile scripts/Makefile ]) -m4_include([./doc/m4/configure.m4]) m4_include([./example/m4/configure.m4]) AC_SEARCH_LIBS([timer_create],[rt posix4]) diff --git a/doc/m4/configure.m4 b/doc/m4/configure.m4 index 14302f5..b30c70b 100644 --- a/doc/m4/configure.m4 +++ b/doc/m4/configure.m4 @@ -1,3 +1,41 @@ +########################################################################## +# Check for doxygen availability +########################################################################## +AC_CHECK_PROGS([DOXYGEN], [doxygen]) +if test -z "$DOXYGEN"; + then AC_MSG_WARN([Doxygen not found - continuing without Doxygen support]) +fi + +########################################################################## +# Check for asciidoc availability +########################################################################## +AC_CHECK_PROGS([ASCIIDOC], [asciidoc]) +if test -z "$ASCIIDOC"; + then AC_MSG_WARN([asciidoc not found - continuing without asciidoc support]) +fi + +########################################################################## +# Enable/disable user guide generation +########################################################################## +user_guides=no +AC_ARG_ENABLE([user-guides], + [ --enable-user-guides generate supplemental users guides], + [if test "x$enableval" = "xyes"; then + if test -z "$ASCIIDOC"; + then AC_MSG_ERROR([cannot generate user guides without asciidoc]) + else + user_guides=yes + fi + fi]) + +########################################################################## +# Check for mscgen availability +########################################################################## + AC_CHECK_PROGS([MSCGEN], [mscgen]) + if test -z "$MSCGEN"; + then AC_MSG_WARN([mscgen not found - continuing without sequence message support]) + fi + AC_CONFIG_FILES([doc/application-api-guide/Makefile doc/implementers-guide/Makefile doc/Makefile