ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

cleanup BLCR configure so --without-blcr works correctly

Просмотр исходного кода 
This commit was SVN r18825.
Этот коммит содержится в:
Josh Hursey 2008-07-08 02:48:20 +00:00
родитель 83987fea75
Коммит 22f4c829ba
1 изменённых файлов: 69 добавлений и 57 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

62
opal/mca/crs/blcr/configure.m4
Просмотреть файл

@ -21,74 +21,84 @@ AC_DEFUN([MCA_crs_blcr_CONFIG],[
AC_ARG_WITH([blcr], AC_ARG_WITH([blcr],
[AC_HELP_STRING([--with-blcr], [AC_HELP_STRING([--with-blcr],
[Path to BLCR Installation])]) [Path to BLCR Installation])])
# If we don't want FT, don't compile this component # If we don't want FT, don't compile this component
check_crs_blcr_good="no"
AS_IF([test "$ompi_want_ft" = "1"], AS_IF([test "$ompi_want_ft" = "1"],
[crs_blcr_good="yes"], [check_crs_blcr_good="yes"],
[$2]) [$2])
AS_IF([test ! -z "$with_blcr" -a "$with_blcr" = "no"],[$2], [ AS_IF([test "$check_crs_blcr_good" = "yes" -a "$with_blcr" = "no"],
[check_crs_blcr_good="no"],
[check_crs_blcr_good="yes"
AS_IF([test ! -z "$with_blcr" -a "$with_blcr" != "yes"],
[check_crs_blcr_dir="$with_blcr"],
[check_crs_blcr_dir=""])])
AS_IF([test "$check_crs_blcr_good" != "yes"], [$2], [
crs_blcr_CFLAGS="$CFLAGS" crs_blcr_CFLAGS="$CFLAGS"
crs_blcr_CPPFLAGS="$CPPFLAGS" crs_blcr_CPPFLAGS="$CPPFLAGS"
crs_blcr_LDFLAGS="$LDFLAGS" crs_blcr_LDFLAGS="$LDFLAGS"
crs_blcr_LIBS="$LIBS" crs_blcr_LIBS="$LIBS"
AS_IF([test ! -z "$with_blcr" -a "$with_blcr" != "yes"], AS_IF([test ! -z "$with_blcr" -a "$with_blcr" != "yes"],
[CPPFLAGS="$CPPFLAGS -I$with_blcr/include" [CPPFLAGS="$CPPFLAGS -I$check_crs_blcr_dir/include"
LDFLAGS="$LDFLAGS -L$with_blcr/lib"]) LDFLAGS="$LDFLAGS -L$check_crs_blcr_dir/lib"])
AC_CHECK_HEADERS([libcr.h], AC_CHECK_HEADERS([libcr.h],
[AC_CHECK_LIB([cr], [AC_CHECK_LIB([cr],
[cr_init], [cr_init],
[crs_blcr_good="yes"], [check_crs_blcr_good="yes"],
[crs_blcr_good="no"])], [check_crs_blcr_good="no"])],
[crs_blcr_good="no"]) [check_crs_blcr_good="no"])
CFLAGS="$crs_blcr_CFLAGS" CFLAGS="$crs_blcr_CFLAGS"
CPPFLAGS="$crs_blcr_CPPFLAGS" CPPFLAGS="$crs_blcr_CPPFLAGS"
LDFLAGS="$crs_blcr_LDFLAGS" LDFLAGS="$crs_blcr_LDFLAGS"
LIBS="$crs_blcr_LIBS" LIBS="$crs_blcr_LIBS"
AS_IF([test "$crs_blcr_good" != "no"], AS_IF([test "$check_crs_blcr_good" != "yes"],
[AS_IF([test ! -z "$with_blcr"],
[AC_MSG_ERROR([BLCR support requested but not found. Perhaps you need to specify the location of the BLCR libraries.])])
$2],
[AS_IF([test ! -z "$with_blcr" -a "$with_blcr" != "yes"], [AS_IF([test ! -z "$with_blcr" -a "$with_blcr" != "yes"],
[crs_blcr_CFLAGS="`echo $CFLAGS | sed 's/-pedantic//g'`" [crs_blcr_CFLAGS="`echo $CFLAGS | sed 's/-pedantic//g'`"
crs_blcr_CFLAGS="`echo $crs_blcr_CFLAGS | sed 's/-Wundef//g'`" crs_blcr_CFLAGS="`echo $crs_blcr_CFLAGS | sed 's/-Wundef//g'`"
crs_blcr_CPPFLAGS="`echo $crs_blcr_CPPFLAGS | sed 's/-pedantic//g'`" crs_blcr_CPPFLAGS="`echo $crs_blcr_CPPFLAGS | sed 's/-pedantic//g'`"
crs_blcr_CPPFLAGS="`echo $crs_blcr_CPPFLAGS | sed 's/-Wundef//g'`" crs_blcr_CPPFLAGS="`echo $crs_blcr_CPPFLAGS | sed 's/-Wundef//g'`"
crs_blcr_CPPFLAGS="$crs_blcr_CPPFLAGS -I$with_blcr/include" crs_blcr_CPPFLAGS="$crs_blcr_CPPFLAGS -I$check_crs_blcr_dir/include"
crs_blcr_LDFLAGS="$crs_blcr_LDFLAGS -L$with_blcr/lib" crs_blcr_LDFLAGS="$crs_blcr_LDFLAGS -L$check_crs_blcr_dir/lib"
]) ])
crs_blcr_LIBS="$crs_blcr_LIBS -lcr"], crs_blcr_LIBS="$crs_blcr_LIBS -lcr"])
[AS_IF([test ! -z "$with_blcr"],
[AC_MSG_ERROR([BLCR support requested but not found. Perhaps you need to specify the location of the BLCR libraries.])])
$2])
# #
# Since BLCR libraries are not fully ISO99 C compliant # Since BLCR libraries are not fully ISO99 C compliant
# -pedantic and -Wundef raise a bunch of warnings, so # -pedantic and -Wundef raise a bunch of warnings, so
# we just strip them off for this component # we just strip them off for this component
# #
AS_IF([test "$crs_blcr_CFLAGS" != "$CFLAGS" -a "$crs_blcr_good" = "yes"], AS_IF([test "$crs_blcr_CFLAGS" != "$CFLAGS" -a "$check_crs_blcr_good" = "yes"],
[AC_MSG_WARN([Removed -pedantic and -Wundef from CFLAGS for blcr component because libcr.h is not really ANSI C])]) [AC_MSG_WARN([Removed -pedantic and -Wundef from CFLAGS for blcr component because libcr.h is not really ANSI C])])
]) ])
# If check worked, set wraper flags. # If check worked, set wraper flags.
# Evaluate suceed / fail # Evaluate suceed / fail
AS_IF([test "$crs_blcr_good" = "yes"], AS_IF([test "$check_crs_blcr_good" != "yes"], [$2],
[crs_blcr_WRAPPER_EXTRA_LDFLAGS="$crs_blcr_LDFLAGS" [crs_blcr_WRAPPER_EXTRA_LDFLAGS="$crs_blcr_LDFLAGS"
crs_blcr_WRAPPER_EXTRA_LIBS="$crs_blcr_LIBS" crs_blcr_WRAPPER_EXTRA_LIBS="$crs_blcr_LIBS"
crs_blcr_WRAPPER_EXTRA_CPPFLAGS="$crs_blcr_CPPFLAGS" crs_blcr_WRAPPER_EXTRA_CPPFLAGS="$crs_blcr_CPPFLAGS"
$1], $1])
[$2])
# #
# Check for version >= 0.6.0 which has: # Check for version >= 0.6.0 which has:
# - working cr_request_file # - working cr_request_file
# - 'requester' parameter to checkpoint_info # - 'requester' parameter to checkpoint_info
# #
AS_IF([test "$check_crs_blcr_good" != "yes"], [$2], [
prev_CPPFLAGS="$CPPFLAGS" prev_CPPFLAGS="$CPPFLAGS"
prev_LDFLAGS="$LDFLAGS" prev_LDFLAGS="$LDFLAGS"
CPPFLAGS="$CPPFLAGS -I$with_blcr/include" CPPFLAGS="$CPPFLAGS -I$check_crs_blcr_dir/include"
LDFLAGS="$LDFLAGS -L$with_blcr/lib" LDFLAGS="$LDFLAGS -L$check_crs_blcr_dir/lib"
crs_blcr_have_working_cr_request=0 crs_blcr_have_working_cr_request=0
AC_MSG_CHECKING(for BLCR working cr_request) AC_MSG_CHECKING(for BLCR working cr_request)
AC_TRY_COMPILE([#include <libcr.h>], AC_TRY_COMPILE([#include <libcr.h>],
@ -100,25 +110,26 @@ AC_DEFUN([MCA_crs_blcr_CONFIG],[
AC_MSG_RESULT([yes])], AC_MSG_RESULT([yes])],
[crs_blcr_have_working_cr_request=0 [crs_blcr_have_working_cr_request=0
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
AC_MSG_WARN([This BLCR version does not contain a known working version of cr_request])]) AC_MSG_WARN([This BLCR version does not contain a known working version of cr_request])
])
AC_DEFINE_UNQUOTED([CRS_BLCR_HAVE_CR_REQUEST], [$crs_blcr_have_working_cr_request], AC_DEFINE_UNQUOTED([CRS_BLCR_HAVE_CR_REQUEST], [$crs_blcr_have_working_cr_request],
[BLCR cr_request check]) [BLCR cr_request check])
crs_blcr_have_info_requester=0 crs_blcr_have_info_requester=0
AS_IF([test "$crs_blcr_good" = "yes"], AC_CHECK_MEMBER([struct cr_checkpoint_info.requester],
[AC_CHECK_MEMBER([struct cr_checkpoint_info.requester],
[crs_blcr_have_info_requester=1], [crs_blcr_have_info_requester=1],
[AC_MSG_WARN([This BLCR version does not contain a 'requester' member of the 'cr_checkpoint_info' struct])], [AC_MSG_WARN([This BLCR version does not contain a 'requester' member of the 'cr_checkpoint_info' struct])],
[#include <libcr.h>]) [#include <libcr.h>])
$1],
[$2])
AC_DEFINE_UNQUOTED([CRS_BLCR_HAVE_INFO_REQUESTER], [$crs_blcr_have_info_requester], AC_DEFINE_UNQUOTED([CRS_BLCR_HAVE_INFO_REQUESTER], [$crs_blcr_have_info_requester],
[BLCRs cr_checkpoint_info.requester member availability]) [BLCRs cr_checkpoint_info.requester member availability])
CPPFLAGS="$prev_CPPFLAGS" CPPFLAGS="$prev_CPPFLAGS"
LDFLAGS="$prev_LDFLAGS" LDFLAGS="$prev_LDFLAGS"
$1])
# #
AS_IF([test "$check_crs_blcr_good" != "yes"], [$2], [
AC_SUBST([crs_blcr_crs_blcr_WRAPPER_EXTRA_LDFLAGS]) AC_SUBST([crs_blcr_crs_blcr_WRAPPER_EXTRA_LDFLAGS])
AC_SUBST([crs_blcr_crs_blcr_WRAPPER_EXTRA_LIBS]) AC_SUBST([crs_blcr_crs_blcr_WRAPPER_EXTRA_LIBS])
AC_SUBST([crs_blcr_crs_blcr_WRAPPER_EXTRA_CPPFLAGS]) AC_SUBST([crs_blcr_crs_blcr_WRAPPER_EXTRA_CPPFLAGS])
@ -126,5 +137,6 @@ AC_DEFUN([MCA_crs_blcr_CONFIG],[
AC_SUBST([crs_blcr_CPPFLAGS]) AC_SUBST([crs_blcr_CPPFLAGS])
AC_SUBST([crs_blcr_LDFLAGS]) AC_SUBST([crs_blcr_LDFLAGS])
AC_SUBST([crs_blcr_LIBS]) AC_SUBST([crs_blcr_LIBS])
$1])
])dnl ])dnl