2012-05-11 01:05:36 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
###################################
|
|
|
|
|
# Open MPI change: add -I for our m4 directory so that we can
|
|
|
|
|
# find OPAL_CHECK_VISIBILITY
|
|
|
|
|
###################################
|
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.
2012-12-19 00:00:36 +00:00
|
|
|
OMPI="-I .."
|
2012-05-11 01:05:36 +00:00
|
|
|
if [ -x "`which autoreconf 2>/dev/null`" ] ; then
|
|
|
|
|
###################################
|
|
|
|
|
# Open MPI change: add -I for our m4 directory
|
|
|
|
|
###################################
|
|
|
|
|
exec autoreconf -ivf $OMPI
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
LIBTOOLIZE=libtoolize
|
|
|
|
|
SYSNAME=`uname`
|
|
|
|
|
if [ "x$SYSNAME" = "xDarwin" ] ; then
|
|
|
|
|
LIBTOOLIZE=glibtoolize
|
|
|
|
|
fi
|
|
|
|
|
###################################
|
|
|
|
|
# Open MPI change: add -I for our m4 directory
|
|
|
|
|
###################################
|
|
|
|
|
aclocal -I m4 $OMPI && \
|
|
|
|
|
autoheader && \
|
|
|
|
|
$LIBTOOLIZE && \
|
|
|
|
|
autoconf $OMPI && \
|
|
|
|
|
automake --add-missing --force-missing --copy
|