1 --- pnetcdf-1.11.0/acinclude.m4.orig 2018-12-04 20:00:32.000000000 +0100
2 +++ pnetcdf-1.11.0/acinclude.m4 2019-04-05 17:40:21.300100012 +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_XLC],[
14 AC_CACHE_CHECK([if C compiler is IBM XLC], [ac_cv_cc_compiler_xlc],
15 [ac_cv_cc_compiler_xlc=no
16 - ac_XLC_VER=`$MPICC -qversion >& conftest.ver`
17 + ac_XLC_VER=`$MPICC -qversion >conftest.ver 2>&1`
18 ac_XLC_VENDOR=`head -c 6 conftest.ver`
19 if test "x${ac_XLC_VENDOR}" = "xIBM XL" ; then
20 ac_cv_cc_compiler_xlc=yes
22 AC_DEFUN([UD_CHECK_PGF77],[
23 AC_CACHE_CHECK([if Fortran 77 compiler is pgf77], [ac_cv_fc_compiler_pgf77],
24 [ac_cv_fc_compiler_pgf77=no
25 - eval $MPIF77 -V </dev/null >& conftest.ver
26 + eval $MPIF77 -V </dev/null >conftest.ver 2>&1
27 ac_F77_VENDOR=`head -c 5 conftest.ver`
28 if test "x${ac_F77_VENDOR}" = xpgf77 ; then
29 ac_cv_fc_compiler_pgf77=yes
30 --- pnetcdf-1.11.0/configure.ac.orig 2018-12-17 00:49:20.000000000 +0100
31 +++ pnetcdf-1.11.0/configure.ac 2019-04-05 17:45:03.191906207 +0200
33 CANDIDATE_MPIF90="${MPIF90} mpif90 mpif90_r mpf90 mpf90_r mpif95 mpif95_r mpf95 mpf95_r"
35 dnl add GNU MPI compilers
36 -CANDIDATE_MPICC+=" mpigcc mpgcc mpigcc_r mpgcc_r"
37 -CANDIDATE_MPICXX+=" mpig++ mpg++ mpig++_r mpg++_r"
38 -CANDIDATE_MPIF77+=" mpig77 mpig77_r mpg77 mpg77_r"
39 -CANDIDATE_MPIF90+=" mpigfortran mpgfortran mpigfortran_r mpgfortran_r"
40 +CANDIDATE_MPICC="$CANDIDATE_MPICC mpigcc mpgcc mpigcc_r mpgcc_r"
41 +CANDIDATE_MPICXX="$CANDIDATE_MPICXX mpig++ mpg++ mpig++_r mpg++_r"
42 +CANDIDATE_MPIF77="$CANDIDATE_MPIF77 mpig77 mpig77_r mpg77 mpg77_r"
43 +CANDIDATE_MPIF90="$CANDIDATE_MPIF90 mpigfortran mpgfortran mpigfortran_r mpgfortran_r"
45 dnl add IBM MPI compilers
46 -CANDIDATE_MPICC+=" mpcc_r mpcc mpixlc_r mpixlc"
47 -CANDIDATE_MPICXX+=" mpCC_r mpCC mpixlcxx_r mpixlcxx mpixlC_r mpixlC"
48 -CANDIDATE_MPIF77+=" mpixlf77_r mpixlf77"
49 -CANDIDATE_MPIF90+=" mpixlf90_r mpixlf90"
50 +CANDIDATE_MPICC="$CANDIDATE_MPICC mpcc_r mpcc mpixlc_r mpixlc"
51 +CANDIDATE_MPICXX="$CANDIDATE_MPICXX mpCC_r mpCC mpixlcxx_r mpixlcxx mpixlC_r mpixlC"
52 +CANDIDATE_MPIF77="$CANDIDATE_MPIF77 mpixlf77_r mpixlf77"
53 +CANDIDATE_MPIF90="$CANDIDATE_MPIF90 mpixlf90_r mpixlf90"
55 dnl add IBM BGL MPI compilers
56 -CANDIDATE_MPICC+=" blrts_xlc mpxlc_r mpxlc"
57 -CANDIDATE_MPICXX+=" blrts_xlC mpxlC_r mpxlC mpixlc++ mpxlcxx mpxlc++ mpxlCC mpixlc++_r mpxlcxx_r mpxlc++_r mpxlCC_r"
58 -CANDIDATE_MPIF77+=" blrts_xlf mpxlf_r mpxlf mpxlf77 mpxlf77_r mpixlf mpixlf_r"
59 -CANDIDATE_MPIF90+=" blrts_xlf90 mpxlf90_r mpxlf90 mpxlf95_r mpxlf95 mpixlf95 mpixlf95_r"
60 +CANDIDATE_MPICC="$CANDIDATE_MPICC blrts_xlc mpxlc_r mpxlc"
61 +CANDIDATE_MPICXX="$CANDIDATE_MPICXX blrts_xlC mpxlC_r mpxlC mpixlc++ mpxlcxx mpxlc++ mpxlCC mpixlc++_r mpxlcxx_r mpxlc++_r mpxlCC_r"
62 +CANDIDATE_MPIF77="$CANDIDATE_MPIF77 blrts_xlf mpxlf_r mpxlf mpxlf77 mpxlf77_r mpixlf mpixlf_r"
63 +CANDIDATE_MPIF90="$CANDIDATE_MPIF90 blrts_xlf90 mpxlf90_r mpxlf90 mpxlf95_r mpxlf95 mpixlf95 mpixlf95_r"
65 dnl add Fujitsu MPI compilers
66 -CANDIDATE_MPICC+=" mpifccpx"
67 -CANDIDATE_MPICXX+=" mpiFCCpx"
68 -CANDIDATE_MPIF77+=" mpifrtpx"
69 -CANDIDATE_MPIF90+=" mpifrtpx"
70 +CANDIDATE_MPICC="$CANDIDATE_MPICC mpifccpx"
71 +CANDIDATE_MPICXX="$CANDIDATE_MPICXX mpiFCCpx"
72 +CANDIDATE_MPIF77="$CANDIDATE_MPIF77 mpifrtpx"
73 +CANDIDATE_MPIF90="$CANDIDATE_MPIF90 mpifrtpx"
75 dnl add Cray MPI compiler wrappers
76 -CANDIDATE_MPICC+=" cc"
77 -CANDIDATE_MPICXX+=" CC"
78 -CANDIDATE_MPIF77+=" ftn"
79 -CANDIDATE_MPIF90+=" ftn"
80 +CANDIDATE_MPICC="$CANDIDATE_MPICC cc"
81 +CANDIDATE_MPICXX="$CANDIDATE_MPICXX CC"
82 +CANDIDATE_MPIF77="$CANDIDATE_MPIF77 ftn"
83 +CANDIDATE_MPIF90="$CANDIDATE_MPIF90 ftn"
85 dnl add Intel MPI compiler wrappers
86 -CANDIDATE_MPICC+=" mpiicc icc"
87 -CANDIDATE_MPICXX+=" mpiicpc mpiicxx mpiic++ mpiiCC icpc"
88 -CANDIDATE_MPIF77+=" mpiifort mpiifc mpiif77 ifort"
89 -CANDIDATE_MPIF90+=" mpiifort mpiifc mpiif95 mpiif90 ifort"
90 +CANDIDATE_MPICC="$CANDIDATE_MPICC mpiicc icc"
91 +CANDIDATE_MPICXX="$CANDIDATE_MPICXX mpiicpc mpiicxx mpiic++ mpiiCC icpc"
92 +CANDIDATE_MPIF77="$CANDIDATE_MPIF77 mpiifort mpiifc mpiif77 ifort"
93 +CANDIDATE_MPIF90="$CANDIDATE_MPIF90 mpiifort mpiifc mpiif95 mpiif90 ifort"
95 dnl add PGI MPI compiler wrappers
96 -CANDIDATE_MPICC+=" mpipgcc mppgcc"
97 -CANDIDATE_MPICXX+=" mpipgCC mppgCC"
98 -CANDIDATE_MPIF77+=" mpipgf77 mppgf77"
99 -CANDIDATE_MPIF90+=" mpipgf90 mpipgf95 mppgf90 mppgf95 "
100 +CANDIDATE_MPICC="$CANDIDATE_MPICC mpipgcc mppgcc"
101 +CANDIDATE_MPICXX="$CANDIDATE_MPICXX mpipgCC mppgCC"
102 +CANDIDATE_MPIF77="$CANDIDATE_MPIF77 mpipgf77 mppgf77"
103 +CANDIDATE_MPIF90="$CANDIDATE_MPIF90 mpipgf90 mpipgf95 mppgf90 mppgf95 "
105 dnl find the full path of MPICC from CANDIDATE_MPICC and MPI_INSTALL
106 if test "x${ac_user_MPICC}" = x ; then
108 ERR_MSG="Specified MPI C compiler \"$ac_user_MPICC\" cannot be found"
110 if test "x$MPI_INSTALL" != x ; then
111 - ERR_MSG+=" under $MPI_INSTALL"
112 + ERR_MSG="$ERR_MSG under $MPI_INSTALL"
115 -----------------------------------------------------------------------
117 ERR_MSG="Specified MPI C++ compiler \"$ac_user_MPICXX\" cannot be found"
119 if test "x$MPI_INSTALL" != x ; then
120 - ERR_MSG+=" under $MPI_INSTALL"
121 + ERR_MSG="$ERR_MSG under $MPI_INSTALL"
123 if test "x${enable_cxx}" = xyes ; then
124 dnl --enable-cxx is explicitly set at command line
127 if test "x${enable_strict}" = xyes; then
128 if test "x${GCC}" = xyes; then
129 - CFLAGS+=" -Wall -Wstrict-prototypes -Wmissing-prototypes -Wundef -Wpointer-arith -Wbad-function-cast"
130 + CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wundef -Wpointer-arith -Wbad-function-cast"
132 AC_MSG_WARN([--enable-strict is for GNU compiler only])
135 ERR_MSG="Specified MPI Fortran 77 compiler \"$ac_user_MPIF77\" cannot be found"
137 if test "x$MPI_INSTALL" != x ; then
138 - ERR_MSG+=" under $MPI_INSTALL"
139 + ERR_MSG="$ERR_MSG under $MPI_INSTALL"
141 if test "x${enable_fortran}" = xyes ; then
142 dnl --enable-fortran is explicitly set at command line
144 ERR_MSG="Specified MPI Fortran 90 compiler \"$ac_user_MPIF90\" cannot be found"
146 if test "x$MPI_INSTALL" != x ; then
147 - ERR_MSG+=" under $MPI_INSTALL"
148 + ERR_MSG="$ERR_MSG under $MPI_INSTALL"
150 if test "x${enable_fortran}" = xyes ; then
151 dnl --enable-fortran is explicitly set at command line
153 if test "x${has_fortran}" = xyes ; then
154 if test "x${enable_strict}" = xyes -a "x${GFC}" = xyes; then
155 dnl not all Fortran compilers recognize -Wall
158 + FFLAGS="$FFLAGS -Wall"
159 + FCFLAGS="$FCFLAGS -Wall"
163 @@ -794,14 +794,14 @@
164 if test "x${ac_cv_fc_compiler_nag}" = xyes ; then
165 dnl Add -mismatch if they are not set by users
166 if ! echo "${FFLAGS}" | ${EGREP} -q -- "-mismatch" ; then
167 - FFLAGS+=" -mismatch"
168 + FFLAGS="$FFLAGS -mismatch"
170 if ! echo "${FCFLAGS}" | ${EGREP} -q -- "-mismatch" ; then
171 - FCFLAGS+=" -mismatch"
172 + FCFLAGS="$FCFLAGS -mismatch"
175 - FFLAGS+=" -DNAGFortran"
176 - FCFLAGS+=" -DNAGFortran"
177 + FFLAGS="$FFLAGS -DNAGFortran"
178 + FCFLAGS="$FCFLAGS -DNAGFortran"
181 dnl check Fortran parameter modifier for 8-byte integer type
186 -M4FLAGS+=" -DPNETCDF"
187 -M4FFLAGS+=" -DPNETCDF"
188 +M4FLAGS="$M4FLAGS -DPNETCDF"
189 +M4FFLAGS="$M4FFLAGS -DPNETCDF"
191 dnl Check for <stdbool.h> that conforms to C99 requirements
192 dnl this is also for using bool type in utf8proc.h/utf8proc.c to support
193 @@ -1316,31 +1316,31 @@
194 dnl remove all -O and -fast flags
195 dnl add -O0 to all flags
196 if ! echo "${CFLAGS}" | ${EGREP} -q -- "-g" ; then
198 + CFLAGS="$CFLAGS -g"
200 CFLAGS=`echo $CFLAGS | sed 's/-O. *//g' | sed 's/-fast *//g'`
202 + CFLAGS="$CFLAGS -O0"
204 if test "x${has_mpicxx}" = xyes ; then
205 if ! echo "${CXXFLAGS}" | ${EGREP} -q -- "-g" ; then
207 + CXXFLAGS="$CXXFLAGS -g"
209 CXXFLAGS=`echo $CXXFLAGS | sed 's/-O. *//g' | sed 's/-fast *//g'`
211 + CXXFLAGS="$CXXFLAGS -O0"
214 if test "x${has_fortran}" = xyes ; then
215 if ! echo "${FFLAGS}" | ${EGREP} -q -- "-g" ; then
217 + FFLAGS="$FFLAGS -g"
219 if ! echo "${FCFLAGS}" | ${EGREP} -q -- "-g" ; then
221 + FCFLAGS="$FCFLAGS -g"
224 FFLAGS=`echo $FFLAGS | sed 's/-O. *//g' | sed 's/-fast *//g'`
225 FCFLAGS=`echo $FCFLAGS | sed 's/-O. *//g' | sed 's/-fast *//g'`
228 + FFLAGS="$FFLAGS -O0"
229 + FCFLAGS="$FCFLAGS -O0"
233 @@ -1541,7 +1541,7 @@
234 dnl No need to add the include paths used to build NetCDF to CPPFLAGS
235 dnl permanently, as it is not needed to compile PnetCDF codes
236 CPPFLAGS_save=$CPPFLAGS
237 - CPPFLAGS+=" $netcdf_cflags"
238 + CPPFLAGS="$CPPFLAGS $netcdf_cflags"
239 dnl AC_CHECK_HEADERS uses CPPFLAGS, not CFLAGS
240 AC_CHECK_HEADERS([hdf5.h], [have_hdf5=yes], [have_hdf5=no])
241 if test "x$have_hdf5" = xyes ; then
242 @@ -1734,7 +1734,7 @@
243 dnl set default to "mpiexec -n NP"
244 UD_MPI_PATH_PROGS([TESTMPIRUN], [mpiexec mpirun srun])
245 if test "x${TESTMPIRUN}" != x ; then
246 - TESTMPIRUN+=" -n NP"
247 + TESTMPIRUN="$TESTMPIRUN -n NP"