configury: whitespace cleanup
No code changes.
Этот коммит содержится в:
Jeff Squyres
родитель
98a6664d8a
Коммит
8511902d5c
@ -8,9 +8,9 @@ dnl Copyright (c) 2011-2012 Oak Ridge National Labs. All rights reserved.
|
||||
dnl Copyright (c) 2015 Research Organization for Information Science
|
||||
dnl and Technology (RIST). All rights reserved.
|
||||
dnl $COPYRIGHT$
|
||||
dnl
|
||||
dnl
|
||||
dnl Additional copyrights may follow
|
||||
dnl
|
||||
dnl
|
||||
dnl $HEADER$
|
||||
dnl
|
||||
|
||||
@ -214,7 +214,7 @@ EOF
|
||||
test $OMPI_BUILD_FORTRAN_F08_SUBARRAYS -eq 0],
|
||||
[OMPI_BUILD_FORTRAN_USEMPIF08_EXT=1],
|
||||
[OMPI_BUILD_FORTRAN_USEMPIF08_EXT=0])
|
||||
AM_CONDITIONAL(OMPI_BUILD_FORTRAN_USEMPIF08_EXT,
|
||||
AM_CONDITIONAL(OMPI_BUILD_FORTRAN_USEMPIF08_EXT,
|
||||
[test $OMPI_BUILD_FORTRAN_USEMPIF08_EXT -eq 1])
|
||||
|
||||
# Make an AM conditional to see whether we're building either the
|
||||
@ -262,7 +262,7 @@ EOF
|
||||
###############
|
||||
# Create the final mpif-ext.h file.
|
||||
cat >> $mpif_ext_h <<EOF
|
||||
!
|
||||
!
|
||||
EOF
|
||||
|
||||
###############
|
||||
@ -270,7 +270,7 @@ EOF
|
||||
###############
|
||||
# Create the final mpiusempi-ext.h file.
|
||||
cat >> $mpiusempi_ext_h <<EOF
|
||||
!
|
||||
!
|
||||
end module mpi_ext
|
||||
EOF
|
||||
|
||||
@ -279,7 +279,7 @@ EOF
|
||||
###############
|
||||
# Create the final mpiusempi-ext.h file.
|
||||
cat >> $mpiusempif08_ext_h <<EOF
|
||||
!
|
||||
!
|
||||
end module mpi_f08_ext
|
||||
EOF
|
||||
|
||||
@ -319,7 +319,7 @@ EOF
|
||||
rm -f $outfile
|
||||
fi
|
||||
fi
|
||||
rm -f $outfile.struct $outfile.extern
|
||||
rm -f $outfile.struct $outfile.extern
|
||||
|
||||
# We have all the results we need. Now put them in various
|
||||
# variables/defines so that others can see the results.
|
||||
@ -332,7 +332,7 @@ EOF
|
||||
OMPI_EXT_MAKE_LISTS(OMPI_MPIEXT_USEMPIF08, $OMPI_MPIEXT_USEMPIF08, use-mpi-f08, usempif08)
|
||||
|
||||
comps=`echo $OMPI_MPIEXT_C | sed -e 's/^[ \t]*//;s/[ \t]*$//;s/ /, /g'`
|
||||
AC_DEFINE_UNQUOTED([OMPI_MPIEXT_COMPONENTS], ["$comps"],
|
||||
AC_DEFINE_UNQUOTED([OMPI_MPIEXT_COMPONENTS], ["$comps"],
|
||||
[MPI Extensions included in libmpi])
|
||||
])
|
||||
|
||||
@ -677,11 +677,11 @@ AC_DEFUN([EXT_PROCESS_DEAD_COMPONENT],[
|
||||
#
|
||||
# EXT_COMPONENT_BUILD_CHECK
|
||||
#
|
||||
# checks the standard rules of component building to see if the
|
||||
# checks the standard rules of component building to see if the
|
||||
# given component should be built.
|
||||
#
|
||||
# USAGE:
|
||||
# EXT_COMPONENT_BUILD_CHECK(component,
|
||||
# EXT_COMPONENT_BUILD_CHECK(component,
|
||||
# action-if-build, action-if-not-build)
|
||||
#
|
||||
######################################################################
|
||||
@ -738,7 +738,7 @@ AC_DEFUN([EXT_COMPONENT_BUILD_CHECK],[
|
||||
|
||||
|
||||
# OMPI_EXT_MAKE_DIR_LIST(subst'ed variable, shell list)
|
||||
#
|
||||
#
|
||||
# Prefix every extension name with "mpiext/" and AC subst it.
|
||||
# -------------------------------------------------------------------------
|
||||
AC_DEFUN([OMPI_EXT_MAKE_DIR_LIST],[
|
||||
@ -749,11 +749,11 @@ AC_DEFUN([OMPI_EXT_MAKE_DIR_LIST],[
|
||||
AC_SUBST($1)
|
||||
])
|
||||
|
||||
# OMPI_EXT_MAKE_LISTS((1) subst'ed variable prefix,
|
||||
# (2) shell list,
|
||||
# (3) bindings dir name,
|
||||
# OMPI_EXT_MAKE_LISTS((1) subst'ed variable prefix,
|
||||
# (2) shell list,
|
||||
# (3) bindings dir name,
|
||||
# (4) bindings suffix)
|
||||
#
|
||||
#
|
||||
# Prefix every extension name with "mpiext/".
|
||||
# -------------------------------------------------------------------------
|
||||
AC_DEFUN([OMPI_EXT_MAKE_LISTS],[
|
||||
|
||||
@ -6,7 +6,7 @@ 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 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.
|
||||
@ -18,9 +18,9 @@ dnl Copyright (c) 2015 Research Organization for Information Science
|
||||
dnl and Technology (RIST). All rights reserved.
|
||||
dnl
|
||||
dnl $COPYRIGHT$
|
||||
dnl
|
||||
dnl
|
||||
dnl Additional copyrights may follow
|
||||
dnl
|
||||
dnl
|
||||
dnl $HEADER$
|
||||
dnl
|
||||
dnl Portions of this file derived from GASNet v1.12 (see "GASNet"
|
||||
@ -31,7 +31,7 @@ dnl IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
|
||||
dnl DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
|
||||
dnl OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
|
||||
dnl CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
dnl
|
||||
dnl
|
||||
dnl THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
|
||||
dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
dnl AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
|
||||
@ -147,19 +147,19 @@ unset opal_prefix_save
|
||||
case "$prefix" in
|
||||
/*/bin)
|
||||
prefix="`dirname $prefix`"
|
||||
echo installing to directory \"$prefix\"
|
||||
echo installing to directory \"$prefix\"
|
||||
;;
|
||||
/*)
|
||||
echo installing to directory \"$prefix\"
|
||||
/*)
|
||||
echo installing to directory \"$prefix\"
|
||||
;;
|
||||
NONE)
|
||||
echo installing to directory \"$ac_default_prefix\"
|
||||
echo installing to directory \"$ac_default_prefix\"
|
||||
;;
|
||||
@<:@a-zA-Z@:>@:*)
|
||||
echo installing to directory \"$prefix\"
|
||||
echo installing to directory \"$prefix\"
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR(prefix "$prefix" must be an absolute directory path)
|
||||
*)
|
||||
AC_MSG_ERROR(prefix "$prefix" must be an absolute directory path)
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
@ -6,16 +6,16 @@ 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 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 (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
|
||||
dnl Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
|
||||
dnl $COPYRIGHT$
|
||||
dnl
|
||||
dnl
|
||||
dnl Additional copyrights may follow
|
||||
dnl
|
||||
dnl
|
||||
dnl $HEADER$
|
||||
dnl
|
||||
|
||||
@ -55,7 +55,7 @@ AC_DEFUN([OPAL_MCA],[
|
||||
#
|
||||
AC_ARG_ENABLE([mca-no-build],
|
||||
[AC_HELP_STRING([--enable-mca-no-build=LIST],
|
||||
[Comma-separated list of <type>-<component> pairs
|
||||
[Comma-separated list of <type>-<component> pairs
|
||||
that will not be built. Example: "--enable-mca-no-build=maffinity,btl-portals" will disable building all maffinity components and the "portals" btl components.])])
|
||||
AC_ARG_ENABLE(mca-dso,
|
||||
AC_HELP_STRING([--enable-mca-dso=LIST],
|
||||
@ -221,7 +221,7 @@ AC_DEFUN([OPAL_MCA],[
|
||||
# now configure all the projects, frameworks, and components. Most
|
||||
# of the hard stuff is in here
|
||||
MCA_PROJECT_SUBDIRS=
|
||||
m4_foreach(mca_project, [mca_project_list],
|
||||
m4_foreach(mca_project, [mca_project_list],
|
||||
[# BWB: Until projects have seperate configure scripts
|
||||
# and can skip running all of ORTE, just avoid recursing
|
||||
# into orte sub directory if orte disabled
|
||||
@ -270,7 +270,7 @@ AC_DEFUN([MCA_CONFIGURE_PROJECT],[
|
||||
# MCA_project_FRAMEWORK_LIBS - list of libraries (or variables pointing
|
||||
# to more libraries) that must be included
|
||||
# in the project's main library
|
||||
m4_ifdef([mca_$1_framework_list], [],
|
||||
m4_ifdef([mca_$1_framework_list], [],
|
||||
[m4_fatal([Could not find mca_$1_framework_list - please rerun autogen.pl])])
|
||||
|
||||
MCA_$1_FRAMEWORKS=
|
||||
@ -281,7 +281,7 @@ AC_DEFUN([MCA_CONFIGURE_PROJECT],[
|
||||
MCA_$1_FRAMEWORK_LIBS=
|
||||
|
||||
m4_foreach(mca_framework, [mca_$1_framework_list],
|
||||
[m4_ifval(mca_framework,
|
||||
[m4_ifval(mca_framework,
|
||||
[dnl common has to go up front
|
||||
m4_if(mca_framework, [common],
|
||||
[MCA_$1_FRAMEWORKS="mca_framework $MCA_$1_FRAMEWORKS"
|
||||
@ -318,9 +318,9 @@ AC_DEFUN([MCA_CONFIGURE_PROJECT],[
|
||||
AC_DEFUN([MCA_ORDER_COMPONENT_LIST], [
|
||||
m4_foreach(mca_component, [mca_$1_$2_m4_config_component_list],
|
||||
[m4_ifval(mca_component,
|
||||
[m4_ifdef([MCA_]$1[_]$2[_]mca_component[_PRIORITY], [],
|
||||
[m4_ifdef([MCA_]$1[_]$2[_]mca_component[_PRIORITY], [],
|
||||
[m4_fatal([MCA_$1_$2_]mca_component[_PRIORITY not found, but required.])])])])
|
||||
m4_define([component_list],
|
||||
m4_define([component_list],
|
||||
[esyscmd([config/opal_mca_priority_sort.pl] m4_foreach([mca_component], [mca_$1_$2_m4_config_component_list],
|
||||
[m4_ifval(mca_component, [mca_component ]OPAL_EVAL_ARG([MCA_]$1[_]$2[_]mca_component[_PRIORITY ]))]))])
|
||||
])
|
||||
@ -352,9 +352,9 @@ AC_DEFUN([MCA_CHECK_IGNORED_PRIORITY], [
|
||||
AC_DEFUN([MCA_CONFIGURE_FRAMEWORK],[
|
||||
opal_show_subsubtitle "Configuring MCA framework $2"
|
||||
|
||||
m4_ifdef([mca_$1_$2_no_config_component_list], [],
|
||||
m4_ifdef([mca_$1_$2_no_config_component_list], [],
|
||||
[m4_fatal([Could not find mca_$1_$2_no_config_component_list - please rerun autogen.pl])])
|
||||
m4_ifdef([mca_$1_$2_m4_config_component_list], [],
|
||||
m4_ifdef([mca_$1_$2_m4_config_component_list], [],
|
||||
[m4_fatal([Could not find mca_$1_$2_m4_config_component_list - please rerun autogen.pl])])
|
||||
|
||||
# setup for framework
|
||||
@ -400,7 +400,7 @@ AC_DEFUN([MCA_CONFIGURE_FRAMEWORK],[
|
||||
# run the configure logic for the no-config components
|
||||
m4_foreach(mca_component, [mca_$1_$2_no_config_component_list],
|
||||
[m4_ifval(mca_component,
|
||||
[MCA_CONFIGURE_NO_CONFIG_COMPONENT($1, $2, mca_component,
|
||||
[MCA_CONFIGURE_NO_CONFIG_COMPONENT($1, $2, mca_component,
|
||||
[all_components],
|
||||
[static_components],
|
||||
[dso_components],
|
||||
@ -421,7 +421,7 @@ AC_DEFUN([MCA_CONFIGURE_FRAMEWORK],[
|
||||
[m4_ifval(mca_component,
|
||||
[m4_if(OPAL_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY],
|
||||
[AS_IF([test $best_mca_component_priority -gt MCA_$1_$2_]mca_component[_PRIORITY], [components_looking_for_succeed=0])])
|
||||
MCA_CONFIGURE_M4_CONFIG_COMPONENT($1, $2, mca_component,
|
||||
MCA_CONFIGURE_M4_CONFIG_COMPONENT($1, $2, mca_component,
|
||||
[all_components],
|
||||
[static_components],
|
||||
[dso_components],
|
||||
@ -497,7 +497,7 @@ EOF
|
||||
rm -f $outfile
|
||||
fi
|
||||
fi
|
||||
rm -f $outfile.struct $outfile.extern
|
||||
rm -f $outfile.struct $outfile.extern
|
||||
|
||||
unset all_components static_components dso_components outfile outfile_real
|
||||
])
|
||||
@ -516,7 +516,7 @@ EOF
|
||||
#
|
||||
# USAGE:
|
||||
# MCA_CONFIGURE_PROJECT(project_name, framework_name, component_name
|
||||
# all_components_variable,
|
||||
# all_components_variable,
|
||||
# static_components_variable,
|
||||
# dso_components_variable,
|
||||
# static_ltlibs_variable,
|
||||
@ -527,7 +527,7 @@ AC_DEFUN([MCA_CONFIGURE_NO_CONFIG_COMPONENT],[
|
||||
opal_show_subsubsubtitle "MCA component $2:$3 (no configuration)"
|
||||
|
||||
opal_show_verbose "OPAL_MCA_NO_CONFIG_COMPONENT: before, should_build=$8"
|
||||
MCA_COMPONENT_BUILD_CHECK($1, $2, $3,
|
||||
MCA_COMPONENT_BUILD_CHECK($1, $2, $3,
|
||||
[should_build=$8], [should_build=0])
|
||||
MCA_COMPONENT_COMPILE_MODE($1, $2, $3, compile_mode)
|
||||
opal_show_verbose "OPAL_MCA_NO_CONFIG_COMPONENT: after, should_build=$should_build"
|
||||
@ -561,12 +561,12 @@ AC_DEFUN([MCA_CONFIGURE_NO_CONFIG_COMPONENT],[
|
||||
#
|
||||
# USAGE:
|
||||
# MCA_CONFIGURE_PROJECT(project_name, framework_name, component_name
|
||||
# all_components_variable,
|
||||
# all_components_variable,
|
||||
# static_components_variable,
|
||||
# dso_components_variable,
|
||||
# static_ltlibs_variable,
|
||||
# allowed_to_succeed,
|
||||
# [eval if should build],
|
||||
# [eval if should build],
|
||||
# [eval if should not build])
|
||||
#
|
||||
######################################################################
|
||||
@ -585,7 +585,7 @@ AC_DEFUN([MCA_CONFIGURE_M4_CONFIG_COMPONENT],[
|
||||
|
||||
# try to configure the component
|
||||
m4_ifdef([MCA_$1_$2_$3_CONFIG],
|
||||
[MCA_$1_$2_$3_CONFIG([should_build=$should_build],
|
||||
[MCA_$1_$2_$3_CONFIG([should_build=$should_build],
|
||||
[should_build=0])],
|
||||
[m4_fatal([MCA_$1_$2_$3_CONFIG macro not found])])
|
||||
opal_show_verbose "OPAL_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build"
|
||||
@ -600,7 +600,7 @@ AC_DEFUN([MCA_CONFIGURE_M4_CONFIG_COMPONENT],[
|
||||
[ MCA_$1_$2_$3_POST_CONFIG($should_build)])
|
||||
|
||||
# set the AM_CONDITIONAL on how we should build
|
||||
AS_IF([test "$compile_mode" = "dso"],
|
||||
AS_IF([test "$compile_mode" = "dso"],
|
||||
[BUILD_$1_$2_$3_DSO=1],
|
||||
[BUILD_$1_$2_$3_DSO=0])
|
||||
AM_CONDITIONAL(MCA_BUILD_$1_$2_$3_DSO, test "$BUILD_$1_$2_$3_DSO" = "1")
|
||||
@ -619,9 +619,9 @@ AC_DEFUN([MCA_CONFIGURE_M4_CONFIG_COMPONENT],[
|
||||
# scripts and should be configured according to the usual rules...
|
||||
#
|
||||
# USAGE:
|
||||
# MCA_CONFIGURE_ALL_CONFIG_COMPONENTS(project_name,
|
||||
# MCA_CONFIGURE_ALL_CONFIG_COMPONENTS(project_name,
|
||||
# framework_name,
|
||||
# all_components_variable,
|
||||
# all_components_variable,
|
||||
# static_components_variable,
|
||||
# dso_components_variable,
|
||||
# static_ltlibs_variable)
|
||||
@ -634,7 +634,7 @@ AC_DEFUN([MCA_CONFIGURE_ALL_CONFIG_COMPONENTS],[
|
||||
opal_show_subsubsubtitle "MCA component $2:$component (need to configure)"
|
||||
|
||||
opal_show_verbose "OPAL_MCA_ALL_CONFIG_COMPONENTS: before, should_build=$8"
|
||||
MCA_COMPONENT_BUILD_CHECK($1, $2, $component,
|
||||
MCA_COMPONENT_BUILD_CHECK($1, $2, $component,
|
||||
[should_build=1], [should_build=0])
|
||||
MCA_COMPONENT_COMPILE_MODE($1, $2, $component, compile_mode)
|
||||
opal_show_verbose "OPAL_MCA_ALL_CONFIG_COMPONENTS: after, should_build=$should_build"
|
||||
@ -735,7 +735,7 @@ AC_DEFUN([MCA_PROCESS_COMPONENT],[
|
||||
AC_REQUIRE([AC_PROG_GREP])
|
||||
|
||||
# See if it dropped an output file for us to pick up some
|
||||
# shell variables in.
|
||||
# shell variables in.
|
||||
infile="$srcdir/$1/mca/$2/$3/post_configure.sh"
|
||||
|
||||
# Add this subdir to the mast list of all MCA component subdirs
|
||||
@ -762,7 +762,7 @@ AC_DEFUN([MCA_PROCESS_COMPONENT],[
|
||||
# Output pretty results
|
||||
AC_MSG_CHECKING([if MCA component $2:$3 can compile])
|
||||
AC_MSG_RESULT([yes])
|
||||
|
||||
|
||||
dnl BWB: FIX ME: We still use the post_configure.sh for frameworks that use the direct call infrastructure.
|
||||
dnl All other uses we can ignore here, because config_components will have read it in and set all the
|
||||
dnl proper environment variables. At some point, we should handle the direct call stuff the same way we
|
||||
@ -783,7 +783,7 @@ AC_MSG_ERROR([*** $2 component $3 was supposed to be direct-called, but
|
||||
fi
|
||||
fi
|
||||
else
|
||||
# were we supposed to have found something in the
|
||||
# were we supposed to have found something in the
|
||||
# post_configure.sh, but the file didn't exist?
|
||||
if test "$DIRECT_$2" = "$3" ; then
|
||||
AC_MSG_ERROR([*** $2 component $3 was supposed to be direct-called, but
|
||||
@ -801,7 +801,7 @@ AC_MSG_ERROR([*** $2 component $3 was supposed to be direct-called, but
|
||||
# because it will link against these (without a dependency from
|
||||
# libmpi.so to these flags)
|
||||
if test "$8" = "static"; then
|
||||
AS_LITERAL_IF([$3],
|
||||
AS_LITERAL_IF([$3],
|
||||
[m4_foreach(flags, [LDFLAGS, LIBS],
|
||||
[AS_IF([test "$$2_$3_WRAPPER_EXTRA_]flags[" = ""],
|
||||
[OPAL_FLAGS_APPEND_UNIQ([mca_wrapper_extra_]m4_tolower(flags), [$$2_$3_]flags)],
|
||||
@ -817,10 +817,10 @@ AC_MSG_ERROR([*** $2 component $3 was supposed to be direct-called, but
|
||||
# component can never be used in a STOP_AT_FIRST framework, we
|
||||
# don't have to implement the else clause in the literal check...
|
||||
AS_LITERAL_IF([$3],
|
||||
[AS_IF([test "$$2_$3_WRAPPER_EXTRA_CPPFLAGS" != ""],
|
||||
[AS_IF([test "$$2_$3_WRAPPER_EXTRA_CPPFLAGS" != ""],
|
||||
[m4_if(OPAL_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST], [stop_at_first=1], [stop_at_first=0])
|
||||
AS_IF([test "$8" = "static" && test "$stop_at_first" = "1"],
|
||||
[AS_IF([test "$with_devel_headers" = "yes"],
|
||||
[AS_IF([test "$with_devel_headers" = "yes"],
|
||||
[OPAL_FLAGS_APPEND_UNIQ([mca_wrapper_extra_cppflags], [$$2_$3_WRAPPER_EXTRA_CPPFLAGS])])],
|
||||
[AC_MSG_WARN([ignoring $2_$3_WRAPPER_EXTRA_CPPFLAGS ($$2_$3_WRAPPER_EXTRA_CPPFLAGS): component conditions not met])])])])
|
||||
])
|
||||
@ -856,11 +856,11 @@ AC_DEFUN([MCA_PROCESS_DEAD_COMPONENT],[
|
||||
])
|
||||
|
||||
|
||||
# MCA_COMPONENT_BUILD_CHECK(project_name (1), framework_name(2),
|
||||
# MCA_COMPONENT_BUILD_CHECK(project_name (1), framework_name(2),
|
||||
# component_name (3), action-if-build (4)
|
||||
# action-if-not-build (5)
|
||||
# -----------------------------------------------------------------
|
||||
# checks the standard rules of component building to see if the
|
||||
# checks the standard rules of component building to see if the
|
||||
# given component should be built.
|
||||
#
|
||||
# Note: component_name may not be determined until runtime....
|
||||
|
||||
12
configure.ac
12
configure.ac
@ -6,11 +6,11 @@
|
||||
# Copyright (c) 2004-2014 The University of Tennessee and The University
|
||||
# of Tennessee Research Foundation. All rights
|
||||
# reserved.
|
||||
# Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
|
||||
# Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2006-2008 Sun Microsystems, Inc. All rights reserved.
|
||||
# Copyright (c) 2006-2011 Los Alamos National Security, LLC. All rights
|
||||
# reserved.
|
||||
@ -23,9 +23,9 @@
|
||||
# Copyright (c) 2014-2015 Research Organization for Information Science
|
||||
# and Technology (RIST). All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
#
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
@ -110,7 +110,7 @@ m4_ifdef([project_ompi],
|
||||
[ompi/include/ompi/version.h])])
|
||||
|
||||
m4_ifdef([project_orte],
|
||||
[OPAL_SAVE_VERSION([ORTE], [Open MPI Run-Time Environment],
|
||||
[OPAL_SAVE_VERSION([ORTE], [Open MPI Run-Time Environment],
|
||||
[$srcdir/VERSION],
|
||||
[orte/include/orte/version.h])])
|
||||
|
||||
@ -1369,7 +1369,7 @@ fi
|
||||
# the following in opal_mca.m4 (when we're already m4 looping over the
|
||||
# project list):
|
||||
#
|
||||
# m4_foreach(mca_project, [mca_project_list],
|
||||
# m4_foreach(mca_project, [mca_project_list],
|
||||
# [m4_ifdef(mca_project[_CONFIG_LOCAL], mca_project[_CONFIG_LOCAL])])
|
||||
#
|
||||
# Meaning that aclocal doesn't see that, for example,
|
||||
|
||||
14
contrib/dist/make_dist_tarball
поставляемый
14
contrib/dist/make_dist_tarball
поставляемый
@ -6,15 +6,15 @@
|
||||
# Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
# of Tennessee Research Foundation. All rights
|
||||
# reserved.
|
||||
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
#
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
@ -132,7 +132,7 @@ check_gnu_version() {
|
||||
target_release=`echo $target_release | sed 's/[A-Za-z]//g'`
|
||||
|
||||
result=same
|
||||
if test "$ver" != "$target"; then
|
||||
if test "$ver" != "$target"; then
|
||||
if test "$ver_major" -lt "$target_major"; then
|
||||
result=low
|
||||
elif test "$ver_major" = "$target_major" -a "$ver_minor" -lt "$target_minor"; then
|
||||
@ -172,7 +172,7 @@ Either change this script to match the found version, or install
|
||||
the correct version of the tools.
|
||||
----------------------------------------------------------------------
|
||||
EOF
|
||||
if test "$gnu_version_ignore" = "0"; then
|
||||
if test "$gnu_version_ignore" = "0"; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -195,7 +195,7 @@ Either change this script to match the found version, or install
|
||||
the correct version of the tools.
|
||||
----------------------------------------------------------------------
|
||||
EOF
|
||||
if test "$gnu_version_ignore" = "0"; then
|
||||
if test "$gnu_version_ignore" = "0"; then
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
@ -237,7 +237,7 @@ Either change this script to match the found version, or install
|
||||
the correct version of the tools.
|
||||
----------------------------------------------------------------------
|
||||
EOF
|
||||
if test "$gnu_version_ignore" = "0"; then
|
||||
if test "$gnu_version_ignore" = "0"; then
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
# of Tennessee Research Foundation. All rights
|
||||
# reserved.
|
||||
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
@ -14,9 +14,9 @@
|
||||
# Copyright (c) 2015 Research Organization for Information Science
|
||||
# and Technology (RIST). All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
#
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
@ -34,14 +34,14 @@ AC_DEFUN([MCA_ompi_io_romio_CONFIG],[
|
||||
AC_ARG_ENABLE([io-romio],
|
||||
[AC_HELP_STRING([--disable-io-romio],
|
||||
[Disable the ROMIO MPI-IO component])])
|
||||
AC_ARG_WITH([io-romio-flags],
|
||||
AC_ARG_WITH([io-romio-flags],
|
||||
[AC_HELP_STRING([--with-io-romio-flags=FLAGS],
|
||||
[Pass FLAGS to the ROMIO distribution configuration script])])
|
||||
AC_DEFINE_UNQUOTED([MCA_io_romio_USER_CONFIGURE_FLAGS], ["$with_io_romio_flags"], [Set of user-defined configure flags given to ROMIOs configure script via --with-io-romio-flags])
|
||||
AC_MSG_CHECKING([if want ROMIO component])
|
||||
AS_IF([test "$enable_io_romio" = "no"],
|
||||
[AC_MSG_RESULT([no])
|
||||
$2],
|
||||
$2],
|
||||
[AC_MSG_RESULT([yes])
|
||||
AC_MSG_CHECKING([if MPI profiling is enabled])
|
||||
AS_IF([test "$enable_mpi_profile" = "no"],
|
||||
@ -66,11 +66,11 @@ AC_DEFUN([MCA_ompi_io_romio_CONFIG],[
|
||||
[AS_IF([test "$enable_shared" = "yes"],
|
||||
[io_romio_shared=enable],
|
||||
[io_romio_shared=disable])
|
||||
AS_IF([test "$enable_static" = "yes"],
|
||||
AS_IF([test "$enable_static" = "yes"],
|
||||
[io_romio_static=enable],
|
||||
[io_romio_static=disable])])
|
||||
AS_IF([test -n "$prefix" -a "$prefix" != "NONE"],
|
||||
[io_romio_prefix_arg="--prefix=$prefix"],
|
||||
AS_IF([test -n "$prefix" -a "$prefix" != "NONE"],
|
||||
[io_romio_prefix_arg="--prefix=$prefix"],
|
||||
[io_romio_prefix_arg=])
|
||||
|
||||
AS_IF([test "$cross_compiling" = "yes"],
|
||||
@ -83,7 +83,7 @@ AC_DEFUN([MCA_ompi_io_romio_CONFIG],[
|
||||
io_romio_flags="$io_romio_flags FROM_OMPI=yes CC="'"'"$CC"'"'" CFLAGS="'"'"$CFLAGS -D__EXTENSIONS__"'"'" CPPFLAGS="'"'"$CPPFLAGS"'"'" FFLAGS="'"'"$FFLAGS"'"'" LDFLAGS="'"'"$LDFLAGS"'"'" --$io_romio_shared-shared --$io_romio_static-static $io_romio_flags $io_romio_prefix_arg --disable-aio --disable-weak-symbols --enable-strict"
|
||||
|
||||
opal_show_subtitle "Configuring ROMIO distribution"
|
||||
OPAL_CONFIG_SUBDIR([ompi/mca/io/romio/romio],
|
||||
OPAL_CONFIG_SUBDIR([ompi/mca/io/romio/romio],
|
||||
[$io_romio_flags],
|
||||
[io_romio_happy=1], [io_romio_happy=0])
|
||||
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user