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

removed configure option --with-jasper

parent 62c83442
......@@ -3,6 +3,10 @@
* using CDI library version 1.7.0
* Version 1.7.0 released
2015-07-27 Uwe Schulzweida
* remapnn/dis: replaced scrip search by kdtree
2015-07-23 Uwe Schulzweida
* changed option --history to --no_history
......
......@@ -264,7 +264,6 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JASPER_LIBS = @JASPER_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
......
......@@ -30,7 +30,6 @@ case "${HOSTNAME}" in
# i386-apple-darwin10
bailung*|d133*|d134*)
CDOLIBS="--with-fftw3 \
--with-jasper=$HOME/local \
--with-grib_api=$HOME/local/gribapi-1.12.3 \
--with-netcdf=$HOME/local \
--with-hdf5=$HOME/local \
......@@ -42,23 +41,19 @@ case "${HOSTNAME}" in
if test "$COMP" = icc ; then
${CONFPATH}configure \
$CDOLIBS \
LIBS="-L/opt/local/lib -lopenjpeg" \
CC=icc CFLAGS="-g -Wall -O2 -vec-report2 -march=native"
elif test "$COMP" = clang ; then
${CONFPATH}configure \
$CDOLIBS \
LIBS="-L/opt/local/lib -lopenjpeg" \
CC=clang CFLAGS="-g -Wall -O3"
elif test "$COMP" = g++ ; then
${CONFPATH}configure \
$CDOLIBS \
LIBS="-L/opt/local/lib -lopenjpeg" \
CC=g++ CFLAGS="-g -std=c++14 -Drestrict= -Wall -W -Wfloat-equal -pedantic -O3 -march=native"
else
${CONFPATH}configure --prefix=$HOME/local \
--enable-maintainer-mode \
$CDOLIBS \
LIBS="-L/opt/local/lib -lopenjpeg" \
CC=gcc CFLAGS="-g -pipe -Wall -W -Wfloat-equal -pedantic -O3 -march=native -fstack-protector"
# --with-libxml2=/usr
# --with-magics=/Users/m214003/local/magics-2.14.9
......@@ -266,7 +261,6 @@ case "${HOSTNAME}" in
--with-proj=/sw/centos58-x64/proj-4.7.0 \
--with-hdf5=/sw/centos58-x64/hdf5-1.8.10-patch1 \
--with-udunits2=/sw/centos58-x64/udunits-2.1.19 \
--with-jasper=/sw/centos58-x64/jasper-1.900.1 \
--with-grib_api=/sw/centos58-x64/grib_api-1.12.3 \
--with-netcdf=/sw/centos58-x64/netcdf-4.2.1.1 \
--with-szlib=/sw/centos58-x64/szip-2.1 \
......
......@@ -653,7 +653,6 @@ ENABLE_GRIB
ENABLE_GRIBAPI
GRIB_API_LIBS
GRIB_API_INCLUDE
JASPER_LIBS
CMOR_LIBS
NETCDF_LIBS
NETCDF_INCLUDE
......@@ -826,7 +825,6 @@ with_szlib
with_hdf5
with_netcdf
with_cmor
with_jasper
with_grib_api
enable_grib
enable_cgribex
......@@ -1522,15 +1520,11 @@ Optional Packages:
location of hdf5 library, NETCDF4 requires hdf5 high
level interface
--with-netcdf=<yes|no|directory> (default=no)
location of netcdf library (lib and include subdirs)
location of netCDF library (lib and include subdirs)
--with-cmor=<directory> Specify location of CMOR library.
--with-jasper=<directory>
Specify location of JASPER library. You must specify
its location if GRIB_API was built with JASPER.
--with-grib_api=<yes|no|directory>
library for grib2 compression; if a directory is
given, it will be used as a value for
--with-jasper-root
--with-grib_api=<yes|no|directory> (default=no)
location of GRIB_API library (lib and include
subdirs)
--with-fftw3 enable support for fftw3
--with-proj=<directory> Specify location of PROJ library for cartographic
projections.
......@@ -18923,8 +18917,8 @@ ENABLE_NC4HDF5=no
if test "${with_netcdf+set}" = set; then :
withval=$with_netcdf; case "$with_netcdf" in #(
no) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for netcdf library" >&5
$as_echo_n "checking for netcdf library... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for netCDF library" >&5
$as_echo_n "checking for netCDF library... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
$as_echo "suppressed" >&6; } ;; #(
yes) :
......@@ -18998,7 +18992,7 @@ $as_echo "#define HAVE_LIBNETCDF 1" >>confdefs.h
 
