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.
55 строки
1.6 KiB
Bash
55 строки
1.6 KiB
Bash
dnl -*- shell-script -*-
|
|
dnl
|
|
dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
|
|
dnl
|
|
dnl $COPYRIGHT$
|
|
dnl
|
|
dnl Additional copyrights may follow
|
|
dnl
|
|
dnl $HEADER$
|
|
dnl
|
|
|
|
# OPAL_CHECK_OS_FLAVOR_SPECIFIC()
|
|
# ----------------------------------------------------
|
|
# Helper macro from OPAL-CHECK-OS-FLAVORS(), below.
|
|
# $1 = macro to look for
|
|
# $2 = suffix of env variable to set with results
|
|
AC_DEFUN([OPAL_CHECK_OS_FLAVOR_SPECIFIC],
|
|
[
|
|
AC_MSG_CHECKING([$1])
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
|
|
[[#ifndef $1
|
|
error: this isnt $1
|
|
#endif
|
|
]])],
|
|
[opal_found_$2=yes],
|
|
[opal_found_$2=no])
|
|
AC_MSG_RESULT([$opal_found_$2])
|
|
])dnl
|
|
|
|
# OPAL_CHECK_OS_FLAVORS()
|
|
# ----------------------------------------------------
|
|
# Try to figure out the various OS flavors out there.
|
|
#
|
|
AC_DEFUN([OPAL_CHECK_OS_FLAVORS],
|
|
[
|
|
OPAL_CHECK_OS_FLAVOR_SPECIFIC([__NetBSD__], [netbsd])
|
|
OPAL_CHECK_OS_FLAVOR_SPECIFIC([__FreeBSD__], [freebsd])
|
|
OPAL_CHECK_OS_FLAVOR_SPECIFIC([__OpenBSD__], [openbsd])
|
|
OPAL_CHECK_OS_FLAVOR_SPECIFIC([__DragonFly__], [dragonfly])
|
|
OPAL_CHECK_OS_FLAVOR_SPECIFIC([__386BSD__], [386bsd])
|
|
OPAL_CHECK_OS_FLAVOR_SPECIFIC([__bsdi__], [bsdi])
|
|
OPAL_CHECK_OS_FLAVOR_SPECIFIC([__APPLE__], [apple])
|
|
OPAL_CHECK_OS_FLAVOR_SPECIFIC([__linux__], [linux])
|
|
OPAL_CHECK_OS_FLAVOR_SPECIFIC([__sun__], [sun])
|
|
|
|
# check for sockaddr_in (a good sign we have TCP)
|
|
AC_CHECK_TYPES([struct sockaddr_in],
|
|
[opal_found_sockaddr=yes],
|
|
[opal_found_sockaddr=no],
|
|
[AC_INCLUDES_DEFAULT
|
|
#ifdef HAVE_NETINET_IN_H
|
|
#include <netinet/in.h>
|
|
#endif])
|
|
])dnl
|