diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2002-06-25 21:25:51 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2002-06-25 21:25:51 (GMT) |
| commit | 80b47a7f585457720150be5dc817645d6bde662a (patch) | |
| tree | 86fd04667bab33f3e6d21200126643597b1d4c41 /fortran | |
| parent | f99e630ccbc0fd7566888d8fe77654d2dee6282c (diff) | |
| download | hdf5-80b47a7f585457720150be5dc817645d6bde662a.zip hdf5-80b47a7f585457720150be5dc817645d6bde662a.tar.gz hdf5-80b47a7f585457720150be5dc817645d6bde662a.tar.bz2 | |
[svn-r5710] Purpose:
Bug Fix
Description:
Was nulling out the RUNPARALLEL and other macros which shouldn't be
nulled out.
Solution:
Removed the code which does the nulling out of those macros.
Diffstat (limited to 'fortran')
| -rwxr-xr-x | fortran/configure | 8 | ||||
| -rw-r--r-- | fortran/configure.in | 24 |
2 files changed, 19 insertions, 13 deletions
diff --git a/fortran/configure b/fortran/configure index c35ca66..65cb7b0 100755 --- a/fortran/configure +++ b/fortran/configure @@ -8072,10 +8072,10 @@ ac_link='${F9X-f90} -o conftest${ac_exeext} $FFLAGS conftest.$ac_ext $LDFLAGS $L cross_compiling=$ac_cv_prog_f9x_cross - PARALLEL="" - RUNSERIAL="" - RUNPARALLEL="" - TESTPARALLEL="" + + + + case "$F9X" in mpif90) diff --git a/fortran/configure.in b/fortran/configure.in index b0bc27d..2b20b64 100644 --- a/fortran/configure.in +++ b/fortran/configure.in @@ -1,10 +1,16 @@ -dnl ---------------------------------------------------------------------- dnl Process this file with autoconf to produce configure. dnl -dnl Copyright (C) 2000, 2001, 2002 -dnl National Center for Supercomputing Applications. -dnl All rights reserved. -dnl ---------------------------------------------------------------------- +dnl Copyright by the Board of Trustees of the University of Illinois. +dnl All rights reserved. +dnl +dnl This file is part of HDF5. The full HDF5 copyright notice, including +dnl terms governing use, modification, and redistribution, is contained in +dnl the files COPYING and Copyright.html. COPYING can be found at the root +dnl of the source code distribution tree; Copyright.html can be found at the +dnl root level of an installed copy of the electronic HDF5 document set and +dnl is linked from the top-level documents page. It can also be found at +dnl http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have +dnl access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. dnl ---------------------------------------------------------------------- dnl Initialize configure. @@ -435,10 +441,10 @@ dnl protect the expansion until make executes the dnl command). The value of this variable is dnl substituted in *.in files. dnl -AC_SUBST(PARALLEL) PARALLEL="" -AC_SUBST(RUNSERIAL) RUNSERIAL="" -AC_SUBST(RUNPARALLEL) RUNPARALLEL="" -AC_SUBST(TESTPARALLEL) TESTPARALLEL="" +AC_SUBST(PARALLEL) +AC_SUBST(RUNSERIAL) +AC_SUBST(RUNPARALLEL) +AC_SUBST(TESTPARALLEL) dnl ---------------------------------------------------------------------- dnl If the compiler is obviously a parallel compiler then we're building |