diff -Nru adios-1.5.0/debian/changelog adios-1.5.0/debian/changelog --- adios-1.5.0/debian/changelog 2014-01-28 03:41:26.000000000 +0000 +++ adios-1.5.0/debian/changelog 2014-01-28 04:36:20.000000000 +0000 @@ -1,3 +1,9 @@ +adios (1.5.0-1ubuntu7) trusty; urgency=low + + * Add more netcdf fixes. + + -- Daniel T Chen Mon, 27 Jan 2014 23:09:51 -0500 + adios (1.5.0-1ubuntu6) trusty; urgency=low * Fix netcdf underlinkage for ppc64el. diff -Nru adios-1.5.0/debian/patches/underlinkage.patch adios-1.5.0/debian/patches/underlinkage.patch --- adios-1.5.0/debian/patches/underlinkage.patch 2014-01-27 23:00:50.000000000 +0000 +++ adios-1.5.0/debian/patches/underlinkage.patch 2014-01-28 05:01:59.000000000 +0000 @@ -37,3 +37,578 @@ adios_test_c_LDFLAGS = $(ADIOSLIB_LDFLAGS) CLEANFILES = restart.bp +Index: adios-1.5.0/tests/Fortran/Makefile.am +=================================================================== +--- adios-1.5.0.orig/tests/Fortran/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/tests/Fortran/Makefile.am 2014-01-27 23:11:55.568911749 -0500 +@@ -10,12 +10,12 @@ + adios_test_f_CPPFLAGS = $(ADIOSLIB_CPPFLAGS) + adios_test_f_CFLAGS = $(ADIOSLIB_CFLAGS) + adios_test_f_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-adios_test_f_LDADD = $(top_builddir)/src/libadiosf.a $(ADIOSLIB_LDADD) ++adios_test_f_LDADD = $(top_builddir)/src/libadiosf.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + + FC=$(MPIFC) + + FCLINK = \ + $(LIBTOOL) --mode=link --tag F77 $(FC) \ +- $(AM_FCFLAGS) $(FCFLAGS) $(LDFLAGS) -o $@ ++ $(AM_FCFLAGS) $(FCFLAGS) $(LDFLAGS) $(NETCDF_LIBS) -o $@ + + EXTRA_DIST = config_fortran.xml +Index: adios-1.5.0/tests/bp_read/Makefile.am +=================================================================== +--- adios-1.5.0.orig/tests/bp_read/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/tests/bp_read/Makefile.am 2014-01-27 23:38:09.768550088 -0500 +@@ -14,27 +14,27 @@ + genbp_SOURCES = genbp.c + genbp_CPPFLAGS = $(ADIOSLIB_CPPFLAGS) + genbp_CFLAGS = $(ADIOSLIB_CFLAGS) +-genbp_LDADD = $(top_builddir)/src/libadios.a $(top_builddir)/src/libadiosread.a $(ADIOSLIB_LDADD) ++genbp_LDADD = $(top_builddir)/src/libadios.a $(top_builddir)/src/libadiosread.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + genbp_LDFLAGS = $(ADIOSLIB_LDFLAGS) + + if BUILD_FORTRAN + bp_read_f_SOURCES = bp_read_f.F90 + bp_read_f_CPPFLAGS = $(ADIOSLIB_CPPFLAGS) + bp_read_f_CFLAGS = $(ADIOSLIB_CFLAGS) +-bp_read_f_LDADD = $(top_builddir)/src/libadiosreadf.a $(ADIOSREADLIB_LDADD) ++bp_read_f_LDADD = $(top_builddir)/src/libadiosreadf.a $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + bp_read_f_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) + + bp_read_f_v1_SOURCES = bp_read_f_v1.F90 + bp_read_f_v1_CPPFLAGS = $(ADIOSLIB_CPPFLAGS) + bp_read_f_v1_CFLAGS = $(ADIOSLIB_CFLAGS) +-bp_read_f_v1_LDADD = $(top_builddir)/src/libadiosreadf_v1.a $(ADIOSREADLIB_LDADD) ++bp_read_f_v1_LDADD = $(top_builddir)/src/libadiosreadf_v1.a $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + bp_read_f_v1_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) + endif + + bp_read_c_SOURCES = bp_read_c.c + bp_read_c_CPPFLAGS = -DADIOS_USE_READ_API_1 $(ADIOSLIB_CPPFLAGS) + bp_read_c_CFLAGS = $(ADIOSLIB_CFLAGS) +-bp_read_c_LDADD = $(top_builddir)/src/libadiosread.a $(ADIOSREADLIB_LDADD) ++bp_read_c_LDADD = $(top_builddir)/src/libadiosread.a $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + bp_read_c_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) + + FC=$(MPIFC) +@@ -42,7 +42,7 @@ + + FCLINK = \ + $(LIBTOOL) --mode=link --tag F77 $(FC) \ +- $(AM_FCFLAGS) $(FCFLAGS) $(LDFLAGS) -o $@ ++ $(AM_FCFLAGS) $(FCFLAGS) $(LDFLAGS) $(NETCDF_LIBS) -o $@ + + if BUILD_FORTRAN + CLEANFILES = *.o bp_read_c bp_read_f genbp read_coords read_phi read_parts_global +Index: adios-1.5.0/tests/genarray/Makefile.am +=================================================================== +--- adios-1.5.0.orig/tests/genarray/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/tests/genarray/Makefile.am 2014-01-27 23:39:10.383799863 -0500 +@@ -8,25 +8,25 @@ + genarray_SOURCES = genarray.F90 + genarray_CPPFLAGS = $(ADIOSLIB_CPPFLAGS) + genarray_CFLAGS = $(ADIOSLIB_CFLAGS) +-genarray_LDADD = $(top_builddir)/src/libadiosf.a $(ADIOSLIB_LDADD) ++genarray_LDADD = $(top_builddir)/src/libadiosf.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + genarray_LDFLAGS = $(ADIOSLIB_LDFLAGS) + + genarray2D_SOURCES = genarray2D.F90 + genarray2D_CPPFLAGS = $(ADIOSLIB_CPPFLAGS) + genarray2D_CFLAGS = $(ADIOSLIB_CFLAGS) +-genarray2D_LDADD = $(top_builddir)/src/libadiosf.a $(ADIOSLIB_LDADD) ++genarray2D_LDADD = $(top_builddir)/src/libadiosf.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + genarray2D_LDFLAGS = $(ADIOSLIB_LDFLAGS) + + copyarray_SOURCES = copyarray.F90 + copyarray_CPPFLAGS = $(ADIOSLIB_CPPFLAGS) + copyarray_CFLAGS = $(ADIOSLIB_CFLAGS) +-copyarray_LDADD = $(top_builddir)/src/libadiosf.a $(ADIOSLIB_LDADD) ++copyarray_LDADD = $(top_builddir)/src/libadiosf.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + copyarray_LDFLAGS = $(ADIOSLIB_LDFLAGS) + + copyarray2D_SOURCES = copyarray2D.F90 + copyarray2D_CPPFLAGS = $(ADIOSLIB_CPPFLAGS) + copyarray2D_CFLAGS = $(ADIOSLIB_CFLAGS) +-copyarray2D_LDADD = $(top_builddir)/src/libadiosf.a $(ADIOSLIB_LDADD) ++copyarray2D_LDADD = $(top_builddir)/src/libadiosf.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + copyarray2D_LDFLAGS = $(ADIOSLIB_LDFLAGS) + + FC=$(MPIFC) +@@ -43,7 +43,7 @@ + + FCLINK = \ + $(LIBTOOL) --mode=link --tag F77 $(FC) \ +- $(AM_FCFLAGS) $(FCFLAGS) $(LDFLAGS) -o $@ ++ $(AM_FCFLAGS) $(FCFLAGS) $(LDFLAGS) $(NETCDF_LIBS) -o $@ + + CLEANFILES = genarray_comm.mod genarray2d_comm.mod gwrite_genarray.fh gread_genarray.fh + +Index: adios-1.5.0/examples/C/arrays/Makefile.am +=================================================================== +--- adios-1.5.0.orig/examples/C/arrays/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/examples/C/arrays/Makefile.am 2014-01-27 23:48:47.822199921 -0500 +@@ -6,10 +6,10 @@ + noinst_PROGRAMS = arrays_write arrays_read + + arrays_write_SOURCES = arrays_write.c +-arrays_write_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) ++arrays_write_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + arrays_write_LDFLAGS = $(ADIOSLIB_LDFLAGS) + arrays_read_SOURCES = arrays_read.c +-arrays_read_LDADD = $(top_builddir)/src/libadiosread.a $(ADIOSREADLIB_LDADD) ++arrays_read_LDADD = $(top_builddir)/src/libadiosread.a $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + arrays_read_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) + + CLEANFILES = *.bp +Index: adios-1.5.0/examples/C/attributes/Makefile.am +=================================================================== +--- adios-1.5.0.orig/examples/C/attributes/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/examples/C/attributes/Makefile.am 2014-01-27 23:50:29.738782281 -0500 +@@ -8,11 +8,11 @@ + attributes_write_SOURCES = attributes_write.c + attributes_write_LDADD = $(top_builddir)/src/libadios.a + attributes_write_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-attributes_write_LDADD += $(ADIOSLIB_LDADD) ++attributes_write_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + attributes_read_SOURCES = attributes_read.c + attributes_read_LDADD = $(top_builddir)/src/libadiosread.a + attributes_read_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) +-attributes_read_LDADD += $(ADIOSREADLIB_LDADD) ++attributes_read_LDADD += $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + + CLEANFILES = *.bp + CC=$(MPICC) +Index: adios-1.5.0/examples/C/flexpath_arrays/global_range_select/Makefile.am +=================================================================== +--- adios-1.5.0.orig/examples/C/flexpath_arrays/global_range_select/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/examples/C/flexpath_arrays/global_range_select/Makefile.am 2014-01-27 23:48:13.783323913 -0500 +@@ -6,10 +6,10 @@ + noinst_PROGRAMS = arrays_write arrays_read + + arrays_write_SOURCES = arrays_write.c +-arrays_write_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) ++arrays_write_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + arrays_write_LDFLAGS = $(ADIOSLIB_LDFLAGS) + arrays_read_SOURCES = arrays_read.c +-arrays_read_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) ++arrays_read_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + arrays_read_LDFLAGS = $(ADIOSLIB_LDFLAGS) + + CLEANFILES = *.bp +Index: adios-1.5.0/examples/C/flexpath_arrays/process_select/Makefile.am +=================================================================== +--- adios-1.5.0.orig/examples/C/flexpath_arrays/process_select/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/examples/C/flexpath_arrays/process_select/Makefile.am 2014-01-27 23:48:29.310813056 -0500 +@@ -6,10 +6,10 @@ + noinst_PROGRAMS = arrays_write arrays_read + + arrays_write_SOURCES = arrays_write.c +-arrays_write_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) ++arrays_write_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + arrays_write_LDFLAGS = $(ADIOSLIB_LDFLAGS) + arrays_read_SOURCES = arrays_read.c +-arrays_read_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) ++arrays_read_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + arrays_read_LDFLAGS = $(ADIOSLIB_LDFLAGS) + + CLEANFILES = *.txt +Index: adios-1.5.0/examples/C/global-array-time/Makefile.am +=================================================================== +--- adios-1.5.0.orig/examples/C/global-array-time/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/examples/C/global-array-time/Makefile.am 2014-01-27 23:46:25.674541402 -0500 +@@ -8,19 +8,19 @@ + adios_globaltime_SOURCES = adios_globaltime.c + adios_globaltime_LDADD = $(top_builddir)/src/libadios.a + adios_globaltime_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-adios_globaltime_LDADD += $(ADIOSLIB_LDADD) ++adios_globaltime_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + adios_globaltime_no_xml_SOURCES = adios_globaltime_no_xml.c + adios_globaltime_no_xml_LDADD = $(top_builddir)/src/libadios.a + adios_globaltime_no_xml_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-adios_globaltime_no_xml_LDADD += $(ADIOSLIB_LDADD) ++adios_globaltime_no_xml_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + adios_read_globaltime_SOURCES = adios_read_globaltime.c + adios_read_globaltime_LDADD = $(top_builddir)/src/libadiosread.a + adios_read_globaltime_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) +-adios_read_globaltime_LDADD += $(ADIOSREADLIB_LDADD) ++adios_read_globaltime_LDADD += $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + adios_read_globaltime_streaming_SOURCES = adios_read_globaltime_streaming.c + adios_read_globaltime_streaming_LDADD = $(top_builddir)/src/libadiosread.a + adios_read_globaltime_streaming_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) +-adios_read_globaltime_streaming_LDADD += $(ADIOSREADLIB_LDADD) ++adios_read_globaltime_streaming_LDADD += $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + + CLEANFILES = *.bp + CC=$(MPICC) +Index: adios-1.5.0/examples/C/global-array/Makefile.am +=================================================================== +--- adios-1.5.0.orig/examples/C/global-array/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/examples/C/global-array/Makefile.am 2014-01-27 23:50:16.627233737 -0500 +@@ -8,43 +8,43 @@ + adios_global_SOURCES = adios_global.c + adios_global_LDADD = $(top_builddir)/src/libadios.a + adios_global_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-adios_global_LDADD += $(ADIOSLIB_LDADD) ++adios_global_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + adios_global_2files_SOURCES = adios_global_2files.c + adios_global_2files_LDADD = $(top_builddir)/src/libadios.a + adios_global_2files_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-adios_global_2files_LDADD += $(ADIOSLIB_LDADD) ++adios_global_2files_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + adios_read_global_SOURCES = adios_read_global.c + adios_read_global_LDADD = $(top_builddir)/src/libadiosread.a + adios_read_global_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) +-adios_read_global_LDADD += $(ADIOSREADLIB_LDADD) ++adios_read_global_LDADD += $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + adios_read_writeblock_SOURCES = adios_read_writeblock.c + adios_read_writeblock_LDADD = $(top_builddir)/src/libadiosread.a + adios_read_writeblock_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-adios_read_writeblock_LDADD += $(ADIOSLIB_LDADD) ++adios_read_writeblock_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + adios_read_chunk_SOURCES = adios_read_chunk.c + adios_read_chunk_LDADD = $(top_builddir)/src/libadiosread.a + adios_read_chunk_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) +-adios_read_chunk_LDADD += $(ADIOSREADLIB_LDADD) ++adios_read_chunk_LDADD += $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + adios_read_gpp_SOURCES = adios_read_gpp.c + adios_read_gpp_LDADD = $(top_builddir)/src/libadiosread.a + adios_read_gpp_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) +-adios_read_gpp_LDADD += $(ADIOSREADLIB_LDADD) ++adios_read_gpp_LDADD += $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + adios_global_no_xml_SOURCES = adios_global_no_xml.c + adios_global_no_xml_LDADD = $(top_builddir)/src/libadios.a + adios_global_no_xml_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-adios_global_no_xml_LDADD += $(ADIOSLIB_LDADD) ++adios_global_no_xml_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + adios_read_global_no_xml_SOURCES = adios_read_global_no_xml.c + adios_read_global_no_xml_LDADD = $(top_builddir)/src/libadiosread.a + adios_read_global_no_xml_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) +-adios_read_global_no_xml_LDADD += $(ADIOSREADLIB_LDADD) ++adios_read_global_no_xml_LDADD += $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + no_xml_write_byid_SOURCES = no_xml_write_byid.c + no_xml_write_byid_LDADD = $(top_builddir)/src/libadios.a + no_xml_write_byid_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-no_xml_write_byid_LDADD += $(ADIOSLIB_LDADD) ++no_xml_write_byid_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + read_no_xml_write_byid_SOURCES = read_no_xml_write_byid.c + read_no_xml_write_byid_LDADD = $(top_builddir)/src/libadiosread.a + read_no_xml_write_byid_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) +-read_no_xml_write_byid_LDADD += $(ADIOSREADLIB_LDADD) ++read_no_xml_write_byid_LDADD += $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + + CLEANFILES = *.bp + CC=$(MPICC) +Index: adios-1.5.0/examples/C/manual/Makefile.am +=================================================================== +--- adios-1.5.0.orig/examples/C/manual/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/examples/C/manual/Makefile.am 2014-01-27 23:47:14.641176076 -0500 +@@ -8,19 +8,19 @@ + 1_nonadios_example_SOURCES = 1_nonadios_example.c + 1_nonadios_example_LDADD = $(top_builddir)/src/libadios.a + 1_nonadios_example_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-1_nonadios_example_LDADD += $(ADIOSLIB_LDADD) ++1_nonadios_example_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + 2_adios_write_SOURCES = 2_adios_write.c + 2_adios_write_LDADD = $(top_builddir)/src/libadios.a + 2_adios_write_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-2_adios_write_LDADD += $(ADIOSLIB_LDADD) ++2_adios_write_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + 3_adios_read_SOURCES = 3_adios_read.c + 3_adios_read_LDADD = $(top_builddir)/src/libadios.a + 3_adios_read_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-3_adios_read_LDADD += $(ADIOSLIB_LDADD) ++3_adios_read_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + 4_adios_nfiles_SOURCES = 4_adios_nfiles.c + 4_adios_nfiles_LDADD = $(top_builddir)/src/libadios.a + 4_adios_nfiles_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-4_adios_nfiles_LDADD += $(ADIOSLIB_LDADD) ++4_adios_nfiles_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + + CLEANFILES = *.bp + CC=$(MPICC) +Index: adios-1.5.0/examples/C/read_all/Makefile.am +=================================================================== +--- adios-1.5.0.orig/examples/C/read_all/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/examples/C/read_all/Makefile.am 2014-01-27 23:46:41.550117031 -0500 +@@ -9,10 +9,10 @@ + read_all_CPPFLAGS = ${MACRODEFFLAG}_NOMPI + read_all_LDADD = $(top_builddir)/src/libadiosread_nompi.a + read_all_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) +-read_all_LDADD += $(ADIOSREADLIB_LDADD) ++read_all_LDADD += $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + + read_all_v1_SOURCES = read_all_v1.c + read_all_v1_CPPFLAGS = ${MACRODEFFLAG}_NOMPI ${MACRODEFFLAG}ADIOS_USE_READ_API_1 + read_all_v1_LDADD = $(top_builddir)/src/libadiosread_nompi.a + read_all_v1_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) +-read_all_v1_LDADD += $(ADIOSREADLIB_LDADD) ++read_all_v1_LDADD += $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) +Index: adios-1.5.0/examples/C/scalars/Makefile.am +=================================================================== +--- adios-1.5.0.orig/examples/C/scalars/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/examples/C/scalars/Makefile.am 2014-01-27 23:45:55.667244116 -0500 +@@ -8,15 +8,15 @@ + scalars_write_SOURCES = scalars_write.c + scalars_write_LDADD = $(top_builddir)/src/libadios.a + scalars_write_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-scalars_write_LDADD += $(ADIOSLIB_LDADD) ++scalars_write_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + scalars_read_SOURCES = scalars_read.c + scalars_read_LDADD = $(top_builddir)/src/libadiosread.a + scalars_read_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) +-scalars_read_LDADD += $(ADIOSREADLIB_LDADD) ++scalars_read_LDADD += $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + scalars_write_step_SOURCES = scalars_write.c + scalars_write_step_LDADD = $(top_builddir)/src/libadios.a + scalars_write_step_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-scalars_write_step_LDADD += $(ADIOSLIB_LDADD) ++scalars_write_step_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + + CLEANFILES = *.bp + CC=$(MPICC) +Index: adios-1.5.0/examples/C/schema/Makefile.am +=================================================================== +--- adios-1.5.0.orig/examples/C/schema/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/examples/C/schema/Makefile.am 2014-01-27 23:47:57.591835814 -0500 +@@ -8,22 +8,22 @@ + uniform_SOURCES = uniform.c + uniform_LDADD = $(top_builddir)/src/libadios.a + uniform_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-uniform_LDADD += $(ADIOSLIB_LDADD) ++uniform_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + + rectilinear_SOURCES = rectilinear.c + rectilinear_LDADD = $(top_builddir)/src/libadios.a + rectilinear_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-rectilinear_LDADD += $(ADIOSLIB_LDADD) ++rectilinear_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + + structured_SOURCES = structured.c + structured_LDADD = $(top_builddir)/src/libadios.a + structured_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-structured_LDADD += $(ADIOSLIB_LDADD) ++structured_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + + unstructured_SOURCES = unstructured.c + unstructured_LDADD = $(top_builddir)/src/libadios.a + unstructured_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-unstructured_LDADD += $(ADIOSLIB_LDADD) ++unstructured_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + + CLEANFILES = *.bp + CC=$(MPICC) +Index: adios-1.5.0/examples/C/stat/Makefile.am +=================================================================== +--- adios-1.5.0.orig/examples/C/stat/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/examples/C/stat/Makefile.am 2014-01-27 23:47:29.424720807 -0500 +@@ -8,11 +8,11 @@ + stat_write_SOURCES = stat_write.c + stat_write_LDADD = $(top_builddir)/src/libadios.a + stat_write_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-stat_write_LDADD += $(ADIOSLIB_LDADD) ++stat_write_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + stat_read_SOURCES = stat_read.c + stat_read_LDADD = $(top_builddir)/src/libadiosread.a + stat_read_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) +-stat_read_LDADD += $(ADIOSREADLIB_LDADD) ++stat_read_LDADD += $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + + CLEANFILES = *.bp + CC=$(MPICC) +Index: adios-1.5.0/examples/Fortran/arrays/Makefile.am +=================================================================== +--- adios-1.5.0.orig/examples/Fortran/arrays/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/examples/Fortran/arrays/Makefile.am 2014-01-27 23:51:32.992633791 -0500 +@@ -8,12 +8,12 @@ + arrays_write_SOURCES = arrays_write.F90 + arrays_write_LDADD = $(top_builddir)/src/libadiosf.a + arrays_write_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-arrays_write_LDADD += $(ADIOSLIB_LDADD) ++arrays_write_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + + arrays_read_SOURCES = arrays_read.F90 + arrays_read_LDADD = $(top_builddir)/src/libadiosreadf.a + arrays_read_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) +-arrays_read_LDADD += $(ADIOSREADLIB_LDADD) ++arrays_read_LDADD += $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + + CLEANFILES = *.bp + CC=$(MPICC) +@@ -23,4 +23,4 @@ + + FCLINK = \ + $(LIBTOOL) --mode=link --tag F77 $(FC) \ +- $(AM_FCFLAGS) $(FCFLAGS) $(LDFLAGS) -o $@ ++ $(AM_FCFLAGS) $(FCFLAGS) $(LDFLAGS) $(NETCDF_LIBS) -o $@ +Index: adios-1.5.0/examples/Fortran/global-array-time/Makefile.am +=================================================================== +--- adios-1.5.0.orig/examples/Fortran/global-array-time/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/examples/Fortran/global-array-time/Makefile.am 2014-01-27 23:51:16.641196887 -0500 +@@ -8,7 +8,7 @@ + adios_globaltime_SOURCES = adios_globaltime.F90 + adios_globaltime_LDADD = $(top_builddir)/src/libadiosf.a + adios_globaltime_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-adios_globaltime_LDADD += $(ADIOSLIB_LDADD) ++adios_globaltime_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + + CLEANFILES = *.bp + CC=$(MPICC) +@@ -16,6 +16,6 @@ + + FCLINK = \ + $(LIBTOOL) --mode=link --tag F77 $(FC) \ +- $(AM_FCFLAGS) $(FCFLAGS) $(LDFLAGS) -o $@ ++ $(AM_FCFLAGS) $(FCFLAGS) $(LDFLAGS) $(NETCDF_LIBS) -o $@ + + EXTRA_DIST = adios_globaltime.xml gread_restart.fh gwrite_restart.fh job.pbs +Index: adios-1.5.0/examples/Fortran/global-array/Makefile.am +=================================================================== +--- adios-1.5.0.orig/examples/Fortran/global-array/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/examples/Fortran/global-array/Makefile.am 2014-01-27 23:51:59.943718066 -0500 +@@ -8,17 +8,17 @@ + adios_global_SOURCES = adios_global.F90 + adios_global_LDADD = $(top_builddir)/src/libadiosf.a + adios_global_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-adios_global_LDADD += $(ADIOSLIB_LDADD) ++adios_global_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + + adios_global_no_xml_SOURCES = adios_global_no_xml.F90 + adios_global_no_xml_LDADD = $(top_builddir)/src/libadiosf.a + adios_global_no_xml_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-adios_global_no_xml_LDADD += $(ADIOSLIB_LDADD) ++adios_global_no_xml_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + + no_xml_write_byid_SOURCES = no_xml_write_byid.F90 + no_xml_write_byid_LDADD = $(top_builddir)/src/libadiosf.a + no_xml_write_byid_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-no_xml_write_byid_LDADD += $(ADIOSLIB_LDADD) ++no_xml_write_byid_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + + CLEANFILES = *.bp + CC=$(MPICC) +@@ -26,6 +26,6 @@ + + FCLINK = \ + $(LIBTOOL) --mode=link --tag F77 $(FC) \ +- $(AM_FCFLAGS) $(FCFLAGS) $(LDFLAGS) -o $@ ++ $(AM_FCFLAGS) $(FCFLAGS) $(LDFLAGS) $(NETCDF_LIBS) -o $@ + + EXTRA_DIST = adios_global.xml gread_temperature.fh gwrite_temperature.fh job.pbs +Index: adios-1.5.0/examples/Fortran/scalars/Makefile.am +=================================================================== +--- adios-1.5.0.orig/examples/Fortran/scalars/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/examples/Fortran/scalars/Makefile.am 2014-01-27 23:51:02.573667936 -0500 +@@ -8,12 +8,12 @@ + scalars_write_SOURCES = scalars_write.F90 + scalars_write_LDADD = $(top_builddir)/src/libadiosf.a + scalars_write_LDFLAGS = $(ADIOSLIB_LDFLAGS) +-scalars_write_LDADD += $(ADIOSLIB_LDADD) ++scalars_write_LDADD += $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + + scalars_read_SOURCES = scalars_read.F90 + scalars_read_LDADD = $(top_builddir)/src/libadiosreadf.a + scalars_read_LDFLAGS = $(ADIOSREADLIB_LDFLAGS) +-scalars_read_LDADD += $(ADIOSREADLIB_LDADD) ++scalars_read_LDADD += $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + + CLEANFILES = *.bp + CC=$(MPICC) +@@ -23,4 +23,4 @@ + + FCLINK = \ + $(LIBTOOL) --mode=link --tag F77 $(FC) \ +- $(AM_FCFLAGS) $(FCFLAGS) $(LDFLAGS) -o $@ ++ $(AM_FCFLAGS) $(FCFLAGS) $(LDFLAGS) $(NETCDF_LIBS) -o $@ +Index: adios-1.5.0/tests/suite/programs/Makefile.am +=================================================================== +--- adios-1.5.0.orig/tests/suite/programs/Makefile.am 2013-12-09 10:23:31.000000000 -0500 ++++ adios-1.5.0/tests/suite/programs/Makefile.am 2014-01-28 00:01:55.195473693 -0500 +@@ -45,68 +45,68 @@ + + # posix_method + posix_method_SOURCES=posix_method.F90 +-posix_method_LDADD = $(top_builddir)/src/libadiosf.a $(ADIOSLIB_LDADD) ++posix_method_LDADD = $(top_builddir)/src/libadiosf.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + posix_method_LDFLAGS = $(AM_LDFLAGS) $(ADIOSLIB_LDFLAGS) + posix_method.o: gwrite_posix_method.fh + gwrite_posix_method.fh: posix_method.xml + $(top_srcdir)/utils/gpp/gpp.py posix_method.xml + + local_array_time_SOURCES=local_array_time.c +-local_array_time_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) ++local_array_time_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + local_array_time_LDFLAGS = $(AM_LDFLAGS) $(ADIOSLIB_LDFLAGS) + + adios_amr_write_SOURCES=adios_amr_write.c +-adios_amr_write_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) ++adios_amr_write_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + adios_amr_write_LDFLAGS = $(AM_LDFLAGS) $(ADIOSLIB_LDFLAGS) + adios_amr_write.o: adios_amr_write.c + + adios_amr_write_2vars_SOURCES=adios_amr_write_2vars.c +-adios_amr_write_2vars_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) ++adios_amr_write_2vars_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + adios_amr_write_2vars_LDFLAGS = $(AM_LDFLAGS) $(ADIOSLIB_LDFLAGS) + adios_amr_write_2vars.o: adios_amr_write_2vars.c + + adios_staged_read_SOURCES=adios_staged_read.c +-adios_staged_read_LDADD = $(top_builddir)/src/libadiosread.a $(ADIOSREADLIB_LDADD) ++adios_staged_read_LDADD = $(top_builddir)/src/libadiosread.a $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + adios_staged_read_LDFLAGS = $(AM_LDFLAGS) $(ADIOSREADLIB_LDFLAGS) + adios_staged_read.o: adios_staged_read.c + + adios_staged_read_v2_SOURCES=adios_staged_read_v2.c +-adios_staged_read_v2_LDADD = $(top_builddir)/src/libadiosread.a $(ADIOSREADLIB_LDADD) ++adios_staged_read_v2_LDADD = $(top_builddir)/src/libadiosread.a $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + adios_staged_read_v2_LDFLAGS = $(AM_LDFLAGS) $(ADIOSREADLIB_LDFLAGS) + adios_staged_read_v2.o: adios_staged_read_v2.c + + adios_staged_read_2vars_SOURCES=adios_staged_read_2vars.c +-adios_staged_read_2vars_LDADD = $(top_builddir)/src/libadiosread.a $(ADIOSREADLIB_LDADD) ++adios_staged_read_2vars_LDADD = $(top_builddir)/src/libadiosread.a $(ADIOSREADLIB_LDADD) $(NETCDF_LIBS) + adios_staged_read_2vars_LDFLAGS = $(AM_LDFLAGS) $(ADIOSREADLIB_LDFLAGS) + adios_staged_read_2vars.o: adios_staged_read_2vars.c + + write_read_SOURCES=write_read.c +-write_read_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) ++write_read_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + write_read_LDFLAGS = $(AM_LDFLAGS) $(ADIOSLIB_LDFLAGS) + write_read.o: write_read.c + + write_alternate_SOURCES=write_alternate.c +-write_alternate_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) ++write_alternate_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + write_alternate_LDFLAGS = $(AM_LDFLAGS) $(ADIOSLIB_LDFLAGS) + write_alternate.o: write_alternate.c + + two_groups_SOURCES=two_groups.c +-two_groups_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) ++two_groups_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + two_groups_LDFLAGS = $(AM_LDFLAGS) $(ADIOSLIB_LDFLAGS) + two_groups.o: two_groups.c + + many_vars_SOURCES=many_vars.c +-many_vars_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) ++many_vars_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + many_vars_LDFLAGS = $(AM_LDFLAGS) $(ADIOSLIB_LDFLAGS) + many_vars.o: many_vars.c + + selections_SOURCES=selections.c +-selections_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) ++selections_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + selections_LDFLAGS = $(AM_LDFLAGS) $(ADIOSLIB_LDFLAGS) + selections.o: selections.c + + connect_to_space_subset_SOURCES=connect_to_space_subset.c +-connect_to_space_subset_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) ++connect_to_space_subset_LDADD = $(top_builddir)/src/libadios.a $(ADIOSLIB_LDADD) $(NETCDF_LIBS) + connect_to_space_subset_LDFLAGS = $(AM_LDFLAGS) $(ADIOSLIB_LDFLAGS) + connect_to_space_subset.o: connect_to_space_subset.c + +@@ -121,4 +121,4 @@ + + FCLINK = \ + $(LIBTOOL) --mode=link --tag F77 $(FC) \ +- $(AM_FCFLAGS) $(FCFLAGS) $(LDFLAGS) -o $@ ++ $(AM_FCFLAGS) $(FCFLAGS) $(LDFLAGS) $(NETCDF_LIBS) -o $@