[m-rev.] for review: Fix three hwloc related build system problems.

[Julien Fischer]

On Thu, 3 Nov 2011, Paul Bone wrote:

> For post-commit review by Julien, this is a resubmission of my previous attempt
> to fix hwloc related changes.
>
> ---
>
> Fix three hwloc related build system problems, these were raised in code
> reviews.
>
> The configure script now supports the --without-hwloc option to disable the use
> of hwloc, even if it is installed.
>
> configure.in:
>    Allow the use of libhwloc to be disabled with the --without-hwloc option.
>
> Distribute the autoconf macros for pkg-config with Mercury.
>
> This allows mercury to be compiled from CVS on hosts that don't have these
> macros in their autoconf installation.
>
> acinclude.m4:
> m4/mercury.m4:
>    Moved acinclude.m4 to m4/mercury.m4.  This file contains mercury-specific
>    macros.
>
> m4/pkg.m4:
>    Copied pkg.m4 from the autoconf installation on taura.  This file contains
>    pkg-config macros.
>
> INSTALL_CVS:
> Mmakefile:
> tools/test_mercury:
>    When calling aclocal pass the -I m4 option.
>
> tools/bootcheck:
>    Create a link to the m4 directory when setting up stage directories.
>
> Fix static linking with mmc --make and hwloc.
>
> compiler/compile_target_code.m:
>    Conform to changes in scripts/ml.in (where static linking and hwloc is
>    already handled correctly).
>
> compiler/options.m:
>    Create new options so that Mercury.config can tell mmc what options are
>    needed for linking to hwloc.
>
> scripts/Mercury.config:
>    Pass hwloc linking options to the compiler.

That looks fine - thanks for fixing that.

Julien.
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------