Removed local cdi.h copy

Use development version from included libcdi by default (refs #492)

src/Makefile.in

@@ -35,8 +35,9 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = cdo$(EXEEXT)
-@USE_INTERNAL_CDI_TRUE@am__append_1 = $(top_builddir)/libcdi/src/libcdi.la
-@USE_INTERNAL_CDI_FALSE@am__append_2 = @CDI_LDFLAGS@
+@USE_INTERNAL_CDI_TRUE@am__append_1 = -I$(top_srcdir)/libcdi/src
+@USE_INTERNAL_CDI_TRUE@am__append_2 = $(top_builddir)/libcdi/src/libcdi.la
+@USE_INTERNAL_CDI_FALSE@am__append_3 = @CDI_LDFLAGS@
 noinst_PROGRAMS = cdotest$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -155,10 +156,10 @@ am_cdo_OBJECTS = cdo-cdo.$(OBJEXT) cdo-Arith.$(OBJEXT) \
 	cdo-util.$(OBJEXT) cdo-vinterp.$(OBJEXT) cdo-zaxis.$(OBJEXT)
 cdo_OBJECTS = $(am_cdo_OBJECTS)
 am__DEPENDENCIES_1 =
-cdo_DEPENDENCIES = $(am__append_1) $(am__DEPENDENCIES_1)
+cdo_DEPENDENCIES = $(am__append_2) $(am__DEPENDENCIES_1)
 am_cdotest_OBJECTS = cdotest-cdotest.$(OBJEXT)
 cdotest_OBJECTS = $(am_cdotest_OBJECTS)
-am__DEPENDENCIES_2 = $(am__append_1) $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_2 = $(am__append_2) $(am__DEPENDENCIES_1)
 cdotest_DEPENDENCIES = $(am__DEPENDENCIES_2)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -372,10 +373,10 @@ cdo_SOURCES = cdo.c Arith.c Arithc.c Arithdays.c Arithlat.c CDItest.c \
 	remaplib.c specspace.c specspace.h statistic.c statistic.h \
 	table.c timebase.h timer.c userlog.c util.c util.h vinterp.c \
 	vinterp.h zaxis.c
-cdo_LDADD = $(am__append_1) $(am__append_2) @NETCDF_LDFLAGS@ \
+cdo_LDADD = $(am__append_2) $(am__append_3) @NETCDF_LDFLAGS@ \
 	@HDF5_LDFLAGS@ @GRIB_API_LDFLAGS@ @ZLIB_LDFLAGS@ \
 	@SZLIB_LDFLAGS@ @PROJ_LDFLAGS@ @LDFLAGS@ @LIBS@ $(am__empty)
-cdo_CPPFLAGS = 
+cdo_CPPFLAGS = $(am__append_1)
 cdotest_SOURCES = cdi.h	\
 		   cdo_int.h	\
 	           cdotest.c

src/Maskbox.c

@@ -25,7 +25,7 @@
 
 #include <ctype.h>
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Mastrfu.c

@@ -24,7 +24,7 @@
 
 #include <math.h>
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Math.c

@@ -35,7 +35,7 @@
 */
 
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Merge.c

@@ -22,7 +22,7 @@
 */
 
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Mergegrid.c

@@ -21,7 +21,7 @@
 */
 
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Mergetime.c

@@ -22,7 +22,7 @@
 */
 
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Merstat.c

@@ -29,7 +29,7 @@
 */
 
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "grid.h"

src/Monarith.c

@@ -24,7 +24,7 @@
       Monarith  mondiv         Divide monthly time series
 */
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Mrotuv.c

@@ -21,7 +21,7 @@
       Mrotuv      mrotuv          Forward rotation for MPIOM data
 */
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Mrotuvb.c

@@ -21,7 +21,7 @@
       Mrotuvb     mrotuvb          Backward rotation for MPIOM data
 */
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Ninfo.c

@@ -27,7 +27,7 @@
 */
 
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Output.c

@@ -25,7 +25,7 @@
       Output     outputext       EXTRA output
 */
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "grid.h"

src/Outputgmt.c

@@ -34,7 +34,7 @@
 #  include "config.h" /* VERSION */
 #endif
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "grid.h"

src/Pinfo.c

@@ -21,7 +21,7 @@
 */
 
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Pressure.c

@@ -24,7 +24,7 @@
 
 #include <ctype.h>
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Regres.c

@@ -22,7 +22,7 @@
 */
 
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Remap.c

@@ -35,7 +35,7 @@
       Remap       remap           SCRIP grid remapping
 */
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Remapeta.c

@@ -22,7 +22,7 @@
 
 #include <ctype.h>
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Replace.c

@@ -21,7 +21,7 @@
       Replace    replace         Replace variables
 */
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"