Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cdo
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mpim-sw
cdo
Commits
fa7f11a0
Commit
fa7f11a0
authored
1 year ago
by
Uwe Schulzweida
Browse files
Options
Downloads
Patches
Plain Diff
acx_options.m4: remove option --with-grib_api
parent
fa1910cc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!194
M214003/develop
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libcdi
+1
-1
1 addition, 1 deletion
libcdi
m4/acx_options.m4
+2
-35
2 additions, 35 deletions
m4/acx_options.m4
with
3 additions
and
36 deletions
libcdi
@
bc3707ee
Compare
d64b8516
...
bc3707ee
Subproject commit
d64b85
16
8
fa
d6fd7a8bebe3a12e386b0f8c6a41a
Subproject commit
bc3707ee
16fa
69ba746084259cf2b300f565e8ab
This diff is collapsed.
Click to expand it.
m4/acx_options.m4
+
2
−
35
View file @
fa7f11a0
...
...
@@ -276,7 +276,8 @@ ECCODES_INCLUDE=''
ECCODES_LIBS=''
ENABLE_GRIBAPI=no
AC_ARG_WITH([eccodes],
[AS_HELP_STRING([--with-eccodes=<yes|no|directory> (default=no)],[location of ECCODES library (lib and include subdirs)])],
[AS_HELP_STRING([--with-eccodes=<yes|no|directory> (default=no)],
[location of ECCODES library for grib2 encoding/decoding (lib and include subdirs)])],
[AS_CASE(["$with_eccodes"],
[no],[AC_MSG_CHECKING([for ECCODES library])
AC_MSG_RESULT([suppressed])],
...
...
@@ -303,40 +304,6 @@ AC_ARG_WITH([eccodes],
AC_MSG_RESULT([suppressed])])
AC_SUBST([ECCODES_INCLUDE])
AC_SUBST([ECCODES_LIBS])
#AC_SUBST([ENABLE_GRIBAPI])
# ----------------------------------------------------------------------
# Compile application with GRIB_API library (for GRIB2 support)
GRIB_API_INCLUDE=''
GRIB_API_LIBS=''
#ENABLE_GRIBAPI=no
AC_ARG_WITH([grib_api],
[AS_HELP_STRING([--with-grib_api=<yes|no|directory> (default=no)],[location of GRIB_API library (lib and include subdirs)])],
[AS_CASE(["$with_grib_api"],
[no],[AC_MSG_CHECKING([for GRIB_API library])
AC_MSG_RESULT([suppressed])],
[yes],[AC_CHECK_HEADERS([grib_api.h])
AC_SEARCH_LIBS([grib_get_message],
[grib_api],
[AC_DEFINE([HAVE_LIBGRIB_API],[1],[GRIB_API library is present if defined to 1])
ENABLE_GRIBAPI=yes],
[AC_MSG_ERROR([Could not link to grib_api library])])],
[*],[GRIB_API_ROOT=$with_grib_api
AS_IF([test -d "$GRIB_API_ROOT"],
[LDFLAGS="-L$GRIB_API_ROOT/lib $LDFLAGS"
CPPFLAGS="-I$GRIB_API_ROOT/include $CPPFLAGS"
AC_CHECK_HEADERS([grib_api.h])
AC_SEARCH_LIBS([grib_get_message],
[grib_api],
[AC_DEFINE([HAVE_LIBGRIB_API],[1],[GRIB_API library is present if defined to 1])
ENABLE_GRIBAPI=yes],
[AC_MSG_ERROR([Could not link to grib_api library])])
GRIB_API_LIBS=" -L$GRIB_API_ROOT/lib -lgrib_api"
GRIB_API_INCLUDE=" -I$GRIB_API_ROOT/include"],
[AC_MSG_ERROR([$GRIB_API_ROOT is not a directory! GRIB_API suppressed])])])],
[AC_MSG_CHECKING([for the GRIB_API library])
AC_MSG_RESULT([suppressed])])
AC_SUBST([GRIB_API_INCLUDE])
AC_SUBST([GRIB_API_LIBS])
AC_SUBST([ENABLE_GRIBAPI])
# ----------------------------------------------------------------------
# Enable GRIB support
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment