Commit 98f552f8 authored by Ralf Müller's avatar Ralf Müller
Browse files

forgot to handle grib_api (r1633)

parent 25df340d
......@@ -17871,10 +17871,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 :
......@@ -17948,9 +17945,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"
......
......@@ -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])])])],
......
Markdown is supported
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