1
1

Consolidate all the opal/orte/ompi .m4 files back to the top-level

config/ directory.  We split them apart a while ago in the hopes that
it would simplify things, but it didn't really (e.g., because there
were still some ompi/opal .m4 files in the top-level config/
directory, resulting in developer confusion where any given m4 macro
was defined).

So this commit consolidates them back into the top-level directory for
simplicity.  

There's still (at least) two changes that would be nice to make:

 1. Split any generated .m4 file (e.g., autogen-generated .m4 files)
    into a separate directory somewhere so that a top-level -Iconfig/
    will only get our explicitly defined macros, not the autogen stuff
    (e.g., with libevent2019 needing to get the visibility macro, but
    NOT all the autogen-generated inclusion of component configure.m4
    files).
 1. Change configure to be of the form:
{{{
# ...a small amount of preamble/setup...
OPAL_SETUP
m4_ifdef([project_orte], [ORTE_SETUP])
m4_ifdef([project_ompi], [OMPI_SETUP])
# ...a small amount of finishing stuff...
}}}

I doubt we'll ever get anything as clean as that, but that would be
the goal to shoot for.

This commit was SVN r27704.
This commit is contained in:
Jeff Squyres 2012-12-19 00:00:36 +00:00
parent cdddbadc52
commit b29b852281
79 changed files with 3 additions and 5 deletions

View File

@ -1220,9 +1220,6 @@ safe_system("autom4te --language=m4sh opal_get_version.m4sh -o opal_get_version.
verbose "==> Running autoreconf\n";
chdir("..");
my $cmd = "autoreconf -ivf --warnings=all,no-obsolete,no-override -I config";
foreach my $project (@{$projects}) {
$cmd .= " -I $project->{dir}/config";
}
safe_system($cmd);
#---------------------------------------------------------------------------

View File

@ -10,7 +10,7 @@
# $HEADER$
#
EXTRA_DIST = .windows
EXTRA_DIST = .windows opal_check_visibility.m4
AM_CPPFLAGS = -I$(srcdir)/libevent -I$(srcdir)/libevent/include -I$(builddir)/libevent/include -I$(srcdir)/libevent/compat

View File

@ -3,7 +3,7 @@
# Open MPI change: add -I for our m4 directory so that we can
# find OPAL_CHECK_VISIBILITY
###################################
OMPI="-I ../../../../../opal/config"
OMPI="-I .."
if [ -x "`which autoreconf 2>/dev/null`" ] ; then
###################################
# Open MPI change: add -I for our m4 directory

View File

@ -0,0 +1 @@
../../../../config/opal_check_visibility.m4