Commit f884ee6d authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

acx_options.m4: added OpenDAP support

parent 788923c8
......@@ -57,6 +57,48 @@ static
void version(void)
{
fprintf(stderr, "CDI version 1.7.1\n");
#if defined (COMPILER)
fprintf(stderr, "Compiler: %s\n", COMPILER);
#endif
#if defined (COMP_VERSION)
fprintf(stderr, " version: %s\n", COMP_VERSION);
#endif
fprintf(stderr, " with:");
#if defined (HAVE_LIBPTHREAD)
fprintf(stderr, " PTHREADS");
#endif
#if defined (_OPENMP)
fprintf(stderr, " OpenMP");
#endif
#if defined (HAVE_NETCDF4)
fprintf(stderr, " NC4");
#endif
#if defined (HAVE_LIBNC_DAP)
fprintf(stderr, " OPeNDAP");
#endif
#if defined (HAVE_LIBSZ)
fprintf(stderr, " SZ");
#endif
#if defined (HAVE_LIBZ)
fprintf(stderr, " Z");
#endif
#if defined (HAVE_LIBJASPER)
fprintf(stderr, " JASPER");
#endif
#if defined (HAVE_LIBPROJ)
fprintf(stderr, " PROJ.4");
#endif
#if defined (HAVE_LIBDRMAA)
fprintf(stderr, " DRMAA");
#endif
#if defined (HAVE_LIBCURL)
fprintf(stderr, " CURL");
#endif
fprintf(stderr, "\n");
#if defined (USER_NAME) && defined(HOST_NAME) && defined(SYSTEM_TYPE)
fprintf(stderr, "Compiled: by %s on %s (%s) %s %s\n",
USER_NAME, HOST_NAME, SYSTEM_TYPE, __DATE__, __TIME__);
#endif
cdiPrintVersion();
fprintf(stderr, "\n");
/*
......@@ -131,7 +173,7 @@ void printInfo(int gridtype, int vdate, int vtime, char *varname, double level,
date2str(vdate, vdatestr, sizeof(vdatestr));
time2str(vtime, vtimestr, sizeof(vtimestr));
fprintf(stdout, "%6d :%s %s %-10s %7g ", ++rec, vdatestr, vtimestr, varname, level);
fprintf(stdout, "%7d ", datasize);
......
......@@ -809,6 +809,7 @@ enable_dependency_tracking
with_gnu_ld
with_sysroot
enable_libtool_lock
with_gnu_ld
enable_largefile
with_threads
with_zlib
......@@ -838,16 +839,25 @@ LDFLAGS
LIBS
CPPFLAGS
CPP
CPPFLAGS
FC
FCFLAGS
LDFLAGS
LIBS
FPP
FPPFLAGS
F77
FFLAGS
LDFLAGS
LIBS
CXX
CXXFLAGS
LDFLAGS
LIBS
CPPFLAGS
CCC
CXXCPP
CPPFLAGS
FCMODEXT'
 
 
......@@ -24571,7 +24581,7 @@ fi
 
done
 
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5
$as_echo_n "checking for library containing deflate... " >&6; }
if ${ac_cv_search_deflate+:} false; then :
$as_echo_n "(cached) " >&6
......@@ -25408,7 +25418,19 @@ fi
 
 
if test "x$NC_CONFIG" != "x"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's nc2 support" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's OpenDAP support" >&5
$as_echo_n "checking netcdf's OpenDAP support... " >&6; }
if test "x$($NC_CONFIG --has-dap)" = "xyes"; then :
$as_echo "#define HAVE_LIBNC_DAP 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's nc2 support" >&5
$as_echo_n "checking netcdf's nc2 support... " >&6; }
if test "x$($NC_CONFIG --has-nc2)" = "xyes"; then :
 
......
......@@ -45,8 +45,8 @@ AC_ARG_WITH([zlib],
AC_SEARCH_LIBS([deflate],[z],[AC_DEFINE([HAVE_LIBZ],[1],[Define 1 for ZLIB support])])
ZLIB_INCLUDE=" -I$ZLIB_ROOT/include"
ZLIB_LIBS=" -L$ZLIB_ROOT/lib -lz"])],
[AC_CHECK_HEADERS(zlib.h)
AC_SEARCH_LIBS([deflate],[z],[AC_DEFINE([HAVE_LIBZ],[1],[Define 1 for ZLIB support])])
[AC_CHECK_HEADERS(zlib.h)
AC_SEARCH_LIBS([deflate],[z],[AC_DEFINE([HAVE_LIBZ],[1],[Define 1 for ZLIB support])])
ZLIB_LIBS=" -lz"])
AC_SUBST([ZLIB_INCLUDE])
AC_SUBST([ZLIB_LIBS])
......@@ -174,6 +174,10 @@ AC_ARG_WITH([netcdf],
AC_MSG_CHECKING([nc-config script])
AC_CHECK_PROG(NC_CONFIG,nc-config,[$NETCDF_ROOT/bin/nc-config],,["$NETCDF_ROOT/bin"])
AS_IF([test "x$NC_CONFIG" != "x"],
[AC_MSG_CHECKING([netcdf's OpenDAP support])
AS_IF([test "x$($NC_CONFIG --has-dap)" = "xyes"],
[AC_DEFINE([HAVE_LIBNC_DAP],[1],[Define to 1 for NETCDF OpenDAP])
AC_MSG_RESULT([yes])],[AC_MSG_RESULT([no])])]
[AC_MSG_CHECKING([netcdf's nc2 support])
AS_IF([test "x$($NC_CONFIG --has-nc2)" = "xyes"],
[AC_DEFINE([HAVE_NETCDF2],[1],[Define to 1 for NETCDF2 support])
......
......@@ -51,6 +51,9 @@
/* Define to 1 if you have the `malloc' library (-lmalloc). */
#undef HAVE_LIBMALLOC
/* Define to 1 for NETCDF OpenDAP */
#undef HAVE_LIBNC_DAP
/* Define to 1 for NETCDF support */
#undef HAVE_LIBNETCDF
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment