Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
bc37d409
Commit
bc37d409
authored
Feb 28, 2011
by
Ralf Mueller
Browse files
forgot to handle grib_api (r834)
parent
1517dee4
Changes
2
Hide whitespace changes
Inline
Side-by-side
configure
View file @
bc37d409
...
...
@@ -23596,10 +23596,7 @@ fi
*) :
GRIB_API_ROOT=$with_grib_api
if test -d "$GRIB_API_ROOT"; then :
LDFLAGS_org="$LDFLAGS"
CPPFLAGS_org="$CPPFLAGS"
LIBS_org="$LIBS"
LDFLAGS="-L$GRIB_API_ROOT/lib $LDFLAGS"
LDFLAGS="-L$GRIB_API_ROOT/lib $LDFLAGS"
CPPFLAGS="-I$GRIB_API_ROOT/include $CPPFLAGS"
for ac_header in grib_api.h
do :
...
...
@@ -23673,9 +23670,6 @@ else
as_fn_error $? "Could not link to grib_api library" "$LINENO" 5
fi
LDFLAGS="$LDFLAGS_org"
CPPFLAGS="$CPPFLAGS_org"
LIBS="$LIBS_org"
GRIB_API_LDFLAGS=" -L$GRIB_API_ROOT/lib -lgrib_api"
GRIB_API_INCLUDE=" -I$GRIB_API_ROOT/include"
...
...
m4/acx_options.m4
View file @
bc37d409
...
...
@@ -185,19 +185,13 @@ AC_ARG_WITH([grib_api],
[AC_MSG_ERROR([Could not link to grib_api library])])],
[*],[GRIB_API_ROOT=$with_grib_api
AS_IF([test -d "$GRIB_API_ROOT"],
[LDFLAGS_org="$LDFLAGS"
CPPFLAGS_org="$CPPFLAGS"
LIBS_org="$LIBS"
LDFLAGS="-L$GRIB_API_ROOT/lib $LDFLAGS"
[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])],
[AC_MSG_ERROR([Could not link to grib_api library])])
LDFLAGS="$LDFLAGS_org"
CPPFLAGS="$CPPFLAGS_org"
LIBS="$LIBS_org"
AC_SUBST([GRIB_API_LDFLAGS],[" -L$GRIB_API_ROOT/lib -lgrib_api"])
AC_SUBST([GRIB_API_INCLUDE],[" -I$GRIB_API_ROOT/include"])],
[AC_MSG_ERROR([$GRIB_API_ROOT is not a directory! GRIB_API suppressed])])])],
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment