diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-08-13 17:53:23 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-08-13 17:53:23 (GMT) |
| commit | 33d5f5d1e8f66b9ed6112744c03d546e95fb3022 (patch) | |
| tree | 5b120f7e81c13d72c67b17829168d4b58932c905 /configure.ac | |
| parent | 8b2f7c2183f2c60ace5750995befdfb080fc064a (diff) | |
| download | hdf5-33d5f5d1e8f66b9ed6112744c03d546e95fb3022.zip hdf5-33d5f5d1e8f66b9ed6112744c03d546e95fb3022.tar.gz hdf5-33d5f5d1e8f66b9ed6112744c03d546e95fb3022.tar.bz2 | |
[svn-r24004] HDFFV-8319 and -8321: Cleanup autotools code.
Also remove GetConsoleScreenInfo check from cygwin configure.
Tested: h5committest
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 0142353..7cfb3ff 100644 --- a/configure.ac +++ b/configure.ac @@ -433,14 +433,6 @@ if test "X$HDF_FORTRAN" = "Xyes"; then AC_SUBST([OBJECT_NAMELEN_DEFAULT_F]) ## -------------------------------------------------------------------- - ## General Fortran flags - ## Only add FFLAGS to FCFLAGS if it's set. - if test "x$FFLAGS" != "x" ; then - AM_FCFLAGS="${AM_FCFLAGS} ${FFLAGS}" - FCFLAGS="${FCFLAGS} ${FFLAGS}" - fi - - ## -------------------------------------------------------------------- ## Fortran source extention ## AC_FC_SRCEXT([f90]) @@ -2156,7 +2148,14 @@ AC_TRY_COMPILE([ ## ---------------------------------------------------------------------- ## How do we figure out the width of a tty in characters? ## -AC_CHECK_FUNCS([_getvideoconfig gettextinfo GetConsoleScreenBufferInfo]) +AC_CHECK_FUNCS([_getvideoconfig gettextinfo]) +case "`uname`" in + CYGWIN*) + ;; + *) + AC_CHECK_FUNCS([GetConsoleScreenBufferInfo]) + ;; +esac AC_CHECK_FUNCS([_scrsize ioctl]) AC_MSG_CHECKING([for struct videoconfig]) @@ -2716,10 +2715,7 @@ case "X-$enable_parallel" in integer:: ierr call mpi_file_open( ierr ) end],, - [AC_CHECK_LIB([mpi], [ - include 'mpif.h' - integer:: ierr - call mpi_file_open( ierr )],, [PARALLEL=no])]) + [AC_CHECK_LIB([mpi], [mpi_file_open],, [PARALLEL=no])]) ## Then try link a simple MPI-IO program. If fail, try again with ## -lmpio. @@ -2730,10 +2726,7 @@ case "X-$enable_parallel" in integer:: ierr call mpi_file_open( ierr ) end],, - [AC_CHECK_LIB([mpio], [ - include 'mpif.h' - integer:: ierr - call mpi_file_open( ierr )],, [PARALLEL=no])]) + [AC_CHECK_LIB([mpio], [mpi_file_open],, [PARALLEL=no])]) fi ## Change to the C language |