M300433/cmake improvements and define cleanups

src/cdi.h

@@ -1447,6 +1447,9 @@ extern int (*proj_stere_to_lonlat_func)(struct CDI_GridProjParams gpp, double, d
 // Used on CDO remap_scrip_io.cc
 void cdf_def_var_filter(int ncid, int ncvarID, const char *filterSpec);
 
+int cdi_has_dap();
+int cdi_has_cgribex();
+
 #ifdef __cplusplus
 }
 #endif