From 7a99e4f9746e0d5a449d6df4a012ca54b6df8c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Wed, 1 Feb 2012 10:26:04 +0000 Subject: [PATCH] fix openmpi/lam detection under Linux/UBUNTU fix -I in R interface. --- configure | 467 ++++++++++++++++++++++++-------------------------- configure.in | 139 +++++++-------- packages/real | 2 +- 3 files changed, 296 insertions(+), 312 deletions(-) diff --git a/configure b/configure index cf3f460d8..d55716fdf 100755 --- a/configure +++ b/configure @@ -4793,11 +4793,7 @@ fi # Check whether --with-mpi was given. if test "${with_mpi+set}" = set; then : withval=$with_mpi; if test "$withval" = yes; then - if test -e /usr/lib/openmpi; then - CPPFLAGS="$CPPFLAGS -I/usr/openmpi/include" - LDFLAGS="$LDFLAGS -L/usr/openmpi/lib" - fi - yap_cv_mpi=yes + yap_cv_mpi=yes elif test "$withval" = no; then yap_cv_mpi=no else @@ -4832,7 +4828,7 @@ fi # Check whether --with-lam was given. if test "${with_lam+set}" = set; then : withval=$with_lam; if test "$withval" = yes; then - yap_cv_lam=yes + yap_cv_lam=yes elif test "$withval" = no; then yap_cv_lam=no else @@ -4841,7 +4837,7 @@ if test "${with_lam+set}" = set; then : CPPFLAGS="$CPPFLAGS -I${yap_cv_lam}/include" fi else - yap_cv_lam=no + yap_cv_lam=yes fi @@ -6769,218 +6765,6 @@ else ENABLE_JPL="@#" fi -LAM_MPI_CC=${MPI_CC} -MPI_OBJS= -if test "$yap_cv_mpi" != "no" -then - OLD_CC=${CC} - CC=${MPI_CC} - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI_Init in -lmpi" >&5 -$as_echo_n "checking for MPI_Init in -lmpi... " >&6; } -if ${ac_cv_lib_mpi_MPI_Init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmpi $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char MPI_Init (); -int -main () -{ -return MPI_Init (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_mpi_MPI_Init=yes -else - ac_cv_lib_mpi_MPI_Init=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpi_MPI_Init" >&5 -$as_echo "$ac_cv_lib_mpi_MPI_Init" >&6; } -if test "x$ac_cv_lib_mpi_MPI_Init" = xyes; then : - $as_echo "#define HAVE_LIBMPI 1" >>confdefs.h - -else - $as_echo "#define HAVE_LIBMPI 0" >>confdefs.h - -fi - - if test "$ac_cv_lib_mpi_MPI_Init" = yes - then - #YAPMPILIB=YapMPI.a - MPI_OBJS=mpi.o - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI_Init in -lmpich" >&5 -$as_echo_n "checking for MPI_Init in -lmpich... " >&6; } -if ${ac_cv_lib_mpich_MPI_Init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmpich $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char MPI_Init (); -int -main () -{ -return MPI_Init (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_mpich_MPI_Init=yes -else - ac_cv_lib_mpich_MPI_Init=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpich_MPI_Init" >&5 -$as_echo "$ac_cv_lib_mpich_MPI_Init" >&6; } -if test "x$ac_cv_lib_mpich_MPI_Init" = xyes; then : - $as_echo "#define HAVE_LIBMPICH 1" >>confdefs.h - -else - $as_echo "#define HAVE_LIBMPICH 0" >>confdefs.h - -fi - - if test "$ac_cv_lib_mpich_MPI_Init" = yes - then - #YAPMPILIB=YapMPI.a - MPI_OBJS=mpi.o - else - #YAPMPILIB= - MPI_CC=${CC} - fi - fi - CC=${OLD_CC} -else -# MPI_CC=${MPI_CC} - MPI_CC=${CC} -fi - - -MPI_LIBS= -if test "$yap_cv_mpi" != "no" -a "$yap_cv_mpe" != "no" -then - OLD_CC=${CC} - CC=${MPI_CC} - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPE_Init_log in -lmpe" >&5 -$as_echo_n "checking for MPE_Init_log in -lmpe... " >&6; } -if ${ac_cv_lib_mpe_MPE_Init_log+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmpe $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char MPE_Init_log (); -int -main () -{ -return MPE_Init_log (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_mpe_MPE_Init_log=yes -else - ac_cv_lib_mpe_MPE_Init_log=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpe_MPE_Init_log" >&5 -$as_echo "$ac_cv_lib_mpe_MPE_Init_log" >&6; } -if test "x$ac_cv_lib_mpe_MPE_Init_log" = xyes; then : - $as_echo "#define HAVE_LIBMPE 1" >>confdefs.h - -else - $as_echo "#define HAVE_LIBMPE 0" >>confdefs.h - -fi - - if test "$ac_cv_lib_mpe_MPE_Init_log" = yes - then - MPI_LIBS="-lmpe" - MPI_OBJS="$MPI_OBJS mpe.o" - fi - CC=${OLD_CC} -fi - -OLD_CC=${CC} -CC=${LAM_MPI_CC} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -llam" >&5 -$as_echo_n "checking for main in -llam... " >&6; } -if ${ac_cv_lib_lam_main+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-llam $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_lam_main=yes -else - ac_cv_lib_lam_main=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lam_main" >&5 -$as_echo "$ac_cv_lib_lam_main" >&6; } -if test "x$ac_cv_lib_lam_main" = xyes; then : - LAMOBJS=yap_mpi."$SO" -else - LAMOBJS=no -fi - -CC=${OLD_CC} - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7824,6 +7608,225 @@ if test "$tabling" = "yes" then YAP_EXTRAS="$YAP_EXTRAS -DTABLING=1" fi + +LAM_MPI_CC=${MPI_CC} +if test "$yap_cv_lam" = "yes" ; then + if test -e /usr/lib/openmpi; then + CPPFLAGS="$CPPFLAGS -I/usr/lib/openmpi/include" + LDFLAGS="$LDFLAGS -L/usr/lib/openmpi/lib" + fi +fi +if test "$yap_cv_lam" != "no" ; then + OLD_CC=${CC} + CC=${LAM_MPI_CC} + ac_fn_c_check_header_mongrel "$LINENO" "mpi.h" "ac_cv_header_mpi_h" "$ac_includes_default" +if test "x$ac_cv_header_mpi_h" = xyes; then : + LAMOBJS=yap_mpi."$SO" +else + LAMOBJS="" +fi + + + CC=${OLD_CC} +fi + +MPI_OBJS= +if test "$yap_cv_mpi" != "no" +then + OLD_CC=${CC} + CC=${MPI_CC} + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI_Init in -lmpi" >&5 +$as_echo_n "checking for MPI_Init in -lmpi... " >&6; } +if ${ac_cv_lib_mpi_MPI_Init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmpi $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char MPI_Init (); +int +main () +{ +return MPI_Init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mpi_MPI_Init=yes +else + ac_cv_lib_mpi_MPI_Init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpi_MPI_Init" >&5 +$as_echo "$ac_cv_lib_mpi_MPI_Init" >&6; } +if test "x$ac_cv_lib_mpi_MPI_Init" = xyes; then : + $as_echo "#define HAVE_LIBMPI 1" >>confdefs.h + +else + $as_echo "#define HAVE_LIBMPI 0" >>confdefs.h + +fi + + if test "$ac_cv_lib_mpi_MPI_Init" = yes + then + #YAPMPILIB=YapMPI.a + MPI_OBJS=mpi.o + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI_Init in -lmpich" >&5 +$as_echo_n "checking for MPI_Init in -lmpich... " >&6; } +if ${ac_cv_lib_mpich_MPI_Init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmpich $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char MPI_Init (); +int +main () +{ +return MPI_Init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mpich_MPI_Init=yes +else + ac_cv_lib_mpich_MPI_Init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpich_MPI_Init" >&5 +$as_echo "$ac_cv_lib_mpich_MPI_Init" >&6; } +if test "x$ac_cv_lib_mpich_MPI_Init" = xyes; then : + $as_echo "#define HAVE_LIBMPICH 1" >>confdefs.h + +else + $as_echo "#define HAVE_LIBMPICH 0" >>confdefs.h + +fi + + if test "$ac_cv_lib_mpich_MPI_Init" = yes + then + #YAPMPILIB=YapMPI.a + MPI_OBJS=mpi.o + else + #YAPMPILIB= + MPI_CC=${CC} + fi + fi + for ac_header in mpi.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "mpi.h" "ac_cv_header_mpi_h" "$ac_includes_default" +if test "x$ac_cv_header_mpi_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MPI_H 1 +_ACEOF + +fi + +done + + CC=${OLD_CC} +else +# MPI_CC=${MPI_CC} + MPI_CC=${CC} +fi + + +MPI_LIBS= +if test "$yap_cv_mpi" != "no" -a "$yap_cv_mpe" != "no" +then + OLD_CC=${CC} + CC=${MPI_CC} + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPE_Init_log in -lmpe" >&5 +$as_echo_n "checking for MPE_Init_log in -lmpe... " >&6; } +if ${ac_cv_lib_mpe_MPE_Init_log+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmpe $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char MPE_Init_log (); +int +main () +{ +return MPE_Init_log (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mpe_MPE_Init_log=yes +else + ac_cv_lib_mpe_MPE_Init_log=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpe_MPE_Init_log" >&5 +$as_echo "$ac_cv_lib_mpe_MPE_Init_log" >&6; } +if test "x$ac_cv_lib_mpe_MPE_Init_log" = xyes; then : + $as_echo "#define HAVE_LIBMPE 1" >>confdefs.h + +else + $as_echo "#define HAVE_LIBMPE 0" >>confdefs.h + +fi + + if test "$ac_cv_lib_mpe_MPE_Init_log" = yes + then + MPI_LIBS="-lmpe" + MPI_OBJS="$MPI_OBJS mpe.o" + fi + for ac_header in mpe.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "mpe.h" "ac_cv_header_mpe_h" "$ac_includes_default" +if test "x$ac_cv_header_mpe_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MPE_H 1 +_ACEOF + +fi + +done + + CC=${OLD_CC} +fi + + + if test ! "$yap_cv_cplint" = "no" then if test ! "$yap_cv_cplint" = "yes" @@ -8130,7 +8133,7 @@ fi done -for ac_header in locale.h malloc.h math.h memory.h mpi.h +for ac_header in locale.h malloc.h math.h memory.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -8369,30 +8372,6 @@ fi done fi -for ac_header in mpi.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "mpi.h" "ac_cv_header_mpi_h" "$ac_includes_default" -if test "x$ac_cv_header_mpi_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_MPI_H 1 -_ACEOF - -fi - -done - -for ac_header in mpe.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "mpe.h" "ac_cv_header_mpe_h" "$ac_includes_default" -if test "x$ac_cv_header_mpe_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_MPE_H 1 -_ACEOF - -fi - -done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } diff --git a/configure.in b/configure.in index 97cc58fd5..12c06fd35 100755 --- a/configure.in +++ b/configure.in @@ -357,10 +357,6 @@ AC_ARG_WITH(mpi, [ --with-mpi[=DIR] use MPI library in DIR], if test "$withval" = yes; then dnl handle UBUNTU systems - if test -e /usr/lib/openmpi; then - CPPFLAGS="$CPPFLAGS -I/usr/openmpi/include" - LDFLAGS="$LDFLAGS -L/usr/openmpi/lib" - fi yap_cv_mpi=yes elif test "$withval" = no; then yap_cv_mpi=no @@ -388,7 +384,7 @@ AC_ARG_WITH(mpe, AC_ARG_WITH(lam, [ --with-lam[=DIR] use LAM MPI library in DIR], if test "$withval" = yes; then - yap_cv_lam=yes + yap_cv_lam=yes elif test "$withval" = no; then yap_cv_lam=no else @@ -396,7 +392,7 @@ AC_ARG_WITH(lam, LDFLAGS="$LDFLAGS -L${yap_cv_lam}/lib/lam" CPPFLAGS="$CPPFLAGS -I${yap_cv_lam}/include" fi, - [yap_cv_lam=no]) + [yap_cv_lam=yes]) AC_ARG_WITH(heap-space, [ --with-heap-space[=space] default heap size in Kbytes], @@ -773,7 +769,7 @@ elif test -e "$srcdir"/packages/real/Makefile.in ; then REAL_INCLUDES="$($REXE CMD config --cppflags | grep -v ^WARNING)" fi if test -n "$R_HOME" ; then - REAL_LIBS="-I$R_HOME/lib -lR" + REAL_LIBS="-L $R_HOME/lib -lR" elif test "$YAP_TARGET" = amd64 -a -d /usr/lib64/R/lib; then REAL_LIBS="-L /usr/lib64/R/lib -lR" elif test -d /usr/lib/R; then @@ -1023,63 +1019,6 @@ else ENABLE_JPL="@#" fi -LAM_MPI_CC=${MPI_CC} -MPI_OBJS= -if test "$yap_cv_mpi" != "no" -then - OLD_CC=${CC} - CC=${MPI_CC} - AC_CHECK_LIB(mpi,MPI_Init, - [AC_DEFINE(HAVE_LIBMPI, 1)], - [AC_DEFINE(HAVE_LIBMPI, 0)]) - if test "$ac_cv_lib_mpi_MPI_Init" = yes - then - #YAPMPILIB=YapMPI.a - MPI_OBJS=mpi.o - else - AC_CHECK_LIB(mpich,MPI_Init, - [AC_DEFINE(HAVE_LIBMPICH, 1)], - [AC_DEFINE(HAVE_LIBMPICH, 0)]) - if test "$ac_cv_lib_mpich_MPI_Init" = yes - then - #YAPMPILIB=YapMPI.a - MPI_OBJS=mpi.o - else - #YAPMPILIB= - MPI_CC=${CC} - fi - fi - CC=${OLD_CC} -else -# MPI_CC=${MPI_CC} - MPI_CC=${CC} -fi - - -MPI_LIBS= -if test "$yap_cv_mpi" != "no" -a "$yap_cv_mpe" != "no" -then - OLD_CC=${CC} - CC=${MPI_CC} - AC_CHECK_LIB(mpe,MPE_Init_log, - [AC_DEFINE(HAVE_LIBMPE, 1)], - [AC_DEFINE(HAVE_LIBMPE, 0)]) - if test "$ac_cv_lib_mpe_MPE_Init_log" = yes - then - MPI_LIBS="-lmpe" - MPI_OBJS="$MPI_OBJS mpe.o" - fi - CC=${OLD_CC} -fi - -dnl LAM -OLD_CC=${CC} -CC=${LAM_MPI_CC} -AC_CHECK_LIB([lam], [main], - LAMOBJS=yap_mpi."$SO", - LAMOBJS=no) -CC=${OLD_CC} - AC_PROG_CPP if test "$cross_compiling" = "yes" @@ -1515,6 +1454,74 @@ if test "$tabling" = "yes" then YAP_EXTRAS="$YAP_EXTRAS -DTABLING=1" fi +dnl LAM/MPI interface + +LAM_MPI_CC=${MPI_CC} +if test "$yap_cv_lam" = "yes" ; then + if test -e /usr/lib/openmpi; then + CPPFLAGS="$CPPFLAGS -I/usr/lib/openmpi/include" + LDFLAGS="$LDFLAGS -L/usr/lib/openmpi/lib" + fi +fi +if test "$yap_cv_lam" != "no" ; then + OLD_CC=${CC} + CC=${LAM_MPI_CC} + AC_CHECK_HEADER(mpi.h, LAMOBJS=yap_mpi."$SO", LAMOBJS="") + CC=${OLD_CC} +fi + +MPI_OBJS= +if test "$yap_cv_mpi" != "no" +then + OLD_CC=${CC} + CC=${MPI_CC} + AC_CHECK_LIB(mpi,MPI_Init, + [AC_DEFINE(HAVE_LIBMPI, 1)], + [AC_DEFINE(HAVE_LIBMPI, 0)]) + if test "$ac_cv_lib_mpi_MPI_Init" = yes + then + #YAPMPILIB=YapMPI.a + MPI_OBJS=mpi.o + else + AC_CHECK_LIB(mpich,MPI_Init, + [AC_DEFINE(HAVE_LIBMPICH, 1)], + [AC_DEFINE(HAVE_LIBMPICH, 0)]) + if test "$ac_cv_lib_mpich_MPI_Init" = yes + then + #YAPMPILIB=YapMPI.a + MPI_OBJS=mpi.o + else + #YAPMPILIB= + MPI_CC=${CC} + fi + fi + AC_CHECK_HEADERS(mpi.h) + CC=${OLD_CC} +else +# MPI_CC=${MPI_CC} + MPI_CC=${CC} +fi + + +MPI_LIBS= +if test "$yap_cv_mpi" != "no" -a "$yap_cv_mpe" != "no" +then + OLD_CC=${CC} + CC=${MPI_CC} + AC_CHECK_LIB(mpe,MPE_Init_log, + [AC_DEFINE(HAVE_LIBMPE, 1)], + [AC_DEFINE(HAVE_LIBMPE, 0)]) + if test "$ac_cv_lib_mpe_MPE_Init_log" = yes + then + MPI_LIBS="-lmpe" + MPI_OBJS="$MPI_OBJS mpe.o" + fi + AC_CHECK_HEADERS(mpe.h) + CC=${OLD_CC} +fi + + + if test ! "$yap_cv_cplint" = "no" then if test ! "$yap_cv_cplint" = "yes" @@ -1585,7 +1592,7 @@ AC_CHECK_HEADERS(arpa/inet.h alloca.h crypt.h) AC_CHECK_HEADERS(ctype.h direct.h dirent.h dlfcn.h) AC_CHECK_HEADERS(errno.h execinfo.h fcntl.h fenv.h) AC_CHECK_HEADERS(float.h fpu_control.h ieeefp.h io.h limits.h) -AC_CHECK_HEADERS(locale.h malloc.h math.h memory.h mpi.h) +AC_CHECK_HEADERS(locale.h malloc.h math.h memory.h) AC_CHECK_HEADERS(netdb.h netinet/in.h netinet/tcp.h pwd.h regex.h) AC_CHECK_HEADERS(siginfo.h signal.h stdarg.h stdint.h string.h stropts.h) AC_CHECK_HEADERS(sys/conf.h sys/dir.h sys/file.h) @@ -1615,8 +1622,6 @@ then AC_CHECK_HEADERS( readline/history.h) AC_CHECK_FUNCS( rl_completion_matches rl_clear_pending_input rl_cleanup_after_signal rl_event_hook rl_filename_completion_function rl_free_line_state rl_insert_close rl_set_prompt rl_state_initialized ) fi -AC_CHECK_HEADERS(mpi.h) -AC_CHECK_HEADERS(mpe.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE diff --git a/packages/real b/packages/real index c3f764047..2ed717695 160000 --- a/packages/real +++ b/packages/real @@ -1 +1 @@ -Subproject commit c3f764047ab22b08668eaa2e6b77ca11d6a6be1e +Subproject commit 2ed717695e1d71e864f943516473cacd3021f1f0