From 2dca7f1def8980a1780b6ba3e4a1e3159c41feb8 Mon Sep 17 00:00:00 2001 From: Andre Maroneze <andre.oliveiramaroneze@cea.fr> Date: Wed, 15 Feb 2017 09:04:35 +0100 Subject: [PATCH] [configure] reorganize sections --- configure.in | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/configure.in b/configure.in index 0837facc538..da93b28d2b5 100644 --- a/configure.in +++ b/configure.in @@ -214,26 +214,6 @@ if test "$OCAMLYACC" = no ; then AC_MSG_ERROR(Cannot find ocamlyacc.) fi -################################################# -# Check for other (optional) tools/libraries # -################################################# - -new_section "configure optional tools and libraries" - -AC_CHECK_PROG(OCAMLDOC,ocamldoc,ocamldoc,no) -if test "$OCAMLDOC" = no ; then - AC_MSG_RESULT(ocamldoc discarded not present) -else - OCAMLDOC="$OCAMLFIND ocamldoc" -fi - -AC_CHECK_PROG(OCAMLMKTOP,ocamlmktop,ocamlmktop,no) -if test "$OCAMLMKTOP" = no ; then - AC_MSG_RESULT(Cannot find ocamlmktop: toplevels cannot be built.) -else - OCAMLMKTOP="$OCAMLFIND ocamlmktop" -fi - # ocamlcp AC_CHECK_PROG(OCAMLCP,ocamlcp,ocamlcp,no) if test "$OCAMLCP" = no ; then @@ -242,11 +222,8 @@ else OCAMLCP="$OCAMLFIND ocamlcp" fi -AC_CHECK_PROG(OTAGS,otags,otags,) - -############## -# ocamlgraph # -############## +# ocamlgraph +############ AC_MSG_CHECKING(for ocamlgraph) @@ -281,6 +258,28 @@ else AC_MSG_RESULT(found) fi +################################################# +# Check for other (optional) tools/libraries # +################################################# + +new_section "configure optional tools and libraries" + +AC_CHECK_PROG(OCAMLDOC,ocamldoc,ocamldoc,no) +if test "$OCAMLDOC" = no ; then + AC_MSG_RESULT(ocamldoc discarded not present) +else + OCAMLDOC="$OCAMLFIND ocamldoc" +fi + +AC_CHECK_PROG(OCAMLMKTOP,ocamlmktop,ocamlmktop,no) +if test "$OCAMLMKTOP" = no ; then + AC_MSG_RESULT(Cannot find ocamlmktop: toplevels cannot be built.) +else + OCAMLMKTOP="$OCAMLFIND ocamlmktop" +fi + +AC_CHECK_PROG(OTAGS,otags,otags,) + # apron ######## -- GitLab