From patchwork Tue Mar 29 18:23: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: 64618 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2180976lbc; Tue, 29 Mar 2016 11:35:52 -0700 (PDT) X-Received: by 10.140.87.98 with SMTP id q89mr4808760qgd.8.1459276552528; Tue, 29 Mar 2016 11:35:52 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 84si18930qhu.86.2016.03.29.11.35.52; Tue, 29 Mar 2016 11:35:52 -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; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 1295D61879; Tue, 29 Mar 2016 18:35:52 +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_H2, 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 43BDC610AE; Tue, 29 Mar 2016 18:32:17 +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 ABB9C61879; Tue, 29 Mar 2016 18:31:17 +0000 (UTC) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com [209.85.217.176]) by lists.linaro.org (Postfix) with ESMTPS id 913FA6188F for ; Tue, 29 Mar 2016 18:30:59 +0000 (UTC) Received: by mail-lb0-f176.google.com with SMTP id bc4so16658307lbc.2 for ; Tue, 29 Mar 2016 11:30:59 -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=iSEvD3CSyXRB7LVyKgJmimLohnjjA4NEgEPKd7g4pO8=; b=O/STDTQMp7P76KzJ4dJFJ2f6RnnzW1ZWLzlhjnnZM0rwGq+C/m/0tQx9mZ1+8nlv9a a1C/KgU+iR7nXyJee5WtfmZEBlwDfnFrcNaWYKL0sq2nvUqHIK8595Y+2mSwToimNMrn KdxN9nK+WWEf448tzvh2PAzhMzeuAYYJw6ZiDSPfN3a1aZBX2qb6jJ7+dMbeMGMDSrFb cxFNOnrXfDiFBO7l1+rrkHeyvwVaQhhzyrPH7YnjKW7x369y45i3FNcCo8PKaxoB7PQW HpqY5CPmym0GcCeZxhH365FYAEcPd/kVqGzEvgLEHotUYgKdBDneUX244sM2yGx7a2ce 6kIQ== X-Gm-Message-State: AD7BkJJSnydkbMKXUwB+3Hth4DARIdK2wtfhB5QwUeksslgzJ8RaMgUZDLXnxGdHsWb/rNyWRsA= X-Received: by 10.112.181.196 with SMTP id dy4mr1846100lbc.42.1459276258467; Tue, 29 Mar 2016 11:30:58 -0700 (PDT) Received: from localhost (c-c82171d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.113.33.200]) by smtp.gmail.com with ESMTPSA id i186sm5649072lfb.30.2016.03.29.11.30.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Mar 2016 11:30:57 -0700 (PDT) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Tue, 29 Mar 2016 20:23:31 +0200 Message-Id: <1459275814-19876-8-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1459275814-19876-1-git-send-email-anders.roxell@linaro.org> References: <1459275814-19876-1-git-send-email-anders.roxell@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv2 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 8ba0538..883f52f 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