diff --git a/config/ompi_setup_wrappers.m4 b/config/ompi_setup_wrappers.m4 deleted file mode 100644 index 0733eac4f8..0000000000 --- a/config/ompi_setup_wrappers.m4 +++ /dev/null @@ -1,308 +0,0 @@ -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 (c) 2006 Sun Microsystems, Inc. All rights reserved. -dnl Use is subject to license terms. -dnl Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. -dnl $COPYRIGHT$ -dnl -dnl Additional copyrights may follow -dnl -dnl $HEADER$ -dnl - - -# OMPI_SETUP_WRAPPER_INIT() -# ------------------------- -# Setup wrapper compiler configuration information - should be called -# before the bulk of the tests that can affect the wrapper compilers -# -# Note that we keep the user-specified flags seperately because we -# don't want them to go through OMPI_UNIQ because that has resulted in -# unexpected behavior for the user in the past. -AC_DEFUN([OMPI_SETUP_WRAPPER_INIT],[ - WRAPPER_EXTRA_CPPFLAGS= - WRAPPER_EXTRA_CFLAGS= - # Only worry about C++ and Fortran if we're building the OMPI project - m4_ifdef([project_ompi], - [WRAPPER_EXTRA_CXXFLAGS= - WRAPPER_EXTRA_FFLAGS= - WRAPPER_EXTRA_FCFLAGS=]) - WRAPPER_EXTRA_LDFLAGS= - WRAPPER_EXTRA_LIBS= - - USER_WRAPPER_EXTRA_CFLAGS= - # Only worry about C++ and Fortran if we're building the OMPI project - m4_ifdef([project_ompi], - [USER_WRAPPER_EXTRA_CXXFLAGS= - USER_WRAPPER_EXTRA_FFLAGS= - USER_WRAPPER_EXTRA_FCFLAGS=]) - USER_WRAPPER_EXTRA_LDFLAGS= - USER_WRAPPER_EXTRA_LIBS= - - AC_ARG_WITH([wrapper-cflags], - [AC_HELP_STRING([--with-wrapper-cflags], - [Extra flags to add to CFLAGS when using mpicc])]) - if test "$with_wrapper_cflags" = "yes" -o "$with_wrapper_cflags" = "no"; then - AC_MSG_ERROR([--with-wrapper-cflags must have an argument. Aborting]) - elif test ! -z "$with_wrapper_cflags" ; then - USER_WRAPPER_EXTRA_CFLAGS="$with_wrapper_cflags" - fi - - # Only worry about C++ and Fortran if we're building the OMPI project - m4_ifdef([project_ompi], - [AC_ARG_WITH([wrapper-cxxflags], - [AC_HELP_STRING([--with-wrapper-cxxflags], - [Extra flags to add to CXXFLAGS when using mpiCC/mpic++])]) - if test "$with_wrapper_cxxflags" = "yes" -o "$with_wrapper_cxxflags" = "no"; then - AC_MSG_ERROR([--with-wrapper-cxxflags must have an argument. Aborting]) - elif test ! -z "$with_wrapper_cxxflags" ; then - USER_WRAPPER_EXTRA_CXXFLAGS="$with_wrapper_cxxflags" - fi - - AC_ARG_WITH([wrapper-fflags], - [AC_HELP_STRING([--with-wrapper-fflags], - [Extra flags to add to FFLAGS when using mpif77])]) - if test "$with_wrapper_fflags" = "yes" -o "$with_wrapper_fflags" = "no"; then - AC_MSG_ERROR([--with-wrapper-fflags must have an argument. Aborting]) - elif test ! -z "$with_wrapper_fflags" ; then - USER_WRAPPER_EXTRA_FFLAGS="$with_wrapper_fflags" - fi - - AC_ARG_WITH([wrapper-fcflags], - [AC_HELP_STRING([--with-wrapper-fcflags], - [Extra flags to add to FCFLAGS when using mpif90])]) - if test "$with_wrapper_fcflags" = "yes" -o "$with_wrapper_fcflags" = "no"; then - AC_MSG_ERROR([--with-wrapper-fcflags must have an argument. Aborting]) - elif test ! -z "$with_wrapper_fcflags" ; then - USER_WRAPPER_EXTRA_FCFLAGS="$with_wrapper_fcflags" - fi - ]) - - AC_ARG_WITH([wrapper-ldflags], - [AC_HELP_STRING([--with-wrapper-ldflags], - [Extra flags to add to LDFLAGS when using wrapper compilers])]) - if test "$with_wrapper_ldflags" = "yes" -o "$with_wrapper_ldflags" = "no"; then - AC_MSG_ERROR([--with-wrapper-ldflags must have an argument. Aborting]) - elif test ! -z "$with_wrapper_ldflags" ; then - USER_WRAPPER_EXTRA_LDFLAGS="$with_wrapper_ldflags" - fi - - AC_ARG_WITH([wrapper-libs], - [AC_HELP_STRING([--with-wrapper-libs], - [Extra flags to add to LIBS when using wrapper compilers])]) - if test "$with_wrapper_libs" = "yes" -o "$with_wrapper_libs" = "no"; then - AC_MSG_ERROR([--with-wrapper-libs must have an argument. Aborting]) - elif test ! -z "$with_wrapper_libs" ; then - USER_WRAPPER_EXTRA_LIBS="$with_wrapper_libs" - fi -]) - - -AC_DEFUN([OMPI_SETUP_WRAPPER_FINAL],[ - OMPI_UNIQ([WRAPPER_EXTRA_CPPFLAGS]) - OMPI_UNIQ([WRAPPER_EXTRA_CFLAGS]) - # Only worry about C++ and Fortran if we're building the OMPI project - m4_ifdef([project_ompi], - [OMPI_UNIQ([WRAPPER_EXTRA_CXXFLAGS]) - OMPI_UNIQ([WRAPPER_EXTRA_FFLAGS]) - OMPI_UNIQ([WRAPPER_EXTRA_FCFLAGS])]) - OMPI_UNIQ([WRAPPER_EXTRA_LDFLAGS]) - - # - # OPAL - # - OMPI_UNIQ([opal_WRAPPER_EXTRA_LDFLAGS]) - OMPI_UNIQ([opal_WRAPPER_EXTRA_LIBS]) - - AC_MSG_CHECKING([for OPAL CPPFLAGS]) - OPAL_WRAPPER_EXTRA_CPPFLAGS="$WRAPPER_EXTRA_CPPFLAGS $USER_WRAPPER_EXTRA_CPPFLAGS" - AC_SUBST([OPAL_WRAPPER_EXTRA_CPPFLAGS]) - AC_MSG_RESULT([$OPAL_WRAPPER_EXTRA_CPPFLAGS]) - - AC_MSG_CHECKING([for OPAL CFLAGS]) - OPAL_WRAPPER_EXTRA_CFLAGS="$WRAPPER_EXTRA_CFLAGS $USER_WRAPPER_EXTRA_CFLAGS" - AC_SUBST([OPAL_WRAPPER_EXTRA_CFLAGS]) - AC_MSG_RESULT([$OPAL_WRAPPER_EXTRA_CFLAGS]) - - AC_MSG_CHECKING([for OPAL LDFLAGS]) - OPAL_WRAPPER_EXTRA_LDFLAGS="$opal_WRAPPER_EXTRA_LDFLAGS $WRAPPER_EXTRA_LDFLAGS $USER_WRAPPER_EXTRA_LDFLAGS" - AC_SUBST([OPAL_WRAPPER_EXTRA_LDFLAGS]) - AC_MSG_RESULT([$OPAL_WRAPPER_EXTRA_LDFLAGS]) - - AC_MSG_CHECKING([for OPAL LIBS]) - OPAL_WRAPPER_EXTRA_LIBS="$opal_WRAPPER_EXTRA_LIBS $WRAPPER_EXTRA_LIBS $USER_WRAPPER_EXTRA_LIBS" - AC_SUBST([OPAL_WRAPPER_EXTRA_LIBS]) - AC_MSG_RESULT([$OPAL_WRAPPER_EXTRA_LIBS]) - - AC_MSG_CHECKING([for OPAL extra include dirs]) - if test "$WANT_INSTALL_HEADERS" = "1" ; then - OPAL_WRAPPER_EXTRA_INCLUDES="openmpi" - else - OPAL_WRAPPER_EXTRA_INCLUDES= - fi - AC_SUBST([OPAL_WRAPPER_EXTRA_INCLUDES]) - AC_MSG_RESULT([$OPAL_WRAPPER_EXTRA_INCLUDES]) - - # - # ORTE - # - m4_ifdef([project_orte], - [OMPI_UNIQ([orte_WRAPPER_EXTRA_LDFLAGS]) - OMPI_UNIQ([orte_WRAPPER_EXTRA_LIBS]) - - AC_MSG_CHECKING([for ORTE CPPFLAGS]) - ORTE_WRAPPER_EXTRA_CPPFLAGS="$OPAL_WRAPPER_EXTRA_CPPFLAGS" - AC_SUBST([ORTE_WRAPPER_EXTRA_CPPFLAGS]) - AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_CPPFLAGS]) - - AC_MSG_CHECKING([for ORTE CFLAGS]) - ORTE_WRAPPER_EXTRA_CFLAGS="$OPAL_WRAPPER_EXTRA_CFLAGS" - AC_SUBST([ORTE_WRAPPER_EXTRA_CFLAGS]) - AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_CFLAGS]) - - AC_MSG_CHECKING([for ORTE LDFLAGS]) - ORTE_WRAPPER_EXTRA_LDFLAGS="$orte_WRAPPER_EXTRA_LDFLAGS $OPAL_WRAPPER_EXTRA_LDFLAGS" - AC_SUBST([ORTE_WRAPPER_EXTRA_LDFLAGS]) - AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_LDFLAGS]) - - AC_MSG_CHECKING([for ORTE LIBS]) - ORTE_WRAPPER_EXTRA_LIBS="$orte_WRAPPER_EXTRA_LIBS $OPAL_WRAPPER_EXTRA_LIBS" - AC_SUBST([ORTE_WRAPPER_EXTRA_LIBS]) - AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_LIBS]) - - AC_MSG_CHECKING([for ORTE extra include dirs]) - ORTE_WRAPPER_EXTRA_INCLUDES="$OPAL_WRAPPER_EXTRA_INCLUDES" - AC_SUBST([ORTE_WRAPPER_EXTRA_INCLUDES]) - AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_INCLUDES]) - ]) - - # - # OMPI - # - m4_ifdef([project_ompi], - [OMPI_UNIQ([ompi_WRAPPER_EXTRA_LDFLAGS]) - OMPI_UNIQ([ompi_WRAPPER_EXTRA_LIBS]) - - AC_MSG_CHECKING([for OMPI CPPFLAGS]) - OMPI_WRAPPER_EXTRA_CPPFLAGS="$ORTE_WRAPPER_EXTRA_CPPFLAGS" - AC_SUBST([OMPI_WRAPPER_EXTRA_CPPFLAGS]) - AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_CPPFLAGS]) - - AC_MSG_CHECKING([for OMPI CFLAGS]) - OMPI_WRAPPER_EXTRA_CFLAGS="$ORTE_WRAPPER_EXTRA_CFLAGS" - AC_SUBST([OMPI_WRAPPER_EXTRA_CFLAGS]) - AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_CFLAGS]) - - AC_MSG_CHECKING([for OMPI CXXFLAGS]) - OMPI_WRAPPER_EXTRA_CXXFLAGS="$ORTE_WRAPPER_EXTRA_CXXFLAGS" - AC_SUBST([OMPI_WRAPPER_EXTRA_CXXFLAGS]) - AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_CXXFLAGS]) - - AC_MSG_CHECKING([for OMPI FFLAGS]) - OMPI_WRAPPER_EXTRA_FFLAGS="$WRAPPER_EXTRA_FFLAGS $USER_WRAPPER_EXTRA_FFLAGS" - AC_SUBST([OMPI_WRAPPER_EXTRA_FFLAGS]) - AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_FFLAGS]) - - AC_MSG_CHECKING([for OMPI FCFLAGS]) - OMPI_WRAPPER_EXTRA_FCFLAGS="$WRAPPER_EXTRA_FCFLAGS $USER_WRAPPER_EXTRA_FCFLAGS" - AC_SUBST([OMPI_WRAPPER_EXTRA_FCFLAGS]) - AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_FCFLAGS]) - - AC_MSG_CHECKING([for OMPI LDFLAGS]) - OMPI_WRAPPER_EXTRA_LDFLAGS="$ompi_WRAPPER_EXTRA_LDFLAGS $ORTE_WRAPPER_EXTRA_LDFLAGS" - AC_SUBST([OMPI_WRAPPER_EXTRA_LDFLAGS]) - AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_LDFLAGS]) - - AC_MSG_CHECKING([for OMPI LIBS]) - OMPI_WRAPPER_EXTRA_LIBS="$ompi_WRAPPER_EXTRA_LIBS $ORTE_WRAPPER_EXTRA_LIBS" - AC_SUBST([OMPI_WRAPPER_EXTRA_LIBS]) - AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_LIBS]) - - AC_MSG_CHECKING([for OMPI extra include dirs]) - OMPI_WRAPPER_EXTRA_INCLUDES="$ORTE_WRAPPER_EXTRA_INCLUDES" - AC_SUBST([OMPI_WRAPPER_EXTRA_INCLUDES]) - AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_INCLUDES]) - - # language binding support. C++ is a bit different, as the - # compiler should work even if there is no MPI C++ bindings - # support. However, we do want it to fail if there is no C++ - # compiler. - if test "$WANT_MPI_CXX_SUPPORT" = "1" ; then - OMPI_WRAPPER_CXX_LIB="-lmpi_cxx" - OMPI_WRAPPER_CXX_REQUIRED_FILE="" - elif test "$CXX" = "none"; then - OMPI_WRAPPER_CXX_LIB="" - OMPI_WRAPPER_CXX_REQUIRED_FILE="not supported" - else - OMPI_WRAPPER_CXX_LIB="" - OMPI_WRAPPER_CXX_REQUIRED_FILE="" - fi - AC_SUBST([OMPI_WRAPPER_CXX_LIB]) - AC_SUBST([OMPI_WRAPPER_CXX_REQUIRED_FILE]) - - if test "$OMPI_WANT_F77_BINDINGS" = "1" ; then - OMPI_WRAPPER_F77_REQUIRED_FILE="" - else - OMPI_WRAPPER_F77_REQUIRED_FILE="not supported" - fi - AC_SUBST([OMPI_WRAPPER_F77_REQUIRED_FILE]) - - if test "$OMPI_WANT_F90_BINDINGS" = "1" ; then - OMPI_WRAPPER_F90_REQUIRED_FILE="" - else - OMPI_WRAPPER_F90_REQUIRED_FILE="not supported" - fi - AC_SUBST([OMPI_WRAPPER_F90_REQUIRED_FILE]) - ]) - - # For script-based wrappers that don't do relocatable binaries. - # Don't use if you don't have to. - exec_prefix_save="${exec_prefix}" - test "x$exec_prefix" = xNONE && exec_prefix="${prefix}" - eval "OMPI_WRAPPER_INCLUDEDIR=\"${includedir}\"" - eval "OMPI_WRAPPER_LIBDIR=\"${libdir}\"" - exec_prefix="${exec_prefix_save}" - AC_SUBST(OMPI_WRAPPER_INCLUDEDIR) - AC_SUBST(OMPI_WRAPPER_LIBDIR) - - # compatibility defines that will eventually go away - WRAPPER_EXTRA_CFLAGS="$OMPI_WRAPPER_EXTRA_CFLAGS" - m4_ifdef([project_ompi], - [WRAPPER_EXTRA_CXXFLAGS="$OMPI_WRAPPER_EXTRA_CXXFLAGS" - WRAPPER_EXTRA_FFLAGS="$OMPI_WRAPPER_EXTRA_FFLAGS" - WRAPPER_EXTRA_FCFLAGS="$OMPI_WRAPPER_EXTRA_FCFLAGS"]) - WRAPPER_EXTRA_LDFLAGS="$OMPI_WRAPPER_EXTRA_LDFLAGS" - WRAPPER_EXTRA_LIBS="$OMPI_WRAPPER_EXTRA_LIBS" - - AC_SUBST(WRAPPER_EXTRA_CFLAGS) - m4_ifdef([project_ompi], - [AC_SUBST(WRAPPER_EXTRA_CXXFLAGS) - AC_SUBST(WRAPPER_EXTRA_FFLAGS) - AC_SUBST(WRAPPER_EXTRA_FCFLAGS)]) - AC_SUBST(WRAPPER_EXTRA_LDFLAGS) - AC_SUBST(WRAPPER_EXTRA_LIBS) - - AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CFLAGS, "$WRAPPER_EXTRA_CFLAGS", - [Additional CFLAGS to pass through the wrapper compilers]) - m4_ifdef([project_ompi], - [AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CXXFLAGS, "$WRAPPER_EXTRA_CXXFLAGS", - [Additional CXXFLAGS to pass through the wrapper compilers]) - AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_FFLAGS, "$WRAPPER_EXTRA_FFLAGS", - [Additional FFLAGS to pass through the wrapper compilers]) - AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_FCFLAGS, "$WRAPPER_EXTRA_FCFLAGS", - [Additional FCFLAGS to pass through the wrapper compilers])]) - AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_LDFLAGS, "$WRAPPER_EXTRA_LDFLAGS", - [Additional LDFLAGS to pass through the wrapper compilers]) - AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_LIBS, "$WRAPPER_EXTRA_LIBS", - [Additional LIBS to pass through the wrapper compilers]) -]) diff --git a/configure.ac b/configure.ac index 95f0c5873a..4738ffedcd 100644 --- a/configure.ac +++ b/configure.ac @@ -205,7 +205,10 @@ ompi_enable_static="$enable_static" AM_ENABLE_SHARED AM_DISABLE_STATIC -OMPI_SETUP_WRAPPER_INIT +OPAL_SETUP_WRAPPER_INIT +# There is no [need for] ORTE_SETUP_WRAPPER_INIT; this is not an +# accidental omission +m4_ifdef([project_ompi], [OMPI_SETUP_WRAPPER_INIT]) ################################## # Check for known incompatibility @@ -452,9 +455,10 @@ m4_ifdef([project_ompi], [OMPI_SETUP_MPI_PROFILING], # C++ compiler characteristics ################################## +OPAL_SETUP_CXX +# The MPI project has a boatload more C++ tests (ORTE does not). m4_ifdef([project_ompi], [OMPI_SETUP_CXX]) - ################################## # Only after setting up both # C and C++ check compiler attributes. @@ -972,7 +976,7 @@ ompi_show_title "Final top-level OMPI configuration" ompi_show_subtitle "Libevent 3rd party event handler" CFLAGS_save="$CFLAGS" CFLAGS="$OMPI_CFLAGS_BEFORE_PICKY" -OMPI_SETUP_LIBEVENT +OPAL_SETUP_LIBEVENT CFLAGS="$CFLAGS_save" @@ -1083,7 +1087,8 @@ AC_DEFINE_UNQUOTED(OPAL_HAVE_LTDL_ADVISE, $OPAL_HAVE_LTDL_ADVISE, # final compiler config ############################################################################ -ompi_show_subtitle "Compiler flags" +m4_ifdef([project_ompi], [ompi_show_subtitle "Compiler flags"], + [m4_ifdef([project_orte], [ompi_show_subtitle "Compiler flags"])]) # # This is needed for VPATH builds, so that it will -I the appropriate @@ -1123,9 +1128,9 @@ m4_ifdef([project_orte], [ORTE_SETUP_DEBUGGER_FLAGS], AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) -m4_ifdef([project_ompi], [AC_SUBST(CXXFLAGS) - AC_SUBST(CXXCPPFLAGS) - AC_SUBST(FFLAGS) +AC_SUBST(CXXFLAGS) +AC_SUBST(CXXCPPFLAGS) +m4_ifdef([project_ompi], [AC_SUBST(FFLAGS) AC_SUBST(FCFLAGS) AC_SUBST(OMPI_LIBMPI_EXTRA_LIBS) @@ -1141,7 +1146,9 @@ AC_SUBST([AMCA_PARAM_SETS_DIR], ['$(pkgdatadir)/amca-param-sets']) ############################################################################ ompi_show_subtitle "Wrapper compiler flags" -OMPI_SETUP_WRAPPER_FINAL +OPAL_SETUP_WRAPPER_FINAL +m4_ifdef([project_orte], [ORTE_SETUP_WRAPPER_FINAL]) +m4_ifdef([project_ompi], [OMPI_SETUP_WRAPPER_FINAL]) # Recreate some defines prefixed with OMPI_ so that there are no bare # autoconf macro defines in mpi.h. Since AC sometimes changes whether @@ -1185,8 +1192,8 @@ AC_CONFIG_FILES([ test/threads/Makefile ]) -m4_include([opal/config/config_files.m4]) -m4_ifdef([project_orte], [m4_include([orte/config/config_files.m4])]) -m4_ifdef([project_ompi], [m4_include([ompi/config/config_files.m4])]) +OPAL_CONFIG_FILES +m4_ifdef([project_orte], [ORTE_CONFIG_FILES]) +m4_ifdef([project_ompi], [OMPI_CONFIG_FILES]) AC_OUTPUT diff --git a/ompi/config/config_files.m4 b/ompi/config/config_files.m4 index c42a327c38..dd5e32b628 100644 --- a/ompi/config/config_files.m4 +++ b/ompi/config/config_files.m4 @@ -8,42 +8,38 @@ # $HEADER$ # -# This file is m4_included in the top-level configure.ac only if we -# are building the ompi project. You cannot put an AC_CONFIG_FILES in -# an AC_DEFUN that is conditionally called (because Autoconf will -# still process the AC_CONFIG_FILES unconditionally); you can only m4 -# include the file or not. - -AC_CONFIG_FILES([ - ompi/Makefile - ompi/etc/Makefile - ompi/include/Makefile - ompi/include/mpif.h - ompi/include/mpif-config.h - - ompi/datatype/Makefile - ompi/debuggers/Makefile - - ompi/mpi/c/Makefile - ompi/mpi/c/profile/Makefile - ompi/mpi/cxx/Makefile - ompi/mpi/f77/Makefile - ompi/mpi/f77/profile/Makefile - ompi/mpi/f90/Makefile - ompi/mpi/f90/fortran_kinds.sh - ompi/mpi/f90/fortran_sizes.h - ompi/mpi/f90/scripts/Makefile - - ompi/tools/ompi_info/Makefile - ompi/tools/wrappers/Makefile - ompi/tools/wrappers/mpicc-wrapper-data.txt - ompi/tools/wrappers/mpic++-wrapper-data.txt - ompi/tools/wrappers/mpif77-wrapper-data.txt - ompi/tools/wrappers/mpif90-wrapper-data.txt - ompi/tools/ortetools/Makefile - ompi/tools/ompi-server/Makefile - ompi/tools/ompi-probe/Makefile - ompi/tools/ompi-profiler/Makefile - - test/peruse/Makefile +AC_DEFUN([OMPI_CONFIG_FILES],[ + AC_CONFIG_FILES([ + ompi/Makefile + ompi/etc/Makefile + ompi/include/Makefile + ompi/include/mpif.h + ompi/include/mpif-config.h + + ompi/datatype/Makefile + ompi/debuggers/Makefile + + ompi/mpi/c/Makefile + ompi/mpi/c/profile/Makefile + ompi/mpi/cxx/Makefile + ompi/mpi/f77/Makefile + ompi/mpi/f77/profile/Makefile + ompi/mpi/f90/Makefile + ompi/mpi/f90/fortran_kinds.sh + ompi/mpi/f90/fortran_sizes.h + ompi/mpi/f90/scripts/Makefile + + ompi/tools/ompi_info/Makefile + ompi/tools/wrappers/Makefile + ompi/tools/wrappers/mpicc-wrapper-data.txt + ompi/tools/wrappers/mpic++-wrapper-data.txt + ompi/tools/wrappers/mpif77-wrapper-data.txt + ompi/tools/wrappers/mpif90-wrapper-data.txt + ompi/tools/ortetools/Makefile + ompi/tools/ompi-server/Makefile + ompi/tools/ompi-probe/Makefile + ompi/tools/ompi-profiler/Makefile + + test/peruse/Makefile + ]) ]) diff --git a/config/ompi_check_gm.m4 b/ompi/config/ompi_check_gm.m4 similarity index 100% rename from config/ompi_check_gm.m4 rename to ompi/config/ompi_check_gm.m4 diff --git a/config/ompi_check_mx.m4 b/ompi/config/ompi_check_mx.m4 similarity index 100% rename from config/ompi_check_mx.m4 rename to ompi/config/ompi_check_mx.m4 diff --git a/config/ompi_check_openib.m4 b/ompi/config/ompi_check_openib.m4 similarity index 100% rename from config/ompi_check_openib.m4 rename to ompi/config/ompi_check_openib.m4 diff --git a/config/ompi_check_pcie.m4 b/ompi/config/ompi_check_pcie.m4 similarity index 100% rename from config/ompi_check_pcie.m4 rename to ompi/config/ompi_check_pcie.m4 diff --git a/config/ompi_check_portals.m4 b/ompi/config/ompi_check_portals.m4 similarity index 100% rename from config/ompi_check_portals.m4 rename to ompi/config/ompi_check_portals.m4 diff --git a/config/ompi_check_psm.m4 b/ompi/config/ompi_check_psm.m4 similarity index 100% rename from config/ompi_check_psm.m4 rename to ompi/config/ompi_check_psm.m4 diff --git a/config/ompi_check_udapl.m4 b/ompi/config/ompi_check_udapl.m4 similarity index 100% rename from config/ompi_check_udapl.m4 rename to ompi/config/ompi_check_udapl.m4 diff --git a/ompi/config/ompi_setup_wrappers.m4 b/ompi/config/ompi_setup_wrappers.m4 new file mode 100644 index 0000000000..2daac0a0e5 --- /dev/null +++ b/ompi/config/ompi_setup_wrappers.m4 @@ -0,0 +1,208 @@ +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 (c) 2006 Sun Microsystems, Inc. All rights reserved. +dnl Use is subject to license terms. +dnl Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. +dnl $COPYRIGHT$ +dnl +dnl Additional copyrights may follow +dnl +dnl $HEADER$ +dnl + + +# OMPI_SETUP_WRAPPER_INIT() +# ------------------------- +# Setup wrapper compiler configuration information - should be called +# before the bulk of the tests that can affect the wrapper compilers +# +# Note that we keep the user-specified flags seperately because we +# don't want them to go through OMPI_UNIQ because that has resulted in +# unexpected behavior for the user in the past. +AC_DEFUN([OMPI_SETUP_WRAPPER_INIT],[ + WRAPPER_EXTRA_FFLAGS= + WRAPPER_EXTRA_FCFLAGS= + USER_WRAPPER_EXTRA_FFLAGS= + USER_WRAPPER_EXTRA_FCFLAGS= + + AC_ARG_WITH([wrapper-fflags], + [AC_HELP_STRING([--with-wrapper-fflags], + [Extra flags to add to FFLAGS when using mpif77])]) + if test "$with_wrapper_fflags" = "yes" -o "$with_wrapper_fflags" = "no"; then + AC_MSG_ERROR([--with-wrapper-fflags must have an argument. Aborting]) + elif test ! -z "$with_wrapper_fflags" ; then + USER_WRAPPER_EXTRA_FFLAGS="$with_wrapper_fflags" + fi + + AC_ARG_WITH([wrapper-fcflags], + [AC_HELP_STRING([--with-wrapper-fcflags], + [Extra flags to add to FCFLAGS when using mpif90])]) + if test "$with_wrapper_fcflags" = "yes" -o "$with_wrapper_fcflags" = "no"; then + AC_MSG_ERROR([--with-wrapper-fcflags must have an argument. Aborting]) + elif test ! -z "$with_wrapper_fcflags" ; then + USER_WRAPPER_EXTRA_FCFLAGS="$with_wrapper_fcflags" + fi +]) + +AC_DEFUN([_OMPI_SETUP_ORTE_WRAPPERS],[ + AC_MSG_CHECKING([for OMPI CPPFLAGS]) + OMPI_WRAPPER_EXTRA_CPPFLAGS="$ORTE_WRAPPER_EXTRA_CPPFLAGS" + AC_SUBST([OMPI_WRAPPER_EXTRA_CPPFLAGS]) + AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_CPPFLAGS]) + + AC_MSG_CHECKING([for OMPI CFLAGS]) + OMPI_WRAPPER_EXTRA_CFLAGS="$ORTE_WRAPPER_EXTRA_CFLAGS" + AC_SUBST([OMPI_WRAPPER_EXTRA_CFLAGS]) + AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_CFLAGS]) + + AC_MSG_CHECKING([for OMPI CXXFLAGS]) + OMPI_WRAPPER_EXTRA_CXXFLAGS="$ORTE_WRAPPER_EXTRA_CXXFLAGS" + AC_SUBST([OMPI_WRAPPER_EXTRA_CXXFLAGS]) + AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_CXXFLAGS]) + + AC_MSG_CHECKING([for OMPI FFLAGS]) + OMPI_WRAPPER_EXTRA_FFLAGS="$WRAPPER_EXTRA_FFLAGS $USER_WRAPPER_EXTRA_FFLAGS" + AC_SUBST([OMPI_WRAPPER_EXTRA_FFLAGS]) + AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_FFLAGS]) + + AC_MSG_CHECKING([for OMPI FCFLAGS]) + OMPI_WRAPPER_EXTRA_FCFLAGS="$WRAPPER_EXTRA_FCFLAGS $USER_WRAPPER_EXTRA_FCFLAGS" + AC_SUBST([OMPI_WRAPPER_EXTRA_FCFLAGS]) + AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_FCFLAGS]) + + AC_MSG_CHECKING([for OMPI LDFLAGS]) + OMPI_WRAPPER_EXTRA_LDFLAGS="$ompi_WRAPPER_EXTRA_LDFLAGS $ORTE_WRAPPER_EXTRA_LDFLAGS" + AC_SUBST([OMPI_WRAPPER_EXTRA_LDFLAGS]) + AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_LDFLAGS]) + + AC_MSG_CHECKING([for OMPI LIBS]) + OMPI_WRAPPER_EXTRA_LIBS="$ompi_WRAPPER_EXTRA_LIBS $ORTE_WRAPPER_EXTRA_LIBS" + AC_SUBST([OMPI_WRAPPER_EXTRA_LIBS]) + AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_LIBS]) + + AC_MSG_CHECKING([for OMPI extra include dirs]) + OMPI_WRAPPER_EXTRA_INCLUDES="$ORTE_WRAPPER_EXTRA_INCLUDES" + AC_SUBST([OMPI_WRAPPER_EXTRA_INCLUDES]) + AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_INCLUDES]) +]) + +AC_DEFUN([_OMPI_SETUP_OPAL_WRAPPERS],[ + AC_MSG_CHECKING([for OMPI CPPFLAGS]) + OMPI_WRAPPER_EXTRA_CPPFLAGS="$OPAL_WRAPPER_EXTRA_CPPFLAGS" + AC_SUBST([OMPI_WRAPPER_EXTRA_CPPFLAGS]) + AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_CPPFLAGS]) + + AC_MSG_CHECKING([for OMPI CFLAGS]) + OMPI_WRAPPER_EXTRA_CFLAGS="$OPAL_WRAPPER_EXTRA_CFLAGS" + AC_SUBST([OMPI_WRAPPER_EXTRA_CFLAGS]) + AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_CFLAGS]) + + AC_MSG_CHECKING([for OMPI CXXFLAGS]) + OMPI_WRAPPER_EXTRA_CXXFLAGS="$OPAL_WRAPPER_EXTRA_CXXFLAGS" + AC_SUBST([OMPI_WRAPPER_EXTRA_CXXFLAGS]) + AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_CXXFLAGS]) + + AC_MSG_CHECKING([for OMPI FFLAGS]) + OMPI_WRAPPER_EXTRA_FFLAGS="$WRAPPER_EXTRA_FFLAGS $USER_WRAPPER_EXTRA_FFLAGS" + AC_SUBST([OMPI_WRAPPER_EXTRA_FFLAGS]) + AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_FFLAGS]) + + AC_MSG_CHECKING([for OMPI FCFLAGS]) + OMPI_WRAPPER_EXTRA_FCFLAGS="$WRAPPER_EXTRA_FCFLAGS $USER_WRAPPER_EXTRA_FCFLAGS" + AC_SUBST([OMPI_WRAPPER_EXTRA_FCFLAGS]) + AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_FCFLAGS]) + + AC_MSG_CHECKING([for OMPI LDFLAGS]) + OMPI_WRAPPER_EXTRA_LDFLAGS="$ompi_WRAPPER_EXTRA_LDFLAGS $OPAL_WRAPPER_EXTRA_LDFLAGS" + AC_SUBST([OMPI_WRAPPER_EXTRA_LDFLAGS]) + AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_LDFLAGS]) + + AC_MSG_CHECKING([for OMPI LIBS]) + OMPI_WRAPPER_EXTRA_LIBS="$ompi_WRAPPER_EXTRA_LIBS $OPAL_WRAPPER_EXTRA_LIBS" + AC_SUBST([OMPI_WRAPPER_EXTRA_LIBS]) + AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_LIBS]) + + AC_MSG_CHECKING([for OMPI extra include dirs]) + OMPI_WRAPPER_EXTRA_INCLUDES="$OPAL_WRAPPER_EXTRA_INCLUDES" + AC_SUBST([OMPI_WRAPPER_EXTRA_INCLUDES]) + AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_INCLUDES]) +]) + +AC_DEFUN([OMPI_SETUP_WRAPPER_FINAL],[ + OMPI_UNIQ([WRAPPER_EXTRA_FFLAGS]) + OMPI_UNIQ([WRAPPER_EXTRA_FCFLAGS]) + + OMPI_UNIQ([ompi_WRAPPER_EXTRA_LDFLAGS]) + OMPI_UNIQ([ompi_WRAPPER_EXTRA_LIBS]) + + m4_ifdef([project_orte], [_OMPI_SETUP_ORTE_WRAPPERS], [_OMPI_SETUP_OPAL_WRAPPERS]) + + # language binding support. C++ is a bit different, as the + # compiler should work even if there is no MPI C++ bindings + # support. However, we do want it to fail if there is no C++ + # compiler. + if test "$WANT_MPI_CXX_SUPPORT" = "1" ; then + OMPI_WRAPPER_CXX_LIB="-lmpi_cxx" + OMPI_WRAPPER_CXX_REQUIRED_FILE="" + elif test "$CXX" = "none"; then + OMPI_WRAPPER_CXX_LIB="" + OMPI_WRAPPER_CXX_REQUIRED_FILE="not supported" + else + OMPI_WRAPPER_CXX_LIB="" + OMPI_WRAPPER_CXX_REQUIRED_FILE="" + fi + AC_SUBST([OMPI_WRAPPER_CXX_LIB]) + AC_SUBST([OMPI_WRAPPER_CXX_REQUIRED_FILE]) + + if test "$OMPI_WANT_F77_BINDINGS" = "1" ; then + OMPI_WRAPPER_F77_REQUIRED_FILE="" + else + OMPI_WRAPPER_F77_REQUIRED_FILE="not supported" + fi + AC_SUBST([OMPI_WRAPPER_F77_REQUIRED_FILE]) + + if test "$OMPI_WANT_F90_BINDINGS" = "1" ; then + OMPI_WRAPPER_F90_REQUIRED_FILE="" + else + OMPI_WRAPPER_F90_REQUIRED_FILE="not supported" + fi + AC_SUBST([OMPI_WRAPPER_F90_REQUIRED_FILE]) + + # For script-based wrappers that don't do relocatable binaries. + # Don't use if you don't have to. + exec_prefix_save="${exec_prefix}" + test "x$exec_prefix" = xNONE && exec_prefix="${prefix}" + eval "OMPI_WRAPPER_INCLUDEDIR=\"${includedir}\"" + eval "OMPI_WRAPPER_LIBDIR=\"${libdir}\"" + exec_prefix="${exec_prefix_save}" + AC_SUBST([OMPI_WRAPPER_INCLUDEDIR]) + AC_SUBST([OMPI_WRAPPER_LIBDIR]) + + # compatibility defines that will eventually go away + WRAPPER_EXTRA_FFLAGS="$OMPI_WRAPPER_EXTRA_FFLAGS" + WRAPPER_EXTRA_FCFLAGS="$OMPI_WRAPPER_EXTRA_FCFLAGS" + AC_SUBST([WRAPPER_EXTRA_FFLAGS]) + AC_SUBST([WRAPPER_EXTRA_FCFLAGS]) + + AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_FFLAGS, "$WRAPPER_EXTRA_FFLAGS", + [Additional FFLAGS to pass through the wrapper compilers]) + AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_FCFLAGS, "$WRAPPER_EXTRA_FCFLAGS", + [Additional FCFLAGS to pass through the wrapper compilers])]) + + # if wrapper compilers were requested, set the ompi one up + if test "$WANT_SCRIPT_WRAPPER_COMPILERS" = "1" ; then + AC_CONFIG_FILES([ompi/tools/wrappers/ompi_wrapper_script], + [chmod +x ompi/tools/wrappers/ompi_wrapper_script]) + fi + +]) diff --git a/ompi/contrib/vt/wrappers/Makefile.am b/ompi/contrib/vt/wrappers/Makefile.am index 1fed663d8f..3a3d55a128 100644 --- a/ompi/contrib/vt/wrappers/Makefile.am +++ b/ompi/contrib/vt/wrappers/Makefile.am @@ -9,7 +9,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2006-2007 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2006-2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -17,7 +17,7 @@ # $HEADER$ # -if !OMPI_WANT_SCRIPT_WRAPPER_COMPILERS +if !OPAL_WANT_SCRIPT_WRAPPER_COMPILERS if OMPI_INSTALL_BINARIES dist_pkgdata_DATA = \ @@ -64,4 +64,4 @@ uninstall-local: uninstall-local-always endif # CASE_SENSITIVE_FS endif # OMPI_INSTALL_BINARIES -endif # OMPI_WANT_SCRIPT_WRAPPER_COMPILERS +endif # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS diff --git a/ompi/tools/wrappers/Makefile.am b/ompi/tools/wrappers/Makefile.am index 65f45dca08..586bbde167 100644 --- a/ompi/tools/wrappers/Makefile.am +++ b/ompi/tools/wrappers/Makefile.am @@ -19,7 +19,7 @@ man_pages = mpicc.1 mpic++.1 mpicxx.1 mpif77.1 mpif90.1 -if OMPI_WANT_SCRIPT_WRAPPER_COMPILERS +if OPAL_WANT_SCRIPT_WRAPPER_COMPILERS bin_SCRIPTS = ompi_wrapper_script CLEANFILES += $(bin_SCRIPTS) @@ -47,7 +47,7 @@ install-exec-hook: install-exec-hook-always uninstall-local: uninstall-local-always endif # CASE_SENSITIVE_FS -else # OMPI_WANT_SHELL_WRAPPER_COMPILERS +else # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS if OMPI_INSTALL_BINARIES @@ -100,7 +100,7 @@ endif # CASE_SENSITIVE_FS endif # OMPI_INSTALL_BINARIES -endif # OMPI_WANT_SHELL_WRAPPER_COMPILERS +endif # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS ######################################################## diff --git a/opal/config/config_files.m4 b/opal/config/config_files.m4 index 46c881a446..dab1135a8f 100644 --- a/opal/config/config_files.m4 +++ b/opal/config/config_files.m4 @@ -10,21 +10,23 @@ # This file is m4_included in the top-level configure.ac -AC_CONFIG_FILES([ - opal/Makefile - opal/etc/Makefile - opal/include/Makefile - opal/asm/Makefile - opal/datatype/Makefile - opal/event/Makefile - opal/event/compat/Makefile - opal/event/compat/sys/Makefile - opal/util/Makefile - opal/util/keyval/Makefile - opal/mca/base/Makefile - opal/tools/wrappers/Makefile - opal/tools/wrappers/opalcc-wrapper-data.txt - opal/tools/wrappers/opalc++-wrapper-data.txt - opal/tools/opal-checkpoint/Makefile - opal/tools/opal-restart/Makefile +AC_DEFUN([OPAL_CONFIG_FILES],[ + AC_CONFIG_FILES([ + opal/Makefile + opal/etc/Makefile + opal/include/Makefile + opal/asm/Makefile + opal/datatype/Makefile + opal/event/Makefile + opal/event/compat/Makefile + opal/event/compat/sys/Makefile + opal/util/Makefile + opal/util/keyval/Makefile + opal/mca/base/Makefile + opal/tools/wrappers/Makefile + opal/tools/wrappers/opalcc-wrapper-data.txt + opal/tools/wrappers/opalc++-wrapper-data.txt + opal/tools/opal-checkpoint/Makefile + opal/tools/opal-restart/Makefile + ]) ]) diff --git a/config/opal_check_attributes.m4 b/opal/config/opal_check_attributes.m4 similarity index 100% rename from config/opal_check_attributes.m4 rename to opal/config/opal_check_attributes.m4 diff --git a/config/opal_check_compiler_version.m4 b/opal/config/opal_check_compiler_version.m4 similarity index 100% rename from config/opal_check_compiler_version.m4 rename to opal/config/opal_check_compiler_version.m4 diff --git a/config/opal_check_ident.m4 b/opal/config/opal_check_ident.m4 similarity index 100% rename from config/opal_check_ident.m4 rename to opal/config/opal_check_ident.m4 diff --git a/config/opal_check_offsetof.m4 b/opal/config/opal_check_offsetof.m4 similarity index 100% rename from config/opal_check_offsetof.m4 rename to opal/config/opal_check_offsetof.m4 diff --git a/config/opal_check_pthread_pids.m4 b/opal/config/opal_check_pthread_pids.m4 similarity index 100% rename from config/opal_check_pthread_pids.m4 rename to opal/config/opal_check_pthread_pids.m4 diff --git a/config/opal_check_visibility.m4 b/opal/config/opal_check_visibility.m4 similarity index 100% rename from config/opal_check_visibility.m4 rename to opal/config/opal_check_visibility.m4 diff --git a/config/opal_config_asm.m4 b/opal/config/opal_config_asm.m4 similarity index 100% rename from config/opal_config_asm.m4 rename to opal/config/opal_config_asm.m4 diff --git a/config/opal_config_threads.m4 b/opal/config/opal_config_threads.m4 similarity index 100% rename from config/opal_config_threads.m4 rename to opal/config/opal_config_threads.m4 diff --git a/opal/config/opal_configure_options.m4 b/opal/config/opal_configure_options.m4 index b575ff2441..54a805b22e 100644 --- a/opal/config/opal_configure_options.m4 +++ b/opal/config/opal_configure_options.m4 @@ -412,10 +412,12 @@ AM_CONDITIONAL([OMPI_INSTALL_BINARIES], [test "$enable_binaries" != "no"]) AC_ARG_ENABLE([script-wrapper-compilers], [AC_HELP_STRING([--enable-script-wrapper-compilers], [Use less featured script-based wrapper compilers instead of the standard C-based wrapper compilers. This option ignores the --disable-binaries option and is mainly useful in cross-compile environments])]) -AM_CONDITIONAL([OMPI_WANT_SCRIPT_WRAPPER_COMPILERS], - [test "$enable_script_wrapper_compilers" = "yes"]) -AC_CONFIG_FILES([ompi/tools/wrappers/ompi_wrapper_script], [chmod +x ompi/tools/wrappers/ompi_wrapper_script]) -AC_CONFIG_FILES([orte/tools/wrappers/orte_wrapper_script], [chmod +x orte/tools/wrappers/orte_wrapper_script]) + if test "$enable_script_wrapper_compilers" = "yes"; then + WANT_SCRIPT_WRAPPER_COMPILERS=1 + else + WANT_SCRIPT_WRAPPER_COMPILERS=0 + fi +AM_CONDITIONAL([OPAL_WANT_SCRIPT_WRAPPER_COMPILERS], [test "$enable_script_wrapper_compilers" = "yes"]) # # Support per-user config files? diff --git a/config/opal_functions.m4 b/opal/config/opal_functions.m4 similarity index 100% rename from config/opal_functions.m4 rename to opal/config/opal_functions.m4 diff --git a/config/opal_setup_cc.m4 b/opal/config/opal_setup_cc.m4 similarity index 100% rename from config/opal_setup_cc.m4 rename to opal/config/opal_setup_cc.m4 diff --git a/opal/config/opal_setup_cxx.m4 b/opal/config/opal_setup_cxx.m4 new file mode 100644 index 0000000000..e2520f01b7 --- /dev/null +++ b/opal/config/opal_setup_cxx.m4 @@ -0,0 +1,202 @@ +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-2006 The University of Tennessee and The University +dnl of Tennessee Research Foundation. All rights +dnl reserved. +dnl Copyright (c) 2004-2008 High Performance Computing Center Stuttgart, +dnl University of Stuttgart. All rights reserved. +dnl Copyright (c) 2004-2006 The Regents of the University of California. +dnl All rights reserved. +dnl Copyright (c) 2006 Los Alamos National Security, LLC. All rights +dnl reserved. +dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. +dnl Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved. +dnl $COPYRIGHT$ +dnl +dnl Additional copyrights may follow +dnl +dnl $HEADER$ +dnl + +# This macro is necessary to get the title to be displayed first. :-) +AC_DEFUN([OPAL_SETUP_CXX_BANNER],[ + ompi_show_subtitle "C++ compiler and preprocessor" +]) + +# This macro is necessary because PROG_CXX* is REQUIREd by multiple +# places in SETUP_CXX. +AC_DEFUN([OPAL_PROG_CXX],[ + OMPI_VAR_SCOPE_PUSH([opal_cxxflags_save]) + opal_cxxflags_save="$CXXFLAGS" + AC_PROG_CXX + AC_PROG_CXXCPP + CXXFLAGS="$opal_cxxflags_save" + OMPI_VAR_SCOPE_POP +]) + +# OPAL_SETUP_CXX() +# ---------------- +# Do everything required to setup the C++ compiler. Safe to AC_REQUIRE +# this macro. +AC_DEFUN([OPAL_SETUP_CXX],[ + AC_REQUIRE([OPAL_SETUP_CXX_BANNER]) + + _OPAL_SETUP_CXX_COMPILER + + OMPI_CXX_COMPILER_VENDOR([opal_cxx_vendor]) + + _OPAL_SETUP_CXX_COMPILER_BACKEND +]) + +# _OPAL_SETUP_CXX_COMPILER() +# -------------------------- +# Setup the CXX compiler +AC_DEFUN([_OPAL_SETUP_CXX_COMPILER],[ + OMPI_VAR_SCOPE_PUSH(opal_cxx_compiler_works) + + # Must REQUIRE the PROG_CXX macro and not call it directly here for + # reasons well-described in the AC2.64 (and beyond) docs. + AC_REQUIRE([OPAL_PROG_CXX]) + BASECXX="`basename $CXX`" + + AS_IF([test "x$CXX" = "x"], [CXX=none]) + set dummy $CXX + opal_cxx_argv0=[$]2 + OMPI_WHICH([$opal_cxx_argv0], [OPAL_CXX_ABSOLUTE]) + AS_IF([test "x$OPAL_CXX_ABSOLUTE" = "x"], [OPAL_CXX_ABSOLUTE=none]) + + AC_DEFINE_UNQUOTED(OPAL_CXX, "$CXX", [OPAL underlying C++ compiler]) + AC_SUBST(OPAL_CXX_ABSOLUTE) + + OMPI_VAR_SCOPE_POP +]) + +# _OPAL_SETUP_CXX_COMPILER_BACKEND() +# ---------------------------------- +# Back end of _OPAL_SETUP_CXX_COMPILER_BACKEND() +AC_DEFUN([_OPAL_SETUP_CXX_COMPILER_BACKEND],[ + # Do we want code coverage + if test "$WANT_COVERAGE" = "1"; then + if test "$opal_cxx_vendor" = "gnu" ; then + AC_MSG_WARN([$OPAL_COVERAGE_FLAGS has been added to CFLAGS (--enable-coverage)]) + WANT_DEBUG=1 + CXXFLAGS="${CXXFLAGS} $OPAL_COVERAGE_FLAGS" + WRAPPER_EXTRA_CXXFLAGS="${WRAPPER_EXTRA_CXXFLAGS} $OPAL_COVERAGE_FLAGS" + else + AC_MSG_WARN([Code coverage functionality is currently available only with GCC suite]) + AC_MSG_ERROR([Configure: cannot continue]) + fi + fi + + # Do we want debugging? + if test "$WANT_DEBUG" = "1" -a "$enable_debug_symbols" != "no" ; then + CXXFLAGS="$CXXFLAGS -g" + OMPI_UNIQ(CXXFLAGS) + AC_MSG_WARN([-g has been added to CXXFLAGS (--enable-debug)]) + fi + + # These flags are generally g++-specific; even the g++-impersonating + # compilers won't accept them. + OPAL_CXXFLAGS_BEFORE_PICKY="$CXXFLAGS" + if test "$WANT_PICKY_COMPILER" = 1 -a "$opal_cxx_vendor" = "gnu"; then + add="-Wall -Wundef -Wno-long-long" + + # see if -Wno-long-double works... + AC_LANG_PUSH(C++) + CXXFLAGS_orig="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $add -Wno-long-double -fstrict-prototype" + AC_CACHE_CHECK([if $CXX supports -Wno-long-double], + [opal_cv_cxx_wno_long_double], + [AC_TRY_COMPILE([], [], + [opal_cv_cxx_wno_long_double="yes"], + [opal_cv_cxx_wno_long_double="no"])]) + CXXFLAGS="$CXXFLAGS_orig" + AC_LANG_POP(C++) + if test "$opal_cv_cxx_wno_long_double" = "yes" ; then + add="$add -Wno-long-double" + fi + + CXXFLAGS="$CXXFLAGS $add" + OMPI_UNIQ(CXXFLAGS) + if test "$add" != "" ; then + AC_MSG_WARN([$add has been added to CXXFLAGS (--enable-picky)]) + fi + unset add + fi + + # See if this version of g++ allows -finline-functions + if test "$GXX" = "yes"; then + CXXFLAGS_orig="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -finline-functions" + add= + AC_CACHE_CHECK([if $CXX supports -finline-functions], + [opal_cv_cxx_finline_functions], + [AC_TRY_COMPILE([], [], + [opal_cv_cxx_finline_functions="yes"], + [opal_cv_cxx_finline_functions="no"])]) + if test "$opal_cv_cxx_finline_functions" = "yes" ; then + add=" -finline-functions" + fi + CXXFLAGS="$CXXFLAGS_orig$add" + OMPI_UNIQ(CXXFLAGS) + if test "$add" != "" ; then + AC_MSG_WARN([$add has been added to CXXFLAGS]) + fi + unset add + fi + + # Make sure we can link with the C compiler + if[ test "$opal_cv_cxx_compiler_vendor" != "microsoft" ]; then + OMPI_LANG_LINK_WITH_C([C++], [], + [cat <&2 +********************************************************************** +* It appears that your C++ compiler is unable to link against object +* files created by your C compiler. This generally indicates either +* a conflict between the options specified in CFLAGS and CXXFLAGS +* or a problem with the local compiler installation. More +* information (including exactly what command was given to the +* compilers and what error resulted when the commands were executed) is +* available in the config.log file in this directory. +********************************************************************** +EOF + AC_MSG_ERROR([C and C++ compilers are not link compatible. Can not continue.])]) + fi + + # If we are on HP-UX, ensure that we're using aCC + case "$host" in + *hpux*) + if test "$BASECXX" = "CC"; then + AC_MSG_WARN([*** You will probably have problems compiling the MPI 2]) + AC_MSG_WARN([*** C++ bindings with the HP-UX CC compiler. You should]) + AC_MSG_WARN([*** probably be using the aCC compiler. Re-run configure]) + AC_MSG_WARN([*** with the environment variable "CXX=aCC".]) + fi + ;; + esac + + # Note: gcc-imperonating compilers accept -O3 + if test "$WANT_DEBUG" = "1"; then + OPTFLAGS= + else + if test "$GXX" = yes; then + OPTFLAGS="-O3" + else + OPTFLAGS="-O" + fi + fi + + # config/opal_check_optflags.m4 + OMPI_CHECK_OPTFLAGS(["$CXXFLAGS"]) + AC_MSG_CHECKING([for C++ optimization flags]) + AC_MSG_RESULT([$co_result]) + CXXFLAGS="$co_result" + + # bool type size and alignment + AC_LANG_PUSH(C++) + AC_CHECK_SIZEOF(bool) + OMPI_C_GET_ALIGNMENT(bool, OPAL_ALIGNMENT_CXX_BOOL) + AC_LANG_POP(C++) +]) diff --git a/config/ompi_setup_libevent.m4 b/opal/config/opal_setup_libevent.m4 similarity index 98% rename from config/ompi_setup_libevent.m4 rename to opal/config/opal_setup_libevent.m4 index 87285d8fc8..23935b59f9 100644 --- a/config/ompi_setup_libevent.m4 +++ b/opal/config/opal_setup_libevent.m4 @@ -10,6 +10,7 @@ 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) 2008 Sun Microsystems, Inc. All rights reserved. +dnl Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -17,7 +18,7 @@ dnl dnl $HEADER$ dnl -AC_DEFUN([OMPI_SETUP_LIBEVENT],[ +AC_DEFUN([OPAL_SETUP_LIBEVENT],[ dnl OMPI: don't use AC_LIBOBJ sources= @@ -395,8 +396,8 @@ AC_CHECK_TYPE(u_int8_t, unsigned char) # OMPI: Save the libobj sources -OMPI_LIBEVENT_SOURCES="$sources" -AC_SUBST(OMPI_LIBEVENT_SOURCES) +OPAL_LIBEVENT_SOURCES="$sources" +AC_SUBST(OPAL_LIBEVENT_SOURCES) # OMPI: All done unset sources])dnl diff --git a/opal/config/opal_setup_wrappers.m4 b/opal/config/opal_setup_wrappers.m4 new file mode 100644 index 0000000000..0f752cd7a2 --- /dev/null +++ b/opal/config/opal_setup_wrappers.m4 @@ -0,0 +1,151 @@ +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 (c) 2006 Sun Microsystems, Inc. All rights reserved. +dnl Use is subject to license terms. +dnl Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. +dnl $COPYRIGHT$ +dnl +dnl Additional copyrights may follow +dnl +dnl $HEADER$ +dnl + + +# OPAL_SETUP_WRAPPER_INIT() +# ------------------------- +# Setup wrapper compiler configuration information - should be called +# before the bulk of the tests that can affect the wrapper compilers +# +# Note that we keep the user-specified flags seperately because we +# don't want them to go through OMPI_UNIQ because that has resulted in +# unexpected behavior for the user in the past. +AC_DEFUN([OPAL_SETUP_WRAPPER_INIT],[ + WRAPPER_EXTRA_CPPFLAGS= + WRAPPER_EXTRA_CFLAGS= + WRAPPER_EXTRA_CXXFLAGS= + WRAPPER_EXTRA_LDFLAGS= + WRAPPER_EXTRA_LIBS= + + USER_WRAPPER_EXTRA_CFLAGS= + USER_WRAPPER_EXTRA_CXXFLAGS= + USER_WRAPPER_EXTRA_LDFLAGS= + USER_WRAPPER_EXTRA_LIBS= + + AC_ARG_WITH([wrapper-cflags], + [AC_HELP_STRING([--with-wrapper-cflags], + [Extra flags to add to CFLAGS when using mpicc])]) + if test "$with_wrapper_cflags" = "yes" -o "$with_wrapper_cflags" = "no"; then + AC_MSG_ERROR([--with-wrapper-cflags must have an argument. Aborting]) + elif test ! -z "$with_wrapper_cflags" ; then + USER_WRAPPER_EXTRA_CFLAGS="$with_wrapper_cflags" + fi + + AC_ARG_WITH([wrapper-cxxflags], + [AC_HELP_STRING([--with-wrapper-cxxflags], + [Extra flags to add to CXXFLAGS when using mpiCC/mpic++])]) + if test "$with_wrapper_cxxflags" = "yes" -o "$with_wrapper_cxxflags" = "no"; then + AC_MSG_ERROR([--with-wrapper-cxxflags must have an argument. Aborting]) + elif test ! -z "$with_wrapper_cxxflags" ; then + USER_WRAPPER_EXTRA_CXXFLAGS="$with_wrapper_cxxflags" + fi + + + AC_ARG_WITH([wrapper-ldflags], + [AC_HELP_STRING([--with-wrapper-ldflags], + [Extra flags to add to LDFLAGS when using wrapper compilers])]) + if test "$with_wrapper_ldflags" = "yes" -o "$with_wrapper_ldflags" = "no"; then + AC_MSG_ERROR([--with-wrapper-ldflags must have an argument. Aborting]) + elif test ! -z "$with_wrapper_ldflags" ; then + USER_WRAPPER_EXTRA_LDFLAGS="$with_wrapper_ldflags" + fi + + AC_ARG_WITH([wrapper-libs], + [AC_HELP_STRING([--with-wrapper-libs], + [Extra flags to add to LIBS when using wrapper compilers])]) + if test "$with_wrapper_libs" = "yes" -o "$with_wrapper_libs" = "no"; then + AC_MSG_ERROR([--with-wrapper-libs must have an argument. Aborting]) + elif test ! -z "$with_wrapper_libs" ; then + USER_WRAPPER_EXTRA_LIBS="$with_wrapper_libs" + fi +]) + + +AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[ + OMPI_UNIQ([WRAPPER_EXTRA_CPPFLAGS]) + OMPI_UNIQ([WRAPPER_EXTRA_CFLAGS]) + OMPI_UNIQ([WRAPPER_EXTRA_CXXFLAGS]) + OMPI_UNIQ([WRAPPER_EXTRA_LDFLAGS]) + + OMPI_UNIQ([opal_WRAPPER_EXTRA_LDFLAGS]) + OMPI_UNIQ([opal_WRAPPER_EXTRA_LIBS]) + + AC_MSG_CHECKING([for OPAL CPPFLAGS]) + OPAL_WRAPPER_EXTRA_CPPFLAGS="$WRAPPER_EXTRA_CPPFLAGS $USER_WRAPPER_EXTRA_CPPFLAGS" + AC_SUBST([OPAL_WRAPPER_EXTRA_CPPFLAGS]) + AC_MSG_RESULT([$OPAL_WRAPPER_EXTRA_CPPFLAGS]) + + AC_MSG_CHECKING([for OPAL CFLAGS]) + OPAL_WRAPPER_EXTRA_CFLAGS="$WRAPPER_EXTRA_CFLAGS $USER_WRAPPER_EXTRA_CFLAGS" + AC_SUBST([OPAL_WRAPPER_EXTRA_CFLAGS]) + AC_MSG_RESULT([$OPAL_WRAPPER_EXTRA_CFLAGS]) + + AC_MSG_CHECKING([for OPAL LDFLAGS]) + OPAL_WRAPPER_EXTRA_LDFLAGS="$opal_WRAPPER_EXTRA_LDFLAGS $WRAPPER_EXTRA_LDFLAGS $USER_WRAPPER_EXTRA_LDFLAGS" + AC_SUBST([OPAL_WRAPPER_EXTRA_LDFLAGS]) + AC_MSG_RESULT([$OPAL_WRAPPER_EXTRA_LDFLAGS]) + + AC_MSG_CHECKING([for OPAL LIBS]) + OPAL_WRAPPER_EXTRA_LIBS="$opal_WRAPPER_EXTRA_LIBS $WRAPPER_EXTRA_LIBS $USER_WRAPPER_EXTRA_LIBS" + AC_SUBST([OPAL_WRAPPER_EXTRA_LIBS]) + AC_MSG_RESULT([$OPAL_WRAPPER_EXTRA_LIBS]) + + AC_MSG_CHECKING([for OPAL extra include dirs]) + if test "$WANT_INSTALL_HEADERS" = "1" ; then + OPAL_WRAPPER_EXTRA_INCLUDES="openmpi" + else + OPAL_WRAPPER_EXTRA_INCLUDES= + fi + AC_SUBST([OPAL_WRAPPER_EXTRA_INCLUDES]) + AC_MSG_RESULT([$OPAL_WRAPPER_EXTRA_INCLUDES]) + + + # For script-based wrappers that don't do relocatable binaries. + # Don't use if you don't have to. + exec_prefix_save="${exec_prefix}" + test "x$exec_prefix" = xNONE && exec_prefix="${prefix}" + eval "OPAL_WRAPPER_INCLUDEDIR=\"${includedir}\"" + eval "OPAL_WRAPPER_LIBDIR=\"${libdir}\"" + exec_prefix="${exec_prefix_save}" + AC_SUBST([OPAL_WRAPPER_INCLUDEDIR]) + AC_SUBST([OPAL_WRAPPER_LIBDIR]) + + # compatibility defines that will eventually go away + WRAPPER_EXTRA_CFLAGS="$OPAL_WRAPPER_EXTRA_CFLAGS" + WRAPPER_EXTRA_CXXFLAGS="$OPAL_WRAPPER_EXTRA_CXXFLAGS" + WRAPPER_EXTRA_LDFLAGS="$OPAL_WRAPPER_EXTRA_LDFLAGS" + WRAPPER_EXTRA_LIBS="$OPAL_WRAPPER_EXTRA_LIBS" + + AC_SUBST([WRAPPER_EXTRA_CFLAGS]) + AC_SUBST([WRAPPER_EXTRA_CXXFLAGS]) + AC_SUBST([WRAPPER_EXTRA_LDFLAGS]) + AC_SUBST([WRAPPER_EXTRA_LIBS]) + + AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CFLAGS, "$WRAPPER_EXTRA_CFLAGS", + [Additional CFLAGS to pass through the wrapper compilers]) + AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CXXFLAGS, "$WRAPPER_EXTRA_CXXFLAGS", + [Additional CXXFLAGS to pass through the wrapper compilers]) + AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_LDFLAGS, "$WRAPPER_EXTRA_LDFLAGS", + [Additional LDFLAGS to pass through the wrapper compilers]) + AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_LIBS, "$WRAPPER_EXTRA_LIBS", + [Additional LIBS to pass through the wrapper compilers]) +]) diff --git a/opal/event/Makefile.am b/opal/event/Makefile.am index 813d501446..dc58a8e9a3 100644 --- a/opal/event/Makefile.am +++ b/opal/event/Makefile.am @@ -56,7 +56,7 @@ junk = \ noinst_LTLIBRARIES = libevent.la # OMPI: Automake sillyness so that we can have variable sources -objects = $(OMPI_LIBEVENT_SOURCES:.c=.lo) +objects = $(OPAL_LIBEVENT_SOURCES:.c=.lo) # OMPI: Changed to libevent_la_* headers = event.h event_rename.h evutil.h min_heap.h @@ -65,7 +65,6 @@ libevent_la_SOURCES = event.c log.c evutil.c $(headers) libevent_la_LIBADD = $(objects) libevent_la_DEPENDENCIES = $(objects) - if WANT_INSTALL_HEADERS ompidir = $(includedir)/openmpi/opal/event ompi_HEADERS = $(headers) diff --git a/opal/tools/wrappers/Makefile.am b/opal/tools/wrappers/Makefile.am index a1e0c763e2..a25fb505a9 100644 --- a/opal/tools/wrappers/Makefile.am +++ b/opal/tools/wrappers/Makefile.am @@ -25,7 +25,7 @@ EXTRA_DIST = $(real_man_pages:.1=.1in) CMakeLists.txt include $(top_srcdir)/Makefile.man-page-rules -if !OMPI_WANT_SCRIPT_WRAPPER_COMPILERS +if !OPAL_WANT_SCRIPT_WRAPPER_COMPILERS if OMPI_INSTALL_BINARIES bin_PROGRAMS = opal_wrapper @@ -54,7 +54,7 @@ uninstall-local: endif # WANT_INSTALL_HEADERS endif # OMPI_INSTALL_BINARIES -endif # OMPI_WANT_SCRIPT_WRAPPER_COMPILERS +endif # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS opal_wrapper_SOURCES = opal_wrapper.c opal_wrapper_LDADD = $(top_builddir)/opal/libopen-pal.la diff --git a/orte/config/config_files.m4 b/orte/config/config_files.m4 index a9c9dec8cd..de6011a1ae 100644 --- a/orte/config/config_files.m4 +++ b/orte/config/config_files.m4 @@ -8,27 +8,23 @@ # $HEADER$ # -# This file is m4_included in the top-level configure.ac only if we -# are building the orte project. You cannot put an AC_CONFIG_FILES in -# an AC_DEFUN that is conditionally called (because Autoconf will -# still process the AC_CONFIG_FILES unconditionally); you can only m4 -# include the file or not. - -AC_CONFIG_FILES([ - orte/Makefile - orte/include/Makefile - orte/etc/Makefile - - orte/tools/orted/Makefile - orte/tools/orterun/Makefile - orte/tools/wrappers/Makefile - orte/tools/wrappers/ortecc-wrapper-data.txt - orte/tools/wrappers/ortec++-wrapper-data.txt - orte/tools/orte-checkpoint/Makefile - orte/tools/orte-iof/Makefile - orte/tools/orte-restart/Makefile - orte/tools/orte-ps/Makefile - orte/tools/orte-clean/Makefile - orte/tools/orte-top/Makefile - orte/tools/orte-bootproxy/Makefile +AC_DEFUN([ORTE_CONFIG_FILES],[ + AC_CONFIG_FILES([ + orte/Makefile + orte/include/Makefile + orte/etc/Makefile + + orte/tools/orted/Makefile + orte/tools/orterun/Makefile + orte/tools/wrappers/Makefile + orte/tools/wrappers/ortecc-wrapper-data.txt + orte/tools/wrappers/ortec++-wrapper-data.txt + orte/tools/orte-checkpoint/Makefile + orte/tools/orte-iof/Makefile + orte/tools/orte-restart/Makefile + orte/tools/orte-ps/Makefile + orte/tools/orte-clean/Makefile + orte/tools/orte-top/Makefile + orte/tools/orte-bootproxy/Makefile + ]) ]) diff --git a/config/ompi_check_alps.m4 b/orte/config/orte_check_alps.m4 similarity index 80% rename from config/ompi_check_alps.m4 rename to orte/config/orte_check_alps.m4 index 5167cbdce3..763ef96832 100644 --- a/config/ompi_check_alps.m4 +++ b/orte/config/orte_check_alps.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -17,17 +18,16 @@ # $HEADER$ # - -# OMPI_CHECK_ALPS(prefix, [action-if-found], [action-if-not-found]) +# ORTE_CHECK_ALPS(prefix, [action-if-found], [action-if-not-found]) # -------------------------------------------------------- -AC_DEFUN([OMPI_CHECK_ALPS],[ +AC_DEFUN([ORTE_CHECK_ALPS],[ AC_ARG_WITH([alps], [AC_HELP_STRING([--with-alps], [Build ALPS scheduler component (default: no)])]) if test "$with_alps" = "yes" ; then - ompi_check_alps_happy="yes" + orte_check_alps_happy="yes" fi - AS_IF([test "$ompi_check_alps_happy" = "yes"], + AS_IF([test "$orte_check_alps_happy" = "yes"], [$2], [$3]) ]) diff --git a/config/ompi_check_bproc.m4 b/orte/config/orte_check_bproc.m4 similarity index 73% rename from config/ompi_check_bproc.m4 rename to orte/config/orte_check_bproc.m4 index 586b47bf6c..c486ac0d39 100644 --- a/config/ompi_check_bproc.m4 +++ b/orte/config/orte_check_bproc.m4 @@ -20,19 +20,19 @@ # new bproc is LANL versions >= 3.2.0 # old bproc is all Scyld versions and LANL version < 3.2.0 -# OMPI_CHECK_BPROC(prefix, [action-if-new-bproc], [action-if-old-bproc], +# ORTE_CHECK_BPROC(prefix, [action-if-new-bproc], [action-if-old-bproc], # [action-if-not-found]) # -------------------------------------------------------- -AC_DEFUN([OMPI_CHECK_BPROC],[ +AC_DEFUN([ORTE_CHECK_BPROC],[ AC_ARG_WITH([bproc], [AC_HELP_STRING([--with-bproc(=DIR)], [Build BProc support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])]) OMPI_CHECK_WITHDIR([bproc], [$with_bproc], [include/sys/bproc.h]) AS_IF([test ! -z "$with_bproc" -a "$with_bproc" = "no"],[$4], [ - ompi_check_bproc_save_CPPFLAGS="$CPPFLAGS" - ompi_check_bproc_save_LDFLAGS="$LDFLAGS" - ompi_check_bproc_save_LIBS="$LIBS" + orte_check_bproc_save_CPPFLAGS="$CPPFLAGS" + orte_check_bproc_save_LDFLAGS="$LDFLAGS" + orte_check_bproc_save_LIBS="$LIBS" AS_IF([test ! -z "$with_bproc" -a "$with_bproc" != "yes"], [CPPFLAGS="$CPPFLAGS -I$with_bproc/include" @@ -40,27 +40,27 @@ AC_DEFUN([OMPI_CHECK_BPROC],[ AC_CHECK_HEADERS([sys/bproc.h], [AC_CHECK_LIB([bproc], [bproc_numnodes], - [ompi_check_bproc_happy="yes"], - [ompi_check_bproc_happy="no"])], - [ompi_check_bproc_happy="no"]) + [orte_check_bproc_happy="yes"], + [orte_check_bproc_happy="no"])], + [orte_check_bproc_happy="no"]) # Check for Scyld bproc or an old version of LANL Bproc (pre 3.2.0) - AS_IF([test "$ompi_check_bproc_happy" = "yes"], - [AC_CHECK_HEADERS([sys/bproc_common.h],[ompi_check_bproc_happy="new"], - [ompi_check_bproc_happy="old"], + AS_IF([test "$orte_check_bproc_happy" = "yes"], + [AC_CHECK_HEADERS([sys/bproc_common.h],[orte_check_bproc_happy="new"], + [orte_check_bproc_happy="old"], [#include #include ])]) - CPPFLAGS="$ompi_check_bproc_save_CPPFLAGS" - LDFLAGS="$ompi_check_bproc_save_LDFLAGS" - LIBS="$ompi_check_bproc_save_LIBS" + CPPFLAGS="$orte_check_bproc_save_CPPFLAGS" + LDFLAGS="$orte_check_bproc_save_LDFLAGS" + LIBS="$orte_check_bproc_save_LIBS" - AS_IF([test "$ompi_check_bproc_happy" != "no"], + AS_IF([test "$orte_check_bproc_happy" != "no"], [AS_IF([test ! -z "$with_bproc" -a "$with_bproc" != "yes"], [$1_CPPFLAGS="$$1_CPPFLAGS -I$with_bproc/include" $1_LDFLAGS="$$1_LDFLAGS -L$with_bproc/lib"]) $1_LIBS="$$1_LIBS -lbproc" - AS_IF([test "$ompi_check_bproc_happy" = "new"], [$2], [$3])], + AS_IF([test "$orte_check_bproc_happy" = "new"], [$2], [$3])], [AS_IF([test ! -z "$with_bproc"], [AC_MSG_ERROR([BProc support request but not found. Perhaps you need to specify the location of the BProc libraries.])]) diff --git a/config/ompi_check_loadleveler.m4 b/orte/config/orte_check_loadleveler.m4 similarity index 74% rename from config/ompi_check_loadleveler.m4 rename to orte/config/orte_check_loadleveler.m4 index 03cffcd187..2984514383 100644 --- a/config/ompi_check_loadleveler.m4 +++ b/orte/config/orte_check_loadleveler.m4 @@ -18,33 +18,33 @@ # $HEADER$ # -# OMPI_CHECK_LOADLEVELER(prefix, [action-if-found], [action-if-not-found]) +# ORTE_CHECK_LOADLEVELER(prefix, [action-if-found], [action-if-not-found]) # -------------------------------------------------------- -AC_DEFUN([OMPI_CHECK_LOADLEVELER],[ +AC_DEFUN([ORTE_CHECK_LOADLEVELER],[ AC_ARG_WITH([loadleveler], [AC_HELP_STRING([--with-loadleveler(=DIR)], [Build LoadLeveler support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])]) OMPI_CHECK_WITHDIR([loadleveler], [$with_loadleveler], [include/llapi.h]) AS_IF([test "$with_loadleveler" = "no"], - [ompi_check_loadleveler_happy="no"], - [ompi_check_loadleveler_happy="yes" + [orte_check_loadleveler_happy="no"], + [orte_check_loadleveler_happy="yes" AS_IF([test ! -z "$with_loadleveler" -a "$with_loadleveler" != "yes"], - [ompi_check_loadleveler_dir="$with_loadleveler"], - [ompi_check_loadleveler_dir=""])]) + [orte_check_loadleveler_dir="$with_loadleveler"], + [orte_check_loadleveler_dir=""])]) - AS_IF([test "$ompi_check_loadleveler_happy" = "yes"], + AS_IF([test "$orte_check_loadleveler_happy" = "yes"], [OMPI_CHECK_PACKAGE([$1], [llapi.h], [llapi], [ll_query], [], - [$ompi_check_loadleveler_dir], + [$orte_check_loadleveler_dir], [], - [ompi_check_loadleveler_happy="yes"], - [ompi_check_loadleveler_happy="no"])]) + [orte_check_loadleveler_happy="yes"], + [orte_check_loadleveler_happy="no"])]) - AS_IF([test "$ompi_check_loadleveler_happy" = "yes"], + AS_IF([test "$orte_check_loadleveler_happy" = "yes"], [$2], [AS_IF([test ! -z "$with_loadleveler" -a "$with_loadleveler" != "no"], [AC_MSG_ERROR([LOADLEVELER support requested but not found. Aborting])]) diff --git a/config/ompi_check_lsf.m4 b/orte/config/orte_check_lsf.m4 similarity index 63% rename from config/ompi_check_lsf.m4 rename to orte/config/orte_check_lsf.m4 index 79ac4dd55c..56a2041625 100644 --- a/config/ompi_check_lsf.m4 +++ b/orte/config/orte_check_lsf.m4 @@ -19,9 +19,9 @@ # # check for lsf -# OMPI_CHECK_LSF(prefix, [action-if-found], [action-if-not-found]) +# ORTE_CHECK_LSF(prefix, [action-if-found], [action-if-not-found]) # -------------------------------------------------------- -AC_DEFUN([OMPI_CHECK_LSF],[ +AC_DEFUN([ORTE_CHECK_LSF],[ AC_ARG_WITH([lsf], [AC_HELP_STRING([--with-lsf(=DIR)], [Build LSF support])]) @@ -32,63 +32,63 @@ AC_DEFUN([OMPI_CHECK_LSF],[ OMPI_CHECK_WITHDIR([lsf-libdir], [$with_lsf_libdir], [libbat.*]) # Defaults - ompi_check_lsf_dir_msg="compiler default" - ompi_check_lsf_libdir_msg="linker default" + orte_check_lsf_dir_msg="compiler default" + orte_check_lsf_libdir_msg="linker default" # Save directory names if supplied AS_IF([test ! -z "$with_lsf" -a "$with_lsf" != "yes"], - [ompi_check_lsf_dir="$with_lsf" - ompi_check_lsf_dir_msg="$ompi_check_lsf_dir (from --with-lsf)"]) + [orte_check_lsf_dir="$with_lsf" + orte_check_lsf_dir_msg="$orte_check_lsf_dir (from --with-lsf)"]) AS_IF([test ! -z "$with_lsf_libdir" -a "$with_lsf_libdir" != "yes"], - [ompi_check_lsf_libdir="$with_lsf_libdir" - ompi_check_lsf_libdir_msg="$ompi_check_lsf_libdir (from --with-lsf-libdir)"]) + [orte_check_lsf_libdir="$with_lsf_libdir" + orte_check_lsf_libdir_msg="$orte_check_lsf_libdir (from --with-lsf-libdir)"]) # If no directories were specified, look for LSF_LIBDIR, # LSF_INCLUDEDIR, and/or LSF_ENVDIR. - AS_IF([test -z "$ompi_check_lsf_dir" -a -z "$ompi_check_lsf_libdir"], + AS_IF([test -z "$orte_check_lsf_dir" -a -z "$orte_check_lsf_libdir"], [AS_IF([test ! -z "$LSF_ENVDIR" -a -z "$LSF_LIBDIR" -a -f "$LSF_ENVDIR/lsf.conf"], [LSF_LIBDIR=`egrep ^LSF_LIBDIR= $LSF_ENVDIR/lsf.conf | cut -d= -f2-`]) AS_IF([test ! -z "$LSF_ENVDIR" -a -z "$LSF_INCLUDEDIR" -a -f "$LSF_ENVDIR/lsf.conf"], [LSF_INCLUDEDIR=`egrep ^LSF_INCLUDEDIR= $LSF_ENVDIR/lsf.conf | cut -d= -f2-`]) AS_IF([test ! -z "$LSF_LIBDIR"], - [ompi_check_lsf_libdir=$LSF_LIBDIR - ompi_check_lsf_libdir_msg="$LSF_LIBDIR (from \$LSF_LIBDIR)"]) + [orte_check_lsf_libdir=$LSF_LIBDIR + orte_check_lsf_libdir_msg="$LSF_LIBDIR (from \$LSF_LIBDIR)"]) AS_IF([test ! -z "$LSF_INCLUDEDIR"], - [ompi_check_lsf_dir=`dirname $LSF_INCLUDEDIR` - ompi_check_lsf_dir_msg="$ompi_check_lsf_dir (from \$LSF_INCLUDEDIR)"])]) + [orte_check_lsf_dir=`dirname $LSF_INCLUDEDIR` + orte_check_lsf_dir_msg="$orte_check_lsf_dir (from \$LSF_INCLUDEDIR)"])]) AS_IF([test "$with_lsf" = "no"], - [ompi_check_lsf_happy="no"], - [ompi_check_lsf_happy="yes"]) + [orte_check_lsf_happy="no"], + [orte_check_lsf_happy="yes"]) - ompi_check_lsf_$1_save_CPPFLAGS="$CPPFLAGS" - ompi_check_lsf_$1_save_LDFLAGS="$LDFLAGS" - ompi_check_lsf_$1_save_LIBS="$LIBS" + orte_check_lsf_$1_save_CPPFLAGS="$CPPFLAGS" + orte_check_lsf_$1_save_LDFLAGS="$LDFLAGS" + orte_check_lsf_$1_save_LIBS="$LIBS" - AS_IF([test "$ompi_check_lsf_happy" = "yes"], + AS_IF([test "$orte_check_lsf_happy" = "yes"], [AC_MSG_CHECKING([for LSF dir]) - AC_MSG_RESULT([$ompi_check_lsf_dir_msg]) + AC_MSG_RESULT([$orte_check_lsf_dir_msg]) AC_MSG_CHECKING([for LSF library dir]) - AC_MSG_RESULT([$ompi_check_lsf_libdir_msg]) + AC_MSG_RESULT([$orte_check_lsf_libdir_msg]) OMPI_CHECK_PACKAGE([$1], [lsf/lsbatch.h], [bat], [lsb_launch], [-llsf], - [$ompi_check_lsf_dir], - [$ompi_check_lsf_libdir], - [ompi_check_lsf_happy="yes"], - [ompi_check_lsf_happy="no"])]) + [$orte_check_lsf_dir], + [$orte_check_lsf_libdir], + [orte_check_lsf_happy="yes"], + [orte_check_lsf_happy="no"])]) - CPPFLAGS="$ompi_check_lsf_$1_save_CPPFLAGS" - LDFLAGS="$ompi_check_lsf_$1_save_LDFLAGS" - LIBS="$ompi_check_lsf_$1_save_LIBS" + CPPFLAGS="$orte_check_lsf_$1_save_CPPFLAGS" + LDFLAGS="$orte_check_lsf_$1_save_LDFLAGS" + LIBS="$orte_check_lsf_$1_save_LIBS" # Reset for the next time we're called - ompi_check_lsf_dir= - ompi_check_lsf_libdir= + orte_check_lsf_dir= + orte_check_lsf_libdir= - AS_IF([test "$ompi_check_lsf_happy" = "yes"], + AS_IF([test "$orte_check_lsf_happy" = "yes"], [$2], [AS_IF([test ! -z "$with_lsf" -a "$with_lsf" != "no"], [AC_MSG_WARN([LSF support requested (via --with-lsf) but not found.]) diff --git a/config/ompi_check_sge.m4 b/orte/config/orte_check_sge.m4 similarity index 82% rename from config/ompi_check_sge.m4 rename to orte/config/orte_check_sge.m4 index 6cd76f8bc9..f9668bdc3d 100644 --- a/config/ompi_check_sge.m4 +++ b/orte/config/orte_check_sge.m4 @@ -10,7 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2006-2007 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2006-2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -23,31 +23,31 @@ # 3. if neither is given, build if-and-only-if you find either qrsh in path or # sge_root in environment -# OMPI_CHECK_GRIDENGINE(prefix, [action-if-found], [action-if-not-found]) +# ORTE_CHECK_GRIDENGINE(prefix, [action-if-found], [action-if-not-found]) # -------------------------------------------------------- -AC_DEFUN([OMPI_CHECK_GRIDENGINE],[ +AC_DEFUN([ORTE_CHECK_GRIDENGINE],[ AC_ARG_WITH([sge], [AC_HELP_STRING([--with-sge], [Build SGE or Grid Engine support (default: no)])]) AC_MSG_CHECKING([if user requested SGE build]) - ompi_gridengine_build= + orte_gridengine_build= AS_IF([test "$with_sge" = "yes"], [AC_MSG_RESULT([yes]) - ompi_gridengine_build=yes], + orte_gridengine_build=yes], [AS_IF([test "$with_sge" = "no"], [AC_MSG_RESULT([no])], [AC_MSG_RESULT([not specified; checking environment]) AC_CHECK_PROG([QRSH], [qrsh], [qrsh]) AS_IF([test "$QRSH" != ""], - [ompi_gridengine_build=yes], + [orte_gridengine_build=yes], [AC_MSG_CHECKING([for SGE_ROOT environment variable]) AS_IF([test "$SGE_ROOT" != ""], [AC_MSG_RESULT([found]) - ompi_gridengine_build=yes], + orte_gridengine_build=yes], [AC_MSG_RESULT([not found])])])])]) - AS_IF([test "$ompi_gridengine_build" = "yes"], + AS_IF([test "$orte_gridengine_build" = "yes"], [$2], [$3]) ]) diff --git a/config/ompi_check_slurm.m4 b/orte/config/orte_check_slurm.m4 similarity index 58% rename from config/ompi_check_slurm.m4 rename to orte/config/orte_check_slurm.m4 index 8a753c5a7b..44d7cb7a52 100644 --- a/config/ompi_check_slurm.m4 +++ b/orte/config/orte_check_slurm.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -17,55 +18,54 @@ # $HEADER$ # - -# OMPI_CHECK_SLURM(prefix, [action-if-found], [action-if-not-found]) +# ORTE_CHECK_SLURM(prefix, [action-if-found], [action-if-not-found]) # -------------------------------------------------------- -AC_DEFUN([OMPI_CHECK_SLURM],[ +AC_DEFUN([ORTE_CHECK_SLURM],[ AC_ARG_WITH([slurm], [AC_HELP_STRING([--with-slurm], [Build SLURM scheduler component (default: yes)])]) if test "$with_slurm" = "no" ; then - ompi_check_slurm_happy="no" + orte_check_slurm_happy="no" elif test "$with_slurm" = "" ; then # unless user asked, only build slurm component on linux, AIX, # and OS X systems (these are the platforms that SLURM # supports) case $host in *-linux*|*-aix*|*-apple-darwin*) - ompi_check_slurm_happy="yes" + orte_check_slurm_happy="yes" ;; *) AC_MSG_CHECKING([for SLURM srun in PATH]) - OMPI_WHICH([srun], [OMPI_CHECK_SLURM_SRUN]) - if test "$OMPI_CHECK_SLURM_SRUN" = ""; then - ompi_check_slurm_happy="no" + OMPI_WHICH([srun], [ORTE_CHECK_SLURM_SRUN]) + if test "$ORTE_CHECK_SLURM_SRUN" = ""; then + orte_check_slurm_happy="no" else - ompi_check_slurm_happy="yes" + orte_check_slurm_happy="yes" fi - AC_MSG_RESULT([$ompi_check_slurm_happy]) + AC_MSG_RESULT([$orte_check_slurm_happy]) ;; esac else - ompi_check_slurm_happy="yes" + orte_check_slurm_happy="yes" fi - AS_IF([test "$ompi_check_slurm_happy" = "yes"], + AS_IF([test "$orte_check_slurm_happy" = "yes"], [AC_CHECK_FUNC([fork], - [ompi_check_slurm_happy="yes"], - [ompi_check_slurm_happy="no"])]) + [orte_check_slurm_happy="yes"], + [orte_check_slurm_happy="no"])]) - AS_IF([test "$ompi_check_slurm_happy" = "yes"], + AS_IF([test "$orte_check_slurm_happy" = "yes"], [AC_CHECK_FUNC([execve], - [ompi_check_slurm_happy="yes"], - [ompi_check_slurm_happy="no"])]) + [orte_check_slurm_happy="yes"], + [orte_check_slurm_happy="no"])]) - AS_IF([test "$ompi_check_slurm_happy" = "yes"], + AS_IF([test "$orte_check_slurm_happy" = "yes"], [AC_CHECK_FUNC([setpgid], - [ompi_check_slurm_happy="yes"], - [ompi_check_slurm_happy="no"])]) + [orte_check_slurm_happy="yes"], + [orte_check_slurm_happy="no"])]) - AS_IF([test "$ompi_check_slurm_happy" = "yes"], + AS_IF([test "$orte_check_slurm_happy" = "yes"], [$2], [$3]) ]) diff --git a/config/ompi_check_tm.m4 b/orte/config/orte_check_tm.m4 similarity index 57% rename from config/ompi_check_tm.m4 rename to orte/config/orte_check_tm.m4 index 6be81d637e..27565c6178 100644 --- a/config/ompi_check_tm.m4 +++ b/orte/config/orte_check_tm.m4 @@ -18,60 +18,60 @@ # $HEADER$ # -# OMPI_CHECK_TM_LIBS_FLAGS(prefix, [LIBS or LDFLAGS]) +# ORTE_CHECK_TM_LIBS_FLAGS(prefix, [LIBS or LDFLAGS]) # --------------------------------------------------- -AC_DEFUN([OMPI_CHECK_TM_LIBS_FLAGS],[ - ompi_check_tm_flags=`$ompi_check_tm_pbs_config --libs` - for ompi_check_tm_val in $ompi_check_tm_flags; do - if test "`echo $ompi_check_tm_val | cut -c1-2`" = "-l"; then +AC_DEFUN([ORTE_CHECK_TM_LIBS_FLAGS],[ + orte_check_tm_flags=`$orte_check_tm_pbs_config --libs` + for orte_check_tm_val in $orte_check_tm_flags; do + if test "`echo $orte_check_tm_val | cut -c1-2`" = "-l"; then if test "$2" = "LIBS"; then - $1_$2="$$1_$2 $ompi_check_tm_val" + $1_$2="$$1_$2 $orte_check_tm_val" fi else if test "$2" = "LDFLAGS"; then - $1_$2="$$1_$2 $ompi_check_tm_val" + $1_$2="$$1_$2 $orte_check_tm_val" fi fi done ]) -# OMPI_CHECK_TM(prefix, [action-if-found], [action-if-not-found]) +# ORTE_CHECK_TM(prefix, [action-if-found], [action-if-not-found]) # -------------------------------------------------------- -AC_DEFUN([OMPI_CHECK_TM],[ +AC_DEFUN([ORTE_CHECK_TM],[ AC_ARG_WITH([tm], [AC_HELP_STRING([--with-tm(=DIR)], [Build TM (Torque, PBSPro, and compatible) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])]) OMPI_CHECK_WITHDIR([tm], [$with_tm], [include/tm.h]) - ompi_check_tm_found=no + orte_check_tm_found=no AS_IF([test "$with_tm" = "no"], - [ompi_check_tm_happy="no"], - [ompi_check_tm_happy="yes" + [orte_check_tm_happy="no"], + [orte_check_tm_happy="yes" AS_IF([test ! -z "$with_tm" -a "$with_tm" != "yes"], - [ompi_check_tm_dir="$with_tm"], - [ompi_check_tm_dir=""])]) + [orte_check_tm_dir="$with_tm"], + [orte_check_tm_dir=""])]) - AS_IF([test "$ompi_check_tm_happy" = "yes"], + AS_IF([test "$orte_check_tm_happy" = "yes"], [AC_MSG_CHECKING([for pbs-config]) - ompi_check_tm_pbs_config="not found" - AS_IF([test "$ompi_check_tm_dir" != "" -a -d "$ompi_check_tm_dir" -a -x "$ompi_check_tm_dir/bin/pbs-config"], - [ompi_check_tm_pbs_config="$ompi_check_tm_dir/bin/pbs-config"], + orte_check_tm_pbs_config="not found" + AS_IF([test "$orte_check_tm_dir" != "" -a -d "$orte_check_tm_dir" -a -x "$orte_check_tm_dir/bin/pbs-config"], + [orte_check_tm_pbs_config="$orte_check_tm_dir/bin/pbs-config"], [AS_IF([pbs-config --prefix >/dev/null 2>&1], - [ompi_check_tm_pbs_config="pbs-config"])]) - AC_MSG_RESULT([$ompi_check_tm_pbs_config])]) + [orte_check_tm_pbs_config="pbs-config"])]) + AC_MSG_RESULT([$orte_check_tm_pbs_config])]) # If we have pbs-config, get the flags we need from there and then # do simplistic tests looking for the tm headers and symbols - AS_IF([test "$ompi_check_tm_happy" = "yes" -a "$ompi_check_tm_pbs_config" != "not found"], - [$1_CPPFLAGS=`$ompi_check_tm_pbs_config --cflags` + AS_IF([test "$orte_check_tm_happy" = "yes" -a "$orte_check_tm_pbs_config" != "not found"], + [$1_CPPFLAGS=`$orte_check_tm_pbs_config --cflags` OMPI_LOG_MSG([$1_CPPFLAGS from pbs-config: $$1_CPPFLAGS], 1) - OMPI_CHECK_TM_LIBS_FLAGS([$1], [LDFLAGS]) + ORTE_CHECK_TM_LIBS_FLAGS([$1], [LDFLAGS]) OMPI_LOG_MSG([$1_LDFLAGS from pbs-config: $$1_LDFLAGS], 1) - OMPI_CHECK_TM_LIBS_FLAGS([$1], [LIBS]) + ORTE_CHECK_TM_LIBS_FLAGS([$1], [LIBS]) OMPI_LOG_MSG([$1_LIBS from pbs-config: $$1_LIBS], 1) # Now that we supposedly have the right flags, try them out. @@ -86,7 +86,7 @@ AC_DEFUN([OMPI_CHECK_TM],[ AC_CHECK_HEADER([tm.h], [AC_CHECK_FUNC([tm_finalize], - [ompi_check_tm_found="yes"])]) + [orte_check_tm_found="yes"])]) CPPFLAGS="$CPPFLAGS_save" LDFLAGS="$LDFLAGS_save" @@ -99,45 +99,45 @@ AC_DEFUN([OMPI_CHECK_TM],[ # library to "libtorque". So we have to check for both libpbs and # libtorque. First, check for libpbs. - ompi_check_package_$1_save_CPPFLAGS="$CPPFLAGS" - ompi_check_package_$1_save_LDFLAGS="$LDFLAGS" - ompi_check_package_$1_save_LIBS="$LIBS" + orte_check_package_$1_save_CPPFLAGS="$CPPFLAGS" + orte_check_package_$1_save_LDFLAGS="$LDFLAGS" + orte_check_package_$1_save_LIBS="$LIBS" - ompi_check_package_$1_orig_CPPFLAGS="$$1_CPPFLAGS" - ompi_check_package_$1_orig_LDFLAGS="$$1_LDFLAGS" - ompi_check_package_$1_orig_LIBS="$$1_LIBS" + orte_check_package_$1_orig_CPPFLAGS="$$1_CPPFLAGS" + orte_check_package_$1_orig_LDFLAGS="$$1_LDFLAGS" + orte_check_package_$1_orig_LIBS="$$1_LIBS" - AS_IF([test "$ompi_check_tm_found" = "no"], - [AS_IF([test "$ompi_check_tm_happy" = "yes"], + AS_IF([test "$orte_check_tm_found" = "no"], + [AS_IF([test "$orte_check_tm_happy" = "yes"], [_OMPI_CHECK_PACKAGE_HEADER([$1], [tm.h], - [$ompi_check_tm_dir], - [ompi_check_tm_found="yes"], - [ompi_check_tm_found="no"])]) + [$orte_check_tm_dir], + [orte_check_tm_found="yes"], + [orte_check_tm_found="no"])]) - AS_IF([test "$ompi_check_tm_found" = "yes"], + AS_IF([test "$orte_check_tm_found" = "yes"], [_OMPI_CHECK_PACKAGE_LIB([$1], [pbs], [tm_init], [], - [$ompi_check_tm_dir], - [$ompi_check_tm_libdir], - [ompi_check_tm_found="yes"], + [$orte_check_tm_dir], + [$orte_check_tm_libdir], + [orte_check_tm_found="yes"], [_OMPI_CHECK_PACKAGE_LIB([$1], [torque], [tm_init], [], - [$ompi_check_tm_dir], - [$ompi_check_tm_libdir], - [ompi_check_tm_found="yes"], - [ompi_check_tm_found="no"])])])]) + [$orte_check_tm_dir], + [$orte_check_tm_libdir], + [orte_check_tm_found="yes"], + [orte_check_tm_found="no"])])])]) - CPPFLAGS="$ompi_check_package_$1_save_CPPFLAGS" - LDFLAGS="$ompi_check_package_$1_save_LDFLAGS" - LIBS="$ompi_check_package_$1_save_LIBS" + CPPFLAGS="$orte_check_package_$1_save_CPPFLAGS" + LDFLAGS="$orte_check_package_$1_save_LDFLAGS" + LIBS="$orte_check_package_$1_save_LIBS" # Did we find the right stuff? - AS_IF([test "$ompi_check_tm_happy" = "yes" -a "$ompi_check_tm_found" = "yes"], + AS_IF([test "$orte_check_tm_happy" = "yes" -a "$orte_check_tm_found" = "yes"], [$2], [AS_IF([test ! -z "$with_tm" -a "$with_tm" != "no"], [AC_MSG_ERROR([TM support requested but not found. Aborting])]) diff --git a/config/ompi_check_xgrid.m4 b/orte/config/orte_check_xgrid.m4 similarity index 87% rename from config/ompi_check_xgrid.m4 rename to orte/config/orte_check_xgrid.m4 index a91484e088..a24f4e4032 100644 --- a/config/ompi_check_xgrid.m4 +++ b/orte/config/orte_check_xgrid.m4 @@ -12,6 +12,7 @@ # All rights reserved. # Copyright (c) 2006 Los Alamos National Security, LLC. All rights # reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -19,10 +20,9 @@ # $HEADER$ # - -# OMPI_CHECK_XGRID(prefix, [action-if-found], [action-if-not-found]) +# ORTE_CHECK_XGRID(prefix, [action-if-found], [action-if-not-found]) # -------------------------------------------------------- -AC_DEFUN([OMPI_CHECK_XGRID],[ +AC_DEFUN([ORTE_CHECK_XGRID],[ AC_REQUIRE([AC_PROG_OBJC]) AC_ARG_WITH([xgrid], @@ -33,7 +33,7 @@ AC_DEFUN([OMPI_CHECK_XGRID],[ [OMPI_LANG_LINK_WITH_C([Objective C], [AC_CACHE_CHECK([for XgridFoundation Framework], [ompi_cv_check_xgrid_foundation], - [_OMPI_CHECK_XGRID([ompi_cv_check_xgrid_foundation="yes"], + [_ORTE_CHECK_XGRID([ompi_cv_check_xgrid_foundation="yes"], [ompi_cv_check_xgrid_foundation="no"])]) AS_IF([test "$ompi_cv_check_xgrid_foundation" = "yes"], [ompi_check_xgrid_happy="yes"], @@ -47,9 +47,9 @@ AC_DEFUN([OMPI_CHECK_XGRID],[ ]) -# _OMPI_CHECK_XGRID([action-if-found], [action-if-not-found]) +# _ORTE_CHECK_XGRID([action-if-found], [action-if-not-found]) # -------------------------------------------------------- -AC_DEFUN([_OMPI_CHECK_XGRID],[ +AC_DEFUN([_ORTE_CHECK_XGRID],[ AC_LANG_PUSH(Objective C) ompi_check_xgrid_save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -framework XgridFoundation -framework Foundation" diff --git a/orte/config/orte_setup_wrappers.m4 b/orte/config/orte_setup_wrappers.m4 new file mode 100644 index 0000000000..7f7f9aac8b --- /dev/null +++ b/orte/config/orte_setup_wrappers.m4 @@ -0,0 +1,79 @@ +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 (c) 2006 Sun Microsystems, Inc. All rights reserved. +dnl Use is subject to license terms. +dnl Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. +dnl $COPYRIGHT$ +dnl +dnl Additional copyrights may follow +dnl +dnl $HEADER$ +dnl + + +AC_DEFUN([ORTE_SETUP_WRAPPER_FINAL],[ + OMPI_UNIQ([orte_WRAPPER_EXTRA_LDFLAGS]) + OMPI_UNIQ([orte_WRAPPER_EXTRA_LIBS]) + + AC_MSG_CHECKING([for ORTE CPPFLAGS]) + ORTE_WRAPPER_EXTRA_CPPFLAGS="$WRAPPER_EXTRA_CPPFLAGS $USER_WRAPPER_EXTRA_CPPFLAGS" + AC_SUBST([ORTE_WRAPPER_EXTRA_CPPFLAGS]) + AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_CPPFLAGS]) + + AC_MSG_CHECKING([for ORTE CXXFLAGS]) + ORTE_WRAPPER_EXTRA_CXXFLAGS="$WRAPPER_EXTRA_CXXFLAGS $USER_WRAPPER_EXTRA_CXXFLAGS" + AC_SUBST([ORTE_WRAPPER_EXTRA_CXXFLAGS]) + AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_CXXFLAGS]) + + AC_MSG_CHECKING([for ORTE CFLAGS]) + ORTE_WRAPPER_EXTRA_CFLAGS="$WRAPPER_EXTRA_CFLAGS $USER_WRAPPER_EXTRA_CFLAGS" + AC_SUBST([ORTE_WRAPPER_EXTRA_CFLAGS]) + AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_CFLAGS]) + + AC_MSG_CHECKING([for ORTE LDFLAGS]) + ORTE_WRAPPER_EXTRA_LDFLAGS="$orte_WRAPPER_EXTRA_LDFLAGS $WRAPPER_EXTRA_LDFLAGS $USER_WRAPPER_EXTRA_LDFLAGS" + AC_SUBST([ORTE_WRAPPER_EXTRA_LDFLAGS]) + AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_LDFLAGS]) + + AC_MSG_CHECKING([for ORTE LIBS]) + ORTE_WRAPPER_EXTRA_LIBS="$orte_WRAPPER_EXTRA_LIBS $WRAPPER_EXTRA_LIBS $USER_WRAPPER_EXTRA_LIBS" + AC_SUBST([ORTE_WRAPPER_EXTRA_LIBS]) + AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_LIBS]) + + AC_MSG_CHECKING([for ORTE extra include dirs]) + if test "$WANT_INSTALL_HEADERS" = "1" ; then + ORTE_WRAPPER_EXTRA_INCLUDES="openmpi" + else + ORTE_WRAPPER_EXTRA_INCLUDES= + fi + AC_SUBST([ORTE_WRAPPER_EXTRA_INCLUDES]) + AC_MSG_RESULT([$ORTE_WRAPPER_EXTRA_INCLUDES]) + + + # For script-based wrappers that don't do relocatable binaries. + # Don't use if you don't have to. + exec_prefix_save="${exec_prefix}" + test "x$exec_prefix" = xNONE && exec_prefix="${prefix}" + eval "ORTE_WRAPPER_INCLUDEDIR=\"${includedir}\"" + eval "ORTE_WRAPPER_LIBDIR=\"${libdir}\"" + exec_prefix="${exec_prefix_save}" + AC_SUBST([ORTE_WRAPPER_INCLUDEDIR]) + AC_SUBST([ORTE_WRAPPER_LIBDIR]) + + # if wrapper compilers were requested, set the orte one up + if test "$WANT_SCRIPT_WRAPPER_COMPILERS" = "1" ; then + AC_CONFIG_FILES([orte/tools/wrappers/orte_wrapper_script], + [chmod +x orte/tools/wrappers/orte_wrapper_script]) + fi + +]) diff --git a/orte/mca/ess/alps/configure.m4 b/orte/mca/ess/alps/configure.m4 index 6b4187c36b..14536bfe10 100644 --- a/orte/mca/ess/alps/configure.m4 +++ b/orte/mca/ess/alps/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,7 +21,7 @@ # MCA_ess_alps_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_ess_alps_CONFIG],[ - OMPI_CHECK_ALPS([ess_alps], + ORTE_CHECK_ALPS([ess_alps], [AC_CHECK_FUNC([cnos_get_rank], [$1], [$2])], [$2]) ])dnl diff --git a/orte/mca/ess/bproc/configure.m4 b/orte/mca/ess/bproc/configure.m4 index 1fe57df707..2cb98d0935 100644 --- a/orte/mca/ess/bproc/configure.m4 +++ b/orte/mca/ess/bproc/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,7 +21,7 @@ # MCA_ess_bproc_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_ess_bproc_CONFIG],[ - OMPI_CHECK_BPROC([ess_bproc], [ess_bproc_good=1], + ORTE_CHECK_BPROC([ess_bproc], [ess_bproc_good=1], [ess_bproc_good=1], [ess_bproc_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/mca/ess/cnos/configure.m4 b/orte/mca/ess/cnos/configure.m4 index b3db391163..95e39d4988 100644 --- a/orte/mca/ess/cnos/configure.m4 +++ b/orte/mca/ess/cnos/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -25,6 +26,6 @@ AC_DEFUN([MCA_ess_cnos_CONFIG],[ # was requested, and we can't rely on build priority because # ess_alps uses priorty 10 so that ess_hnp is built as well. AC_CHECK_FUNC([cnos_get_rank], - [OMPI_CHECK_ALPS([ess_cnos], [$2], [$1])], + [ORTE_CHECK_ALPS([ess_cnos], [$2], [$1])], [$2]) ])dnl diff --git a/orte/mca/ess/lsf/configure.m4 b/orte/mca/ess/lsf/configure.m4 index f6ce58f512..4c970d32b5 100644 --- a/orte/mca/ess/lsf/configure.m4 +++ b/orte/mca/ess/lsf/configure.m4 @@ -10,7 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -21,7 +21,7 @@ # MCA_ess_lsf_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_ess_lsf_CONFIG],[ - OMPI_CHECK_LSF([ess_lsf], [ess_lsf_good=1], [ess_lsf_good=0]) + ORTE_CHECK_LSF([ess_lsf], [ess_lsf_good=1], [ess_lsf_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/mca/ess/slurm/configure.m4 b/orte/mca/ess/slurm/configure.m4 index 8824d11885..c94b36262e 100644 --- a/orte/mca/ess/slurm/configure.m4 +++ b/orte/mca/ess/slurm/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,7 +21,7 @@ # MCA_ess_slurm_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_ess_slurm_CONFIG],[ - OMPI_CHECK_SLURM([ess_slurm], [ess_slurm_good=1], [ess_slurm_good=0]) + ORTE_CHECK_SLURM([ess_slurm], [ess_slurm_good=1], [ess_slurm_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/mca/ess/slurmd/configure.m4 b/orte/mca/ess/slurmd/configure.m4 index d7895d1a78..aea53a9af1 100644 --- a/orte/mca/ess/slurmd/configure.m4 +++ b/orte/mca/ess/slurmd/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,7 +21,7 @@ # MCA_ess_slurmd_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_ess_slurmd_CONFIG],[ - OMPI_CHECK_SLURM([ess_slurmd], [ess_slurmd_good=1], [ess_slurmd_good=0]) + ORTE_CHECK_SLURM([ess_slurmd], [ess_slurmd_good=1], [ess_slurmd_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/mca/ess/tm/configure.m4 b/orte/mca/ess/tm/configure.m4 index 3ca4c32100..034b92c77e 100644 --- a/orte/mca/ess/tm/configure.m4 +++ b/orte/mca/ess/tm/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,7 +21,7 @@ # MCA_ess_tm_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_ess_tm_CONFIG],[ - OMPI_CHECK_TM([ess_tm], [ess_tm_good=1], [ess_tm_good=0]) + ORTE_CHECK_TM([ess_tm], [ess_tm_good=1], [ess_tm_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/mca/odls/bproc/configure.m4 b/orte/mca/odls/bproc/configure.m4 index c042c4689d..ef21cbe4a9 100644 --- a/orte/mca/odls/bproc/configure.m4 +++ b/orte/mca/odls/bproc/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,7 +21,7 @@ # MCA_odls_bproc_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_odls_bproc_CONFIG],[ - OMPI_CHECK_BPROC([odls_bproc], [odls_bproc_good=1], + ORTE_CHECK_BPROC([odls_bproc], [odls_bproc_good=1], [odls_bproc_good=1], [odls_bproc_good=0]) # if check worked, set wrapper flags if so. diff --git a/orte/mca/plm/alps/configure.m4 b/orte/mca/plm/alps/configure.m4 index 413bce53fe..2ce7a462c5 100644 --- a/orte/mca/plm/alps/configure.m4 +++ b/orte/mca/plm/alps/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,5 +21,5 @@ # MCA_plm_alps_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_plm_alps_CONFIG],[ - OMPI_CHECK_ALPS([plm_alps], [$1], [$2]) + ORTE_CHECK_ALPS([plm_alps], [$1], [$2]) ])dnl diff --git a/orte/mca/plm/bproc/configure.m4 b/orte/mca/plm/bproc/configure.m4 index a80d9a0700..8694a947cf 100644 --- a/orte/mca/plm/bproc/configure.m4 +++ b/orte/mca/plm/bproc/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,7 +21,7 @@ # MCA_plm_bproc_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_plm_bproc_CONFIG],[ - OMPI_CHECK_BPROC([plm_bproc], [plm_bproc_good=2], + ORTE_CHECK_BPROC([plm_bproc], [plm_bproc_good=2], [plm_bproc_good=1], [plm_bproc_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/mca/plm/lsf/configure.m4 b/orte/mca/plm/lsf/configure.m4 index 0cec60fd01..3d28e1ba24 100644 --- a/orte/mca/plm/lsf/configure.m4 +++ b/orte/mca/plm/lsf/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,7 +21,7 @@ # MCA_plm_lsf_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_plm_lsf_CONFIG],[ - OMPI_CHECK_LSF([plm_lsf], [plm_lsf_good=1], [plm_lsf_good=0]) + ORTE_CHECK_LSF([plm_lsf], [plm_lsf_good=1], [plm_lsf_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/mca/plm/slurm/configure.m4 b/orte/mca/plm/slurm/configure.m4 index 0613655aac..66a72f3d2c 100644 --- a/orte/mca/plm/slurm/configure.m4 +++ b/orte/mca/plm/slurm/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,7 +21,7 @@ # MCA_plm_slurm_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_plm_slurm_CONFIG],[ - OMPI_CHECK_SLURM([plm_slurm], [plm_slurm_good=1], [plm_slurm_good=0]) + ORTE_CHECK_SLURM([plm_slurm], [plm_slurm_good=1], [plm_slurm_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/mca/plm/tm/configure.m4 b/orte/mca/plm/tm/configure.m4 index 284e49b84b..aa120687ce 100644 --- a/orte/mca/plm/tm/configure.m4 +++ b/orte/mca/plm/tm/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,7 +21,7 @@ # MCA_plm_tm_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_plm_tm_CONFIG],[ - OMPI_CHECK_TM([plm_tm], [plm_tm_good=1], [plm_tm_good=0]) + ORTE_CHECK_TM([plm_tm], [plm_tm_good=1], [plm_tm_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/mca/plm/tmd/configure.m4 b/orte/mca/plm/tmd/configure.m4 index 370ab2c648..7b093ab65c 100644 --- a/orte/mca/plm/tmd/configure.m4 +++ b/orte/mca/plm/tmd/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,7 +21,7 @@ # MCA_plm_tmd_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_plm_tmd_CONFIG],[ - OMPI_CHECK_TM([plm_tmd], [plm_tmd_good=1], [plm_tmd_good=0]) + ORTE_CHECK_TM([plm_tmd], [plm_tmd_good=1], [plm_tmd_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/mca/plm/xgrid/configure.m4 b/orte/mca/plm/xgrid/configure.m4 index 175462d137..396ca214ea 100644 --- a/orte/mca/plm/xgrid/configure.m4 +++ b/orte/mca/plm/xgrid/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,14 +21,14 @@ # MCA_plm_xgrid_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_plm_xgrid_CONFIG],[ - OMPI_CHECK_XGRID([plm_xgrid], [plm_xgrid_good=1], [plm_xgrid_good=0]) + ORTE_CHECK_XGRID([plm_xgrid], [plm_xgrid_good=1], [plm_xgrid_good=0]) # For very dumb reasons involving linking, it's near impossible # to build the XGrid components as static libraries. Disable if that's # the case. AS_IF([test "$plm_xgrid_good" = "0"], [$2], [AS_IF([test "$compile_mode" = "dso"], - [ # plm_xgrid_LDFLAGS will be set by OMPI_CHECK_XGRID + [ # plm_xgrid_LDFLAGS will be set by ORTE_CHECK_XGRID plm_xgrid_WRAPPER_EXTRA_LDFLAGS="$plm_xgrid_LDFLAGS" $1], [AC_MSG_WARN([XGrid components must be built as DSOs. Disabling]) diff --git a/orte/mca/ras/alps/configure.m4 b/orte/mca/ras/alps/configure.m4 index c2dde104b6..4d9c9f7998 100644 --- a/orte/mca/ras/alps/configure.m4 +++ b/orte/mca/ras/alps/configure.m4 @@ -11,6 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2008 UT-Battelle, LLC +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -21,5 +22,5 @@ # MCA_ras_alps_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_ras_alps_CONFIG],[ - OMPI_CHECK_ALPS([ras_alps], [$1], [$2]) - ])dnl + ORTE_CHECK_ALPS([ras_alps], [$1], [$2]) +])dnl diff --git a/orte/mca/ras/bjs/configure.m4 b/orte/mca/ras/bjs/configure.m4 index 23185f4ceb..df13880174 100644 --- a/orte/mca/ras/bjs/configure.m4 +++ b/orte/mca/ras/bjs/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,7 +21,7 @@ # MCA_ras_bjs_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_ras_bjs_CONFIG],[ - OMPI_CHECK_BPROC([ras_bjs], [ras_bjs_good=1], [ras_bjs_good=1], + ORTE_CHECK_BPROC([ras_bjs], [ras_bjs_good=1], [ras_bjs_good=1], [ras_bjs_good=0]) # if check worked, set wrapper flags if so. diff --git a/orte/mca/ras/gridengine/configure.m4 b/orte/mca/ras/gridengine/configure.m4 index 551c6a999d..030b9a753f 100644 --- a/orte/mca/ras/gridengine/configure.m4 +++ b/orte/mca/ras/gridengine/configure.m4 @@ -12,6 +12,7 @@ # All rights reserved. # Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -22,5 +23,5 @@ # MCA_ras_sge_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_ras_gridengine_CONFIG],[ - OMPI_CHECK_GRIDENGINE([ras_gridengine], [$1], [$2]) + ORTE_CHECK_GRIDENGINE([ras_gridengine], [$1], [$2]) ])dnl diff --git a/orte/mca/ras/loadleveler/configure.m4 b/orte/mca/ras/loadleveler/configure.m4 index 6ee50ad70a..4a418d8d7c 100644 --- a/orte/mca/ras/loadleveler/configure.m4 +++ b/orte/mca/ras/loadleveler/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,7 +21,7 @@ # MCA_ras_loadleveler_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_ras_loadleveler_CONFIG],[ - OMPI_CHECK_LOADLEVELER([ras_loadleveler], [ras_loadleveler_good=1], [ras_loadleveler_good=0]) + ORTE_CHECK_LOADLEVELER([ras_loadleveler], [ras_loadleveler_good=1], [ras_loadleveler_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/mca/ras/lsf/configure.m4 b/orte/mca/ras/lsf/configure.m4 index a54eda39a5..a5c7e458c9 100644 --- a/orte/mca/ras/lsf/configure.m4 +++ b/orte/mca/ras/lsf/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,7 +21,7 @@ # MCA_ras_lsf_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_ras_lsf_CONFIG],[ - OMPI_CHECK_LSF([ras_lsf], [ras_lsf_good=1], [ras_lsf_good=0]) + ORTE_CHECK_LSF([ras_lsf], [ras_lsf_good=1], [ras_lsf_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/mca/ras/slurm/configure.m4 b/orte/mca/ras/slurm/configure.m4 index 281a0b8e25..b6eb65cc21 100644 --- a/orte/mca/ras/slurm/configure.m4 +++ b/orte/mca/ras/slurm/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,7 +21,7 @@ # MCA_ras_slurm_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_ras_slurm_CONFIG],[ - OMPI_CHECK_SLURM([ras_slurm], [ras_slurm_good=1], [ras_slurm_good=0]) + ORTE_CHECK_SLURM([ras_slurm], [ras_slurm_good=1], [ras_slurm_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/mca/ras/tm/configure.m4 b/orte/mca/ras/tm/configure.m4 index dd715c3ee8..e0615ba2e2 100644 --- a/orte/mca/ras/tm/configure.m4 +++ b/orte/mca/ras/tm/configure.m4 @@ -10,6 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. +# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,7 +21,7 @@ # MCA_ras_tm_CONFIG([action-if-found], [action-if-not-found]) # ----------------------------------------------------------- AC_DEFUN([MCA_ras_tm_CONFIG],[ - OMPI_CHECK_TM([ras_tm], [ras_tm_good=1], [ras_tm_good=0]) + ORTE_CHECK_TM([ras_tm], [ras_tm_good=1], [ras_tm_good=0]) # if check worked, set wrapper flags if so. # Evaluate succeed / fail diff --git a/orte/tools/wrappers/Makefile.am b/orte/tools/wrappers/Makefile.am index fc9935ba74..36b9c9b9dc 100644 --- a/orte/tools/wrappers/Makefile.am +++ b/orte/tools/wrappers/Makefile.am @@ -20,7 +20,7 @@ man_pages = ortecc.1 ortec++.1 if !ORTE_DISABLE_FULL_SUPPORT -if OMPI_WANT_SCRIPT_WRAPPER_COMPILERS +if OPAL_WANT_SCRIPT_WRAPPER_COMPILERS bin_SCRIPTS = orte_wrapper_script CLEANFILES += $(bin_SCRIPTS) @@ -34,7 +34,7 @@ uninstall-local: rm -f $(DESTDIR)$(bindir)/ortecc \ $(DESTDIR)$(bindir)/ortec++ -else # OMPI_WANT_SCRIPT_WRAPPER_COMPILERS +else # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS if WANT_INSTALL_HEADERS @@ -58,7 +58,7 @@ uninstall-local: endif # OMPI_INSTALL_BINARIES endif # WANT_INSTALL_HEADERS -endif # OMPI_WANT_SCRIPT_WRAPPER_COMPILERS +endif # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS distclean-local: rm -f $(man_pages) diff --git a/orte/tools/wrappers/orte_wrapper_script.in b/orte/tools/wrappers/orte_wrapper_script.in index 3500615098..106479790e 100644 --- a/orte/tools/wrappers/orte_wrapper_script.in +++ b/orte/tools/wrappers/orte_wrapper_script.in @@ -12,8 +12,8 @@ use File::Basename; use File::Spec::Functions; -my $includedir = "@OMPI_WRAPPER_INCLUDEDIR@"; -my $libdir = "@OMPI_WRAPPER_LIBDIR@"; +my $includedir = "@ORTE_WRAPPER_INCLUDEDIR@"; +my $libdir = "@ORTE_WRAPPER_LIBDIR@"; # obey the OPAL_DESTDIR environment variable if (exists($ENV{'OPAL_DESTDIR'}) @@ -27,17 +27,13 @@ if (exists($ENV{'OPAL_DESTDIR'}) my $CC = "@CC@"; my $CXX = "@CXX@"; -#my $F77 = "@F77@"; -#my $FC = "@FC@"; my $extra_includes = "@ORTE_WRAPPER_EXTRA_INCLUDES@"; my $extra_cppflags = "@ORTE_WRAPPER_EXTRA_CPPFLAGS@"; my $extra_cflags = "@ORTE_WRAPPER_EXTRA_CFLAGS@"; my $extra_cxxflags = "@ORTE_WRAPPER_EXTRA_CXXFLAGS@"; -#my $extra_fflags = "@OMPI_WRAPPER_EXTRA_FFLAGS@"; my $extra_ldflags = "@ORTE_WRAPPER_EXTRA_LDFLAGS@"; my $extra_libs = "@ORTE_WRAPPER_EXTRA_LIBS@"; #my $cxx_lib = "@ORTE_WRAPPER_CXX_LIB@"; -#my $fc_module_flag = "@OMPI_FC_MODULE_FLAG@"; # Someone might want to fix for windows my $include_flag = "-I"; @@ -117,8 +113,6 @@ while (scalar(@args) > 0) { if ($arg eq "-showme") { $dry_run = 1; - } elsif ($arg eq "-lpmpi") { - $want_pmpi = 1; } else { if ($arg eq "-c") { $want_link = 0;