Commit 0b63ecfa authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Removed lib jasper, openjpg and png from configuration.

parent b5845133
......@@ -293,11 +293,9 @@ 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@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
......@@ -321,7 +319,6 @@ NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPENJPEG_LIBS = @OPENJPEG_LIBS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
......@@ -403,7 +400,6 @@ localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
openjpeg_LIBS = @openjpeg_LIBS@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
......
......@@ -266,11 +266,9 @@ 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@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
......@@ -294,7 +292,6 @@ NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPENJPEG_LIBS = @OPENJPEG_LIBS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
......@@ -376,7 +373,6 @@ localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
openjpeg_LIBS = @openjpeg_LIBS@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
......
......@@ -688,10 +688,6 @@ HAVE_LIBGRIB_API_FALSE
HAVE_LIBGRIB_API_TRUE
GRIB_API_LIBS
GRIB_API_INCLUDE
LIBPNG_LIBS
OPENJPEG_LIBS
openjpeg_LIBS
JASPER_LIBS
NETCDF_LIBS
NETCDF_INCLUDE
NETCDF_ROOT
......@@ -862,9 +858,6 @@ enable_largefile
with_threads
with_szlib
with_netcdf
with_jasper
with_openjpeg
with_libpng
with_grib_api
enable_grib
enable_cgribex
......@@ -1592,16 +1585,6 @@ Optional Packages:
NETCDF4 compression
--with-netcdf=<yes|no|directory> (default=no)
location of NetCDF library (lib and include subdirs)
--with-jasper=<directory>
Specify location of JASPER library. You must specify
its location if GRIB_API was built with JASPER.
--with-openjpeg=<directory>
Specify location of openjpeg library. You must
specify its location if GRIB_API was built with
openjpeg.
--with-libpng=<directory>
Specify location of LIBPNG library. You must specify
its location if GRIB_API was built with LIBPNG.
--with-grib_api=<yes|no|directory>
library for grib2 compression; if a directory is
given, it will be used as a value for
......@@ -27528,507 +27511,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_stream_memopen" >&5
$as_echo_n "checking for library containing jas_stream_memopen... " >&6; }
if ${ac_cv_search_jas_stream_memopen+:} 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_stream_memopen ();
int
main ()
{
return jas_stream_memopen ();
;
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_stream_memopen=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_jas_stream_memopen+:} false; then :
break
fi
done
if ${ac_cv_search_jas_stream_memopen+:} false; then :
else
ac_cv_search_jas_stream_memopen=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_stream_memopen" >&5
$as_echo "$ac_cv_search_jas_stream_memopen" >&6; }
ac_res=$ac_cv_search_jas_stream_memopen
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
# ----------------------------------------------------------------------
# Link application with openjpeg library (needed for GRIB2 compression)
OPENJPEG_LIBS=''
# Check whether --with-openjpeg was given.
if test "${with_openjpeg+set}" = set; then :
withval=$with_openjpeg; case "$with_openjpeg" in #(
no) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openjpeg library" >&5
$as_echo_n "checking for openjpeg library... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
$as_echo "suppressed" >&6; } ;; #(
yes) :
for ac_header in openjpeg.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "openjpeg.h" "ac_cv_header_openjpeg_h" "$ac_includes_default"
if test "x$ac_cv_header_openjpeg_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENJPEG_H 1
_ACEOF
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opj_image_create" >&5
$as_echo_n "checking for library containing opj_image_create... " >&6; }
if ${ac_cv_search_opj_image_create+:} 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 opj_image_create ();
int
main ()
{
return opj_image_create ();
;
return 0;
}
_ACEOF
for ac_lib in '' openjpeg; 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_opj_image_create=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_opj_image_create+:} false; then :
break
fi
done
if ${ac_cv_search_opj_image_create+:} false; then :
else
ac_cv_search_opj_image_create=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opj_image_create" >&5
$as_echo "$ac_cv_search_opj_image_create" >&6; }
ac_res=$ac_cv_search_opj_image_create
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_LIBOPENJPEG 1" >>confdefs.h
else
as_fn_error $? "Could not link to openjpeg library! Required for GRIB_API" "$LINENO" 5
fi
openjpeg_LIBS=" -lopenjpeg"
;; #(
*) :
OPENJPEG_ROOT=$with_openjpeg
if test -d "$OPENJPEG_ROOT"; then :
LDFLAGS="$LDFLAGS -L$OPENJPEG_ROOT/lib"
CPPFLAGS="$CPPFLAGS -I$OPENJPEG_ROOT/include"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opj_image_create" >&5
$as_echo_n "checking for library containing opj_image_create... " >&6; }
if ${ac_cv_search_opj_image_create+:} 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 opj_image_create ();
int
main ()
{
return opj_image_create ();
;
return 0;
}
_ACEOF
for ac_lib in '' openjpeg; 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_opj_image_create=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_opj_image_create+:} false; then :
break
fi
done
if ${ac_cv_search_opj_image_create+:} false; then :
else
ac_cv_search_opj_image_create=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opj_image_create" >&5
$as_echo "$ac_cv_search_opj_image_create" >&6; }
ac_res=$ac_cv_search_opj_image_create
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_LIBOPENJPEG 1" >>confdefs.h
else
as_fn_error $? "Could not link to openjpeg library! Required for GRIB_API" "$LINENO" 5
fi
OPENJPEG_LIBS=" -L$OPENJPEG_ROOT/lib -lopenjpeg"
else
as_fn_error $? "$OPENJPEG_ROOT is not a directory! openjpeg suppressed" "$LINENO" 5
fi ;; #(
*) :
;;
esac
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the openjpeg library" >&5
$as_echo_n "checking for the openjpeg library... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
$as_echo "suppressed" >&6; }
fi
# ----------------------------------------------------------------------
# Link application with LIBPNG library (needed for GRIB2 compression)
LIBPNG_LIBS=''
# Check whether --with-libpng was given.
if test "${with_libpng+set}" = set; then :
withval=$with_libpng; case "$with_libpng" in #(
no) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng library" >&5
$as_echo_n "checking for libpng library... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
$as_echo "suppressed" >&6; } ;; #(
yes) :
for ac_header in png.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
if test "x$ac_cv_header_png_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PNG_H 1
_ACEOF
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing png_warning" >&5
$as_echo_n "checking for library containing png_warning... " >&6; }
if ${ac_cv_search_png_warning+:} 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 png_warning ();
int
main ()
{
return png_warning ();
;
return 0;
}
_ACEOF
for ac_lib in '' png; 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_png_warning=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_png_warning+:} false; then :
break
fi
done
if ${ac_cv_search_png_warning+:} false; then :
else
ac_cv_search_png_warning=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_png_warning" >&5
$as_echo "$ac_cv_search_png_warning" >&6; }
ac_res=$ac_cv_search_png_warning
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_LIBLIBPNG 1" >>confdefs.h
else
as_fn_error $? "Could not link to libpng library! Required for GRIB_API" "$LINENO" 5
fi
LIBPNG_LIBS=" -lpng"
;; #(
*) :
LIBPNG_ROOT=$with_libpng
if test -d "$LIBPNG_ROOT"; then :
LDFLAGS="$LDFLAGS -L$LIBPNG_ROOT/lib"
CPPFLAGS="$CPPFLAGS -I$LIBPNG_ROOT/include"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing png_warning" >&5
$as_echo_n "checking for library containing png_warning... " >&6; }
if ${ac_cv_search_png_warning+:} 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 png_warning ();
int
main ()
{
return png_warning ();
;
return 0;
}
_ACEOF
for ac_lib in '' png; 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_png_warning=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_png_warning+:} false; then :
break
fi
done
if ${ac_cv_search_png_warning+:} false; then :
else
ac_cv_search_png_warning=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_png_warning" >&5
$as_echo "$ac_cv_search_png_warning" >&6; }
ac_res=$ac_cv_search_png_warning
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_LIBLIBPNG 1" >>confdefs.h
else
as_fn_error $? "Could not link to libpng library! Required for GRIB_API" "$LINENO" 5
fi
LIBPNG_LIBS=" -L$LIBPNG_ROOT/lib -lpng"
else
as_fn_error $? "$LIBPNG_ROOT is not a directory! LIBPNG suppressed" "$LINENO" 5
fi ;; #(
*) :
;;
esac
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the LIBPNG library" >&5
$as_echo_n "checking for the LIBPNG 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=''
......@@ -314,11 +314,9 @@ 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@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
......@@ -342,7 +340,6 @@ NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPENJPEG_LIBS = @OPENJPEG_LIBS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
......@@ -424,7 +421,6 @@ localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
openjpeg_LIBS = @openjpeg_LIBS@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
......
......@@ -308,11 +308,9 @@ 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@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
......@@ -336,7 +334,6 @@ NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPENJPEG_LIBS = @OPENJPEG_LIBS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
......@@ -418,7 +415,6 @@ localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
openjpeg_LIBS = @openjpeg_LIBS@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
......
......@@ -292,11 +292,9 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JASPER_LIBS = @JASPER_LIBS@