Commit d934514f authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Fix MPI detection logic if MPI compiler is passed as CXX

parent 8d08f5ed

build/Makefile.in

+0 −2
Original line number Diff line number Diff line
@@ -470,9 +470,7 @@ FFLAGS = @FFLAGS@ 
FGREP = @FGREP@

FILECMD = @FILECMD@

GREP = @GREP@

HDF5_INCLUDE = @HDF5_INCLUDE@

HDF5_LDFLAGS = @HDF5_LDFLAGS@

HDF5_LIB = @HDF5_LIB@

INSTALL = @INSTALL@

INSTALL_DATA = @INSTALL_DATA@

INSTALL_PROGRAM = @INSTALL_PROGRAM@

build/configure

+27 −22
Original line number Diff line number Diff line
@@ -669,8 +669,6 @@ OFFLOADFLAGS 
BUILDFORTRAN_FALSE

BUILDFORTRAN_TRUE

HDF5_LDFLAGS

HDF5_LIB

HDF5_INCLUDE

CXXCPP

LT_SYS_LIBRARY_PATH

OTOOL64
@@ -9460,8 +9458,6 @@ EOF 
      if test "x$CXX_IS_MPI" = "x0"; then

        MPIFLAGS=-DUSE_MPI













        MPIFLAGS=""



























      fi















    fi
























@@ -24832,26 +24828,35 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu









































# Environment setup













if test "x$HDF5_INCLUDE" = "x"













then :













  HDF5_INCLUDE="/usr/include/hdf5/serial"



























else case e in #(













  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: HDF5_INCLUDE=$(HDF5_INCLUDE)" >&5













printf "%s\n" "$as_me: HDF5_INCLUDE=$(HDF5_INCLUDE)" >&6;}













 ;;













esac













    export -p | grep HDF5_ROOT













    result=$?













    if test "x$result" = "x0"; then













      if test "x$HDF5_INCLUDE" = "x"; then













        export HDF5_INCLUDE=${HDF5_ROOT}/include













      fi













      if test "x$HDF5_LIB" = "x"; then













        export HDF5_LIB=${HDF5_ROOT}/lib













      fi













    fi













    export -p | grep HDF5_DIR













    result=$?













    if test "x$result" = "x0"; then













      if test "x$HDF5_INCLUDE" = "x"; then













        export HDF5_INCLUDE=${HDF5_DIR}/include













      fi













      if test "x$HDF5_LIB" = "x"; then













        export HDF5_LIB=${HDF5_DIR}/lib















      fi













if test "x$HDF5_LIB" = "x"













then :













  HDF5_LIB="/usr/lib/x86_64-linux-gnu/hdf5/serial"

























else case e in #(













  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: HDF5_LIB=$(HDF5_LIB)" >&5













printf "%s\n" "$as_me: HDF5_LIB=$(HDF5_LIB)" >&6;}













 ;;













esac















    fi













    if test "x$HDF5_INCLUDE" = "x"; then













      export HDF5_INCLUDE="/usr/include/hdf5/serial"













    fi













    if test "x$HDF5_LIB" = "x"; then













      export HDF5_LIB="/usr/lib/x86_64-linux-gnu/hdf5/serial"













    fi





















































# Check for required headers















as_ac_Header=`printf "%s\n" "ac_cv_header_$HDF5_INCLUDE/hdf5.h" | sed "$as_sed_sh"`

























build/configure.ac



+33
−11




























Original line number
Diff line number
Diff line








@@ -19,6 +19,38 @@ EOF













  ]















)





























m4_define(













  [M4_DETECT_HDF5],













  [













    export -p | grep HDF5_ROOT













    result=$?













    if test "x$result" = "x0"; then













      if test "x$HDF5_INCLUDE" = "x"; then













        export HDF5_INCLUDE=${HDF5_ROOT}/include













      fi













      if test "x$HDF5_LIB" = "x"; then













        export HDF5_LIB=${HDF5_ROOT}/lib













      fi













    fi













    export -p | grep HDF5_DIR













    result=$?













    if test "x$result" = "x0"; then













      if test "x$HDF5_INCLUDE" = "x"; then













        export HDF5_INCLUDE=${HDF5_DIR}/include













      fi













      if test "x$HDF5_LIB" = "x"; then













        export HDF5_LIB=${HDF5_DIR}/lib













      fi













    fi













    if test "x$HDF5_INCLUDE" = "x"; then













      export HDF5_INCLUDE="/usr/include/hdf5/serial"













    fi













    if test "x$HDF5_LIB" = "x"; then













      export HDF5_LIB="/usr/lib/x86_64-linux-gnu/hdf5/serial"













    fi













  ]













)





























m4_define(















  [M4_DETECT_LAPACK],















  [










@@ -198,7 +230,6 @@ AC_ARG_ENABLE(













      M4_TEST_MPI















      if test "x$CXX_IS_MPI" = "x0"; then















        AC_SUBST([MPIFLAGS], [-DUSE_MPI])













        AC_SUBST([MPIFLAGS], [""])















      fi















    fi















  ]









@@ -217,16 +248,7 @@ AS_IF(













LT_INIT































# Environment setup













AS_IF(













  [test "x$HDF5_INCLUDE" = "x"],













  [AC_SUBST([HDF5_INCLUDE], ["/usr/include/hdf5/serial"])],













  [AC_MSG_NOTICE([HDF5_INCLUDE=$(HDF5_INCLUDE)])]













)













AS_IF(













  [test "x$HDF5_LIB" = "x"],













  [AC_SUBST([HDF5_LIB], ["/usr/lib/x86_64-linux-gnu/hdf5/serial"])],













  [AC_MSG_NOTICE([HDF5_LIB=$(HDF5_LIB)])]













)













M4_DETECT_HDF5































# Check for required headers















AC_CHECK_HEADER(