b29b852281
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.
171 строка
4.3 KiB
Bash
171 строка
4.3 KiB
Bash
dnl -*- shell-script -*-
|
|
dnl
|
|
dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
|
dnl University Research and Technology
|
|
dnl Corporation. All rights reserved.
|
|
dnl Copyright (c) 2004-2005 The University of Tennessee and The University
|
|
dnl of Tennessee Research Foundation. All rights
|
|
dnl reserved.
|
|
dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|
dnl University of Stuttgart. All rights reserved.
|
|
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
|
dnl All rights reserved.
|
|
dnl $COPYRIGHT$
|
|
dnl
|
|
dnl Additional copyrights may follow
|
|
dnl
|
|
dnl $HEADER$
|
|
dnl
|
|
|
|
AC_DEFUN([OMPI_CXX_FIND_TEMPLATE_REPOSITORY],[
|
|
AC_REQUIRE([AC_PROG_GREP])
|
|
|
|
#
|
|
# Arguments: None
|
|
#
|
|
# Dependencies: None
|
|
#
|
|
# See if the compiler makes template repository directories
|
|
# Warning: this is a really screwy example! -JMS
|
|
#
|
|
# Sets OMPI_CXX_TEMPLATE_REPOSITORY to the template repository, or blank.
|
|
# Must call AC_SUBST manually
|
|
#
|
|
AC_CACHE_CHECK([for C++ template_repository_directory],
|
|
[ompi_cv_cxx_template_repository],
|
|
[_OMPI_CXX_FIND_TEMPLATE_REPOSITORY])
|
|
|
|
if test "$ompi_cv_cxx_template_repository" = "not used" ; then
|
|
OMPI_CXX_TEMPLATE_REPOSITORY=
|
|
elif test "$ompi_cv_cxx_template_repository" = "templates not supported" ; then
|
|
OMPI_CXX_TEMPLATE_REPOSITORY=
|
|
else
|
|
OMPI_CXX_TEMPLATE_REPOSITORY="$ompi_cv_cxx_template_repository"
|
|
fi
|
|
])
|
|
|
|
|
|
AC_DEFUN([_OMPI_CXX_FIND_TEMPLATE_REPOSITORY],[
|
|
# Find the repository
|
|
mkdir conf_tmp_$$
|
|
cd conf_tmp_$$
|
|
cat > conftest.h <<EOF
|
|
template <class T>
|
|
class foo {
|
|
public:
|
|
foo(T yow) : data(yow) { yow.member(3); };
|
|
void member(int i);
|
|
private:
|
|
T data;
|
|
};
|
|
|
|
class bar {
|
|
public:
|
|
bar(int i) { data = i; };
|
|
void member(int j) { data = data * j; };
|
|
|
|
private:
|
|
int data;
|
|
};
|
|
EOF
|
|
|
|
cat > conftest2.C <<EOF
|
|
#include "conftest.h"
|
|
|
|
void
|
|
some_other_function(void)
|
|
{
|
|
foo<bar> var1(6);
|
|
foo< foo<bar> > var2(var1);
|
|
}
|
|
EOF
|
|
|
|
cat > conftest1.C <<EOF
|
|
#include "conftest.h"
|
|
|
|
void some_other_function(void);
|
|
|
|
template <class T>
|
|
void
|
|
foo<T>::member(int i)
|
|
{
|
|
i += 2;
|
|
}
|
|
|
|
int
|
|
main()
|
|
{
|
|
foo<bar> var1(6);
|
|
foo< foo<bar> > var2(var1);
|
|
|
|
some_other_function();
|
|
return 0;
|
|
}
|
|
EOF
|
|
|
|
ompi_template_failed=
|
|
echo configure:__oline__: $CXX $CXXFLAGS -c conftest1.C >&5
|
|
$CXX $CXXFLAGS -c conftest1.C >&5 2>&5
|
|
if test ! -f conftest1.o ; then
|
|
ompi_cv_cxx_template_repository="templates not supported"
|
|
echo configure:__oline__: here is the program that failed: >&5
|
|
cat conftest1.C >&5
|
|
echo configure:__oline__: here is conftest.h: >&5
|
|
cat conftest.h >&5
|
|
ompi_template_failed=1
|
|
else
|
|
echo configure:__oline__: $CXX $CXXFLAGS -c conftest2.C >&5
|
|
$CXX $CXXFLAGS -c conftest2.C >&5 2>&5
|
|
if test ! -f conftest2.o ; then
|
|
ompi_cv_cxx_template_repository=
|
|
echo configure:__oline__: here is the program that failed: >&5
|
|
cat conftest2.C >&5
|
|
echo configure:__oline__: here is conftest.h: >&5
|
|
cat conftest.h >&5
|
|
else
|
|
rm -rf conftest*
|
|
|
|
for ompi_file in `ls`
|
|
do
|
|
if test "$ompi_file" != "." -a "$ompi_file" != ".."; then
|
|
# Is it a directory?
|
|
if test -d "$ompi_file"; then
|
|
ompi_template_dir="$ompi_file $ompi_template_dir"
|
|
|
|
# Or is it a file?
|
|
else
|
|
name="`echo $ompi_file | cut -d. -f1`"
|
|
|
|
temp_mask=
|
|
if test "$name" = "main" -o "$name" = "other"; then
|
|
temp_mask="`echo $ompi_file | cut -d. -f2`"
|
|
if test "$ompi_template_filemask" = ""; then
|
|
ompi_template_filemask="$temp_mask";
|
|
elif test "`echo $ompi_template_filemask | $GREP $temp_mask`" = ""; then
|
|
ompi_template_filemask="$ompi_template_filemask $temp_mask"
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
done
|
|
if test "$ompi_template_filemask" != ""; then
|
|
temp_mask=
|
|
for mask in $ompi_template_filemask
|
|
do
|
|
temp_mask="*.$mask $temp_mask"
|
|
done
|
|
ompi_template_filemask=$temp_mask
|
|
fi
|
|
fi
|
|
fi
|
|
ompi_cv_cxx_template_repository="$ompi_template_dir $ompi_template_filemask"
|
|
|
|
if test "`echo $ompi_cv_cxx_template_repository`" = ""; then
|
|
ompi_cv_cxx_template_repository="not used"
|
|
fi
|
|
cd ..
|
|
rm -rf conf_tmp_$$
|
|
|
|
# Clean up
|
|
unset ompi_file ompi_template_failed ompi_template_dir])
|