diff options
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
3 files changed, 7 insertions, 7 deletions
@@ -1673,8 +1673,8 @@ EOF EOF PARALLEL_SRC='$(PARALLEL_SRC)' - CFLAGS="$CFLAGS -I/foo/bar/parallel/include" - CFLAGS="$CFLAGS -L/foo/bar/parallel/lib" + CFLAGS="$CFLAGS $MPI_INC" + CFLAGS="$CFLAGS $MPI_LIB" echo $ac_n "checking for main in -lmpi""... $ac_c" 1>&6 echo "configure:1680: checking for main in -lmpi" >&5 ac_lib_var=`echo mpi'_'main | sed 'y%./+-%__p_%'` @@ -1759,7 +1759,7 @@ EOF else echo "$ac_t""no" 1>&6 fi - RUNTEST=mpirun + RUNTEST='mpirun -np 1' ;; *) diff --git a/configure.in b/configure.in index 36951cb..ff1ed70 100644 --- a/configure.in +++ b/configure.in @@ -151,11 +151,11 @@ case "X-$PARALLEL" in AC_DEFINE(PHDF5) dnl THIS WILL GO AWAY SHORTLY!!! AC_DEFINE(HAVE_PARALLEL) PARALLEL_SRC='$(PARALLEL_SRC)' - CFLAGS="$CFLAGS -I/foo/bar/parallel/include" - CFLAGS="$CFLAGS -L/foo/bar/parallel/lib" + CFLAGS="$CFLAGS $MPI_INC" + CFLAGS="$CFLAGS $MPI_LIB" AC_CHECK_LIB(mpi,main) dnl Replace `main' with some function AC_CHECK_LIB(mpio,main) dnl Replace `main' with some function - RUNTEST=mpirun + RUNTEST='mpirun -np 1' ;; *) diff --git a/src/Makefile.in b/src/Makefile.in index 66af462..44fa037 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -46,7 +46,7 @@ PRIVATE_HDR=H5private.h H5Aprivate.h H5ACprivate.h H5Bprivate.h \ # Number format detection H5Tinit.c: H5detect - ./H5detect >H5Tinit.c + $(RUNTEST) ./H5detect >H5Tinit.c H5detect: H5detect.o $(CC) $(CFLAGS) -o $@ H5detect.o |