1 --- parallel-netcdf-1.9.0/acinclude.m4.orig 2017-10-28 19:09:38.000000000 +0200
2 +++ parallel-netcdf-1.9.0/acinclude.m4 2018-05-09 21:20:18.207727703 +0200
7 -dnl ac_try='$F90 ${F90FLAGS} conftest.f90 ${F90LIBS}>&AS_MESSAGE_LOG_FD'
8 +dnl ac_try='$F90 ${F90FLAGS} conftest.f90 ${F90LIBS} >AS_MESSAGE_LOG_FD 2>&1'
9 dnl AC_TRY_EVAL(ac_try)
10 if test -f conftest.${FC_MODEXT} ; then
11 ac_cv_prog_f90_uppercase_mod=no
13 AC_DEFUN([UD_CHECK_PGF77],[
14 AC_CACHE_CHECK([if Fortran 77 compiler is pgf77], [ac_cv_fc_compiler_pgf77],
15 [ac_cv_fc_compiler_pgf77=no
16 - eval $MPIF77 -V </dev/null >& conftest.ver
17 + eval $MPIF77 -V </dev/null >conftest.ver 2>&1
18 _F77_VENDOR=`head -c 5 conftest.ver`
19 if test "x${_F77_VENDOR}" = xpgf77 ; then
20 ac_cv_fc_compiler_pgf77=yes
22 AC_DEFUN([UD_CHECK_FC_NAG],[
23 AC_CACHE_CHECK([if Fortran compiler is NAG], [ac_cv_fc_compiler_nag],
24 [ac_cv_fc_compiler_nag=no
25 - eval $MPIF90 -V </dev/null >& conftest.ver
26 + eval $MPIF90 -V </dev/null >conftest.ver 2>&1
27 _FC_VENDOR=`head -c 3 conftest.ver`
28 if test "x${_FC_VENDOR}" = xNAG ; then
29 ac_cv_fc_compiler_nag=yes
30 --- parallel-netcdf-1.9.0/configure.ac.orig 2017-12-18 23:30:28.000000000 +0100
31 +++ parallel-netcdf-1.9.0/configure.ac 2018-05-10 20:54:44.283425349 +0200
33 CANDIDATE_MPIF90="${MPIF90} mpif90"
35 dnl add IBM MPI compilers
36 -CANDIDATE_MPICC+=" mpcc_r mpcc mpixlc_r mpixlc"
37 -CANDIDATE_MPICXX+=" mpCC_r mpCC mpixlcxx_r mpixlcxx mpixlC_r mpixlC"
38 -CANDIDATE_MPIF77+=" mpixlf77_r mpixlf77"
39 -CANDIDATE_MPIF90+=" mpixlf90_r mpixlf90"
40 +CANDIDATE_MPICC="$CANDIDATE_MPICC mpcc_r mpcc mpixlc_r mpixlc"
41 +CANDIDATE_MPICXX="$CANDIDATE_MPICXX mpCC_r mpCC mpixlcxx_r mpixlcxx mpixlC_r mpixlC"
42 +CANDIDATE_MPIF77="$CANDIDATE_MPIF77 mpixlf77_r mpixlf77"
43 +CANDIDATE_MPIF90="$CANDIDATE_MPIF90 mpixlf90_r mpixlf90"
45 dnl add IBM BGL MPI compilers
46 -CANDIDATE_MPICC+=" blrts_xlc mpxlc_r mpxlc"
47 -CANDIDATE_MPICXX+=" blrts_xlC mpxlC_r mpxlC"
48 -CANDIDATE_MPIF77+=" blrts_xlf mpxlf_r mpxlf"
49 -CANDIDATE_MPIF90+=" blrts_xlf90 mpxlf90_r mpxlf90 mpxlf95_r mpxlf95"
50 +CANDIDATE_MPICC="$CANDIDATE_MPICC blrts_xlc mpxlc_r mpxlc"
51 +CANDIDATE_MPICXX="$CANDIDATE_MPICXX blrts_xlC mpxlC_r mpxlC"
52 +CANDIDATE_MPIF77="$CANDIDATE_MPIF77 blrts_xlf mpxlf_r mpxlf"
53 +CANDIDATE_MPIF90="$CANDIDATE_MPIF90 blrts_xlf90 mpxlf90_r mpxlf90 mpxlf95_r mpxlf95"
55 dnl add Fujitsu MPI compilers
56 -CANDIDATE_MPICC+=" mpifccpx"
57 -CANDIDATE_MPICXX+=" mpiFCCpx"
58 -CANDIDATE_MPIF77+=" mpifrtpx"
59 -CANDIDATE_MPIF90+=" mpifrtpx"
60 +CANDIDATE_MPICC="$CANDIDATE_MPICC mpifccpx"
61 +CANDIDATE_MPICXX="$CANDIDATE_MPICXX mpiFCCpx"
62 +CANDIDATE_MPIF77="$CANDIDATE_MPIF77 mpifrtpx"
63 +CANDIDATE_MPIF90="$CANDIDATE_MPIF90 mpifrtpx"
65 dnl add Cray MPI compiler wrappers
66 -CANDIDATE_MPICC+=" cc"
67 -CANDIDATE_MPICXX+=" CC"
68 -CANDIDATE_MPIF77+=" ftn"
69 -CANDIDATE_MPIF90+=" ftn"
70 +CANDIDATE_MPICC="$CANDIDATE_MPICC cc"
71 +CANDIDATE_MPICXX="$CANDIDATE_MPICXX CC"
72 +CANDIDATE_MPIF77="$CANDIDATE_MPIF77 ftn"
73 +CANDIDATE_MPIF90="$CANDIDATE_MPIF90 ftn"
75 dnl add Intel MPI compiler wrappers
76 -CANDIDATE_MPICC+=" mpiicc icc"
77 -CANDIDATE_MPICXX+=" mpiicpc icpc"
78 -CANDIDATE_MPIF77+=" mpiifort mpiifc ifort"
79 -CANDIDATE_MPIF90+=" mpiifort mpiifc ifort"
80 +CANDIDATE_MPICC="$CANDIDATE_MPICC mpiicc icc"
81 +CANDIDATE_MPICXX="$CANDIDATE_MPICXX mpiicpc icpc"
82 +CANDIDATE_MPIF77="$CANDIDATE_MPIF77 mpiifort mpiifc ifort"
83 +CANDIDATE_MPIF90="$CANDIDATE_MPIF90 mpiifort mpiifc ifort"
85 dnl find the full path of MPICC from CANDIDATE_MPICC and MPI_INSTALL
86 if test "x${ac_user_MPICC}" = x ; then
88 ERR_MSG="Specified MPI C compiler \"$ac_user_MPICC\" cannot be found"
90 if test "x$MPI_INSTALL" != x ; then
91 - ERR_MSG+=" under $MPI_INSTALL"
92 + ERR_MSG="$ERR_MSG under $MPI_INSTALL"
95 -----------------------------------------------------------------------
97 ERR_MSG="Specified MPI C++ compiler \"$ac_user_MPICXX\" cannot be found"
99 if test "x$MPI_INSTALL" != x ; then
100 - ERR_MSG+=" under $MPI_INSTALL"
101 + ERR_MSG="$ERR_MSG under $MPI_INSTALL"
103 if test "x${enable_cxx}" = xyes ; then
104 dnl --enable-cxx is explicitly set at command line
107 if test "x${enable_strict}" = xyes; then
108 if test "x${GCC}" = xyes; then
109 - CFLAGS+=" -Wall -Wstrict-prototypes -Wmissing-prototypes -Wundef -Wpointer-arith -Wbad-function-cast"
110 + CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wundef -Wpointer-arith -Wbad-function-cast"
112 AC_MSG_WARN([--enable-strict is for GNU compiler only])
115 ERR_MSG="Specified MPI Fortran 77 compiler \"$ac_user_MPIF77\" cannot be found"
117 if test "x$MPI_INSTALL" != x ; then
118 - ERR_MSG+=" under $MPI_INSTALL"
119 + ERR_MSG="$ERR_MSG under $MPI_INSTALL"
121 if test "x${enable_fortran}" = xyes ; then
122 dnl --enable-fortran is explicitly set at command line
124 ERR_MSG="Specified MPI Fortran 90 compiler \"$ac_user_MPIF90\" cannot be found"
126 if test "x$MPI_INSTALL" != x ; then
127 - ERR_MSG+=" under $MPI_INSTALL"
128 + ERR_MSG="$ERR_MSG under $MPI_INSTALL"
130 if test "x${enable_fortran}" = xyes ; then
131 dnl --enable-fortran is explicitly set at command line
133 if test "x${has_fortran}" = xyes ; then
134 if test "x${enable_strict}" = xyes && test "x${GFC}" = xyes; then
135 dnl not all Fortran compilers recognize -Wall
138 + FFLAGS="$FFLAGS -Wall"
139 + FCFLAGS="$FCFLAGS -Wall"
143 @@ -746,14 +746,14 @@
144 if test "x${ac_cv_fc_compiler_nag}" = xyes ; then
145 dnl Add -mismatch if they are not set by users
146 if ! echo "${FFLAGS}" | ${EGREP} -q -- "-mismatch" ; then
147 - FFLAGS+=" -mismatch"
148 + FFLAGS="$FFLAGS -mismatch"
150 if ! echo "${FCFLAGS}" | ${EGREP} -q -- "-mismatch" ; then
151 - FCFLAGS+=" -mismatch"
152 + FCFLAGS="$FCFLAGS -mismatch"
155 - FFLAGS+=" -DNAGFortran"
156 - FCFLAGS+=" -DNAGFortran"
157 + FFLAGS="$FFLAGS -DNAGFortran"
158 + FCFLAGS="$FCFLAGS -DNAGFortran"
161 dnl check Fortran parameter modifier for 8-byte integer type
166 -M4FLAGS+=" -DPNETCDF"
167 -M4FFLAGS+=" -DPNETCDF"
168 +M4FLAGS="$M4FLAGS -DPNETCDF"
169 +M4FFLAGS="$M4FFLAGS -DPNETCDF"
171 dnl AM_PROG_AR is first recognized/traced in autoconf 2.68
172 dnl Use it only if we want support for unusual archivers such as Microsoft
173 @@ -1249,31 +1249,31 @@
174 dnl remove all -O and -fast flags
175 dnl add -O0 to all flags
176 if ! echo "${CFLAGS}" | ${EGREP} -q -- "-g" ; then
178 + CFLAGS="$CFLAGS -g"
180 CFLAGS=`echo $CFLAGS | sed 's/-O. *//g' | sed 's/-fast *//g'`
182 + CFLAGS="$CFLAGS -O0"
184 if test "x${has_mpicxx}" = xyes ; then
185 if ! echo "${CXXFLAGS}" | ${EGREP} -q -- "-g" ; then
187 + CXXFLAGS="$CXXFLAGS -g"
189 CXXFLAGS=`echo $CXXFLAGS | sed 's/-O. *//g' | sed 's/-fast *//g'`
191 + CXXFLAGS="$CXXFLAGS -O0"
194 if test "x${has_fortran}" = xyes ; then
195 if ! echo "${FFLAGS}" | ${EGREP} -q -- "-g" ; then
197 + FFLAGS="$FFLAGS -g"
199 if ! echo "${FCFLAGS}" | ${EGREP} -q -- "-g" ; then
201 + FCFLAGS="$FCFLAGS -g"
204 FFLAGS=`echo $FFLAGS | sed 's/-O. *//g' | sed 's/-fast *//g'`
205 FCFLAGS=`echo $FCFLAGS | sed 's/-O. *//g' | sed 's/-fast *//g'`
208 + FFLAGS="$FFLAGS -O0"
209 + FCFLAGS="$FCFLAGS -O0"
213 @@ -1394,7 +1394,7 @@
214 dnl set default to "mpiexec -n NP"
215 UD_MPI_PATH_PROGS([TESTMPIRUN], [mpiexec mpirun srun])
216 if test "x${TESTMPIRUN}" != x ; then
217 - TESTMPIRUN+=" -n NP"
218 + TESTMPIRUN="$TESTMPIRUN -n NP"