Removed local cdi.h copy

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

src/Gridcell.c

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

src/Harmonic.c

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

src/Hi.c

@@ -21,7 +21,7 @@
       Hi      hi           Compute the humidity index
 */
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Histogram.c

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

src/IFS2ICON.c

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

src/Importamsr.c

-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Importbinary.c

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

src/Importcmsaf.c

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

src/Importobs.c

 #include <ctype.h>
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Info.c

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

src/Input.c

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

src/Intgrid.c

@@ -22,7 +22,7 @@
       Intgrid    intgridbil      Bilinear grid interpolation
 */
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Intgridtraj.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/Intlevel.c

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

src/Intntime.c

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

src/Inttime.c

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

src/Intyear.c

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

src/Invert.c

@@ -26,7 +26,7 @@
       Invert     invertlondata   Invert longitude data
 */
 
-#include "cdi.h"
+#include <cdi.h>
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"

src/Invertlev.c

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

src/Makefile.am

@@ -256,6 +256,7 @@ cdo_SOURCES += Arith.c         \
 cdo_LDADD     =
 cdo_CPPFLAGS  =
 if USE_INTERNAL_CDI
+cdo_CPPFLAGS += -I$(top_srcdir)/libcdi/src
 cdo_LDADD    += $(top_builddir)/libcdi/src/libcdi.la
 else
 cdo_LDADD    += @CDI_LDFLAGS@