--- origsrc/netcdf-4.1.1/cxx4/Makefile.am	2010-03-30 16:18:26.000000000 +0200
+++ src/netcdf-4.1.1/cxx4/Makefile.am	2011-03-06 02:55:07.125000000 +0100
@@ -9,6 +9,9 @@
 AM_CPPFLAGS = -I$(top_srcdir)/libsrc4 
 AM_LDFLAGS =
 
+# The C++ library depends on the C library.
+libnetcdf_c__4_la_LIBADD = $(top_builddir)/libsrc4/libnetcdf.la
+
 # Link to the netCDF-4 and the HDF5 libraries, and the C++ library.
 LDADD = $(top_builddir)/cxx4/libnetcdf_c++4.la $(top_builddir)/libsrc4/libnetcdf.la -lhdf5_hl -lhdf5
 
@@ -31,10 +34,13 @@ AM_LDFLAGS += -L@SZLIBDIR@/lib
 endif
 
 #SUBDIRS = d
+# The C++ library depends on the C library.
+libnetcdf_c__4_la_LIBADD = $(top_builddir)/libsrc4/libnetcdf.la
 
 # See comments in libsrc/Makefile.am about the version number.
 libnetcdf_c__4_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 
 
+
 # These headers will be installed in the users header directory.
 include_HEADERS = netcdf \
                   ncAtt.h   ncCheck.h	    ncDim.h	  ncException.h \
@@ -47,6 +53,8 @@ include_HEADERS = netcdf \
 # This is our output library. 
 lib_LTLIBRARIES = libnetcdf_c++4.la
 
+
+
 # Library source.
 libnetcdf_c__4_la_SOURCES = \
 ncAtt.cpp ncCheck.cpp ncCompoundType.cpp ncDim.cpp ncEnumType.cpp \
Files origsrc/netcdf-4.1.1/libsrc/.putget.m4.swp and src/netcdf-4.1.1/libsrc/.putget.m4.swp differ
--- origsrc/netcdf-4.1.1/libsrc/putget.c	2010-04-12 20:49:00.000000000 +0200
+++ src/netcdf-4.1.1/libsrc/putget.c	2011-03-05 11:28:31.921875000 +0100
@@ -742,7 +742,7 @@ NC_varoffset(const NC *ncp, const NC_var
 			up++, ip++;
 
 		for(; up < end; up++, ip++)
-			lcoord += *up * *ip;
+                        lcoord += (off_t)(*up) * (off_t)(*ip);
 
 		lcoord *= varp->xsz;
 		
--- origsrc/netcdf-4.1.1/libsrc/putget.m4	2010-04-11 06:15:41.000000000 +0200
+++ src/netcdf-4.1.1/libsrc/putget.m4	2011-03-05 11:01:32.656250000 +0100
@@ -643,7 +643,7 @@ NC_varoffset(const NC *ncp, const NC_var
 			up++, ip++;
 
 		for(; up < end; up++, ip++)
-			lcoord += *up * *ip;
+                        lcoord += (off_t)(*up) * (off_t)(*ip);
 
 		lcoord *= varp->xsz;