ENABLE_NETCDF=yes
else
as_fn_error $? "Could not link to netcdf library" "$LINENO" 5
as_fn_error $? "Could not link to netCDF library" "$LINENO" 5
fi
 
NETCDF_LIBS=" -lnetcdf"
......@@ -19509,173 +19503,6 @@ $as_echo "suppressed" >&6; }
fi
 
 
# ----------------------------------------------------------------------
# Link application with JASPER library (needed for GRIB2 compression)
JASPER_LIBS=''
# Check whether --with-jasper was given.
if test "${with_jasper+set}" = set; then :
withval=$with_jasper; case "$with_jasper" in #(
no) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jasper library" >&5
$as_echo_n "checking for jasper library... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
$as_echo "suppressed" >&6; } ;; #(
yes) :
for ac_header in jasper.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "jasper.h" "ac_cv_header_jasper_h" "$ac_includes_default"
if test "x$ac_cv_header_jasper_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_JASPER_H 1
_ACEOF
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing jas_init" >&5
$as_echo_n "checking for library containing jas_init... " >&6; }
if ${ac_cv_search_jas_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char jas_init ();
int
main ()
{
return jas_init ();
;
return 0;
}
_ACEOF
for ac_lib in '' jasper; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_jas_init=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_jas_init+:} false; then :
break
fi
done
if ${ac_cv_search_jas_init+:} false; then :
else
ac_cv_search_jas_init=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_jas_init" >&5
$as_echo "$ac_cv_search_jas_init" >&6; }
ac_res=$ac_cv_search_jas_init
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_LIBJASPER 1" >>confdefs.h
else
as_fn_error $? "Could not link to jasper library! Required for GRIB_API" "$LINENO" 5
fi
JASPER_LIBS=" -ljasper"
;; #(
*) :
JASPER_ROOT=$with_jasper
if test -d "$JASPER_ROOT"; then :
LDFLAGS="$LDFLAGS -L$JASPER_ROOT/lib"
CPPFLAGS="$CPPFLAGS -I$JASPER_ROOT/include"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing jas_init" >&5
$as_echo_n "checking for library containing jas_init... " >&6; }
if ${ac_cv_search_jas_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char jas_init ();
int
main ()
{
return jas_init ();
;
return 0;
}
_ACEOF
for ac_lib in '' jasper; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_jas_init=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_jas_init+:} false; then :
break
fi
done
if ${ac_cv_search_jas_init+:} false; then :
else
ac_cv_search_jas_init=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_jas_init" >&5
$as_echo "$ac_cv_search_jas_init" >&6; }
ac_res=$ac_cv_search_jas_init
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_LIBJASPER 1" >>confdefs.h
else
as_fn_error $? "Could not link to jasper library! Required for GRIB_API" "$LINENO" 5
fi
JASPER_LIBS=" -L$JASPER_ROOT/lib -ljasper"
else
as_fn_error $? "$JASPER_ROOT is not a directory! JASPER suppressed" "$LINENO" 5
fi ;; #(
*) :
;;
esac
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the JASPER library" >&5
$as_echo_n "checking for the JASPER library... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
$as_echo "suppressed" >&6; }
fi
# ----------------------------------------------------------------------
# Compile application with GRIB_API library (for GRIB2 support)
GRIB_API_INCLUDE=''
......
......@@ -175,7 +175,6 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JASPER_LIBS = @JASPER_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
......
......@@ -22,7 +22,7 @@ libraries should be installed:
This is needed to process netCDF \cite{netCDF} files with {\CDO}.
\item The ECMWF \href{http://www.ecmwf.int/products/data/software/grib_api.html}{GRIB\_API}
({\tt http://www.ecmwf.int/products/data/software/grib\_api.html})
version 1.9.5 or higher.
version 1.12 or higher.
This library is needed to process GRIB2 files with {\CDO}.
\item HDF5 \href{http://www.hdfgroup.org/doc_resource/SZIP}{szip} library
({\tt http://www.hdfgroup.org/doc\_resource/SZIP})
......@@ -77,12 +77,10 @@ Compilation is done by performing the following steps:
./configure --with-netcdf=<netCDF root directory>
\end{verbatim}
\item The GRIB2 configuration depends on the GRIB\_API installation!
Here is an example GRIB2 configuration with a JASPER enabled GRIB\_API version:
\item and with GRIB\_API:
\begin{verbatim}
./configure --with-grib_api=<GRIB_API root directory> \
--with-jasper=<JASPER root directory>
./configure --with-grib_api=<GRIB_API root directory>
\end{verbatim}
%%You have to specify also the location of the SZLIB if HDF5 was build with SZLIB support.\\
......
......@@ -143,23 +143,23 @@ ENABLE_NC2=no
ENABLE_NC4=no
ENABLE_NC4HDF5=no
AC_ARG_WITH([netcdf],
[AS_HELP_STRING([--with-netcdf=<yes|no|directory> (default=no)],[location of netcdf library (lib and include subdirs)])],
[AS_HELP_STRING([--with-netcdf=<yes|no|directory> (default=no)],[location of netCDF library (lib and include subdirs)])],
[AS_CASE(["$with_netcdf"],
[no],[AC_MSG_CHECKING([for netcdf library])
[no],[AC_MSG_CHECKING([for netCDF library])
AC_MSG_RESULT([suppressed])],
[yes],[AC_CHECK_HEADERS([netcdf.h])
AC_SEARCH_LIBS([nc_open],
[netcdf],
[AC_DEFINE([HAVE_LIBNETCDF],[1],[Define to 1 for NETCDF support])
[AC_DEFINE([HAVE_LIBNETCDF],[1],[Define to 1 for netCDF support])
ENABLE_NETCDF=yes],
[AC_MSG_ERROR([Could not link to netcdf library])])
[AC_MSG_ERROR([Could not link to netCDF library])])
NETCDF_LIBS=" -lnetcdf"
AC_CHECK_PROG(NC_CONFIG,nc-config,nc-config)
AS_IF([test "x$NC_CONFIG" != "x"],
[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])
[AC_DEFINE([HAVE_NETCDF2],[1],[Define to 1 for netCDF2 support])
ENABLE_NC2=yes
AC_MSG_RESULT([yes])],[AC_MSG_RESULT([no])])
AC_MSG_CHECKING([netcdf's nc4 support])
......@@ -252,39 +252,12 @@ AC_ARG_WITH([cmor],
AC_MSG_RESULT([suppressed])])
AC_SUBST([CMOR_LIBS])
# ----------------------------------------------------------------------
# Link application with JASPER library (needed for GRIB2 compression)
JASPER_LIBS=''
AC_ARG_WITH([jasper],
[AS_HELP_STRING([--with-jasper=<directory>],
[Specify location of JASPER library. You must specify its location if GRIB_API was built with JASPER.])],
[AS_CASE(["$with_jasper"],
[no],[AC_MSG_CHECKING([for jasper library])
AC_MSG_RESULT([suppressed])],
[yes],[AC_CHECK_HEADERS([jasper.h])
AC_SEARCH_LIBS([jas_init],[jasper],[AC_DEFINE([HAVE_LIBJASPER],[1],[Define to 1 for JPEG compression for GRIB2])],
[AC_MSG_ERROR([Could not link to jasper library! Required for GRIB_API])])
AC_SUBST([JASPER_LIBS],[" -ljasper"])],
[*],[JASPER_ROOT=$with_jasper
AS_IF([test -d "$JASPER_ROOT"],
[LDFLAGS="$LDFLAGS -L$JASPER_ROOT/lib"
CPPFLAGS="$CPPFLAGS -I$JASPER_ROOT/include"
AC_SEARCH_LIBS([jas_init],
[jasper],
[AC_DEFINE([HAVE_LIBJASPER],[1],[Define to 1 for JPEG compression for GRIB2])],
[AC_MSG_ERROR([Could not link to jasper library! Required for GRIB_API])])
JASPER_LIBS=" -L$JASPER_ROOT/lib -ljasper"],
[AC_MSG_ERROR([$JASPER_ROOT is not a directory! JASPER suppressed])])])],
[AC_MSG_CHECKING([for the JASPER library])
AC_MSG_RESULT([suppressed])])
AC_SUBST([JASPER_LIBS])
# ----------------------------------------------------------------------
# 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>],
[library for grib2 compression; if a directory is given, it will be used as a value for --with-jasper-root])],
[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])],
......
......@@ -435,7 +435,6 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JASPER_LIBS = @JASPER_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
......
......@@ -52,9 +52,6 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the <jasper.h> header file. */
#undef HAVE_JASPER_H
/* Define to 1 for GRIB1 decoding/encoding with cgribex */
#undef HAVE_LIBCGRIBEX
......@@ -82,9 +79,6 @@
/* Define to 1 for IEG interface */
#undef HAVE_LIBIEG
/* Define to 1 for JPEG compression for GRIB2 */
#undef HAVE_LIBJASPER
/* Define to 1 if you have the `m' library (-lm). */
#undef HAVE_LIBM
......
......@@ -388,7 +388,6 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JASPER_LIBS = @JASPER_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
......
......@@ -174,7 +174,6 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JASPER_LIBS = @JASPER_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
......
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