<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/429c315c9d4dde8b682410f8e0158a412d77ae4d">https://github.com/macports/macports-ports/commit/429c315c9d4dde8b682410f8e0158a412d77ae4d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 429c315c9d4dde8b682410f8e0158a412d77ae4d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jun 29 08:00:54 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> gdal: Update to 3.1.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Switch to xz release tarball; xz compression is much better than gz and
</span><span style='display:block; white-space:pre;color:#404040;'> the release tarball is made from just the gdal subdirectory, which
</span><span style='display:block; white-space:pre;color:#404040;'> happens to be all that we need for the port.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove charls patch; a fix for this was incorporated upstream.
</span>---
gis/gdal/Portfile | 19 ++-
gis/gdal/files/patch-charls-configure.diff | 218 -----------------------------
2 files changed, 8 insertions(+), 229 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 739c85396b2..14ba111d5fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,8 +11,12 @@ PortGroup conflicts_build 1.0
</span> PortGroup debug 1.0
mpi.setup
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup OSGeo gdal 3.1.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OSGeo gdal 3.1.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 348c980e93acf8d4c89bb0bcd1614df430f7336f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 97154a606339a6c1d87c80fb354d7456fe49828b2ef9a3bc9ed91771a03d2a04 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12082332
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories gis
license MIT BSD
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,15 +34,8 @@ long_description GDAL is a translator library for raster geospatial \
</span> similar capability for simple features vector data.
homepage https://www.gdal.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 efccd737eae5b4cb996fee9d0b21f485015e24be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0c01b70175ad508e187ca44faf1fce062f290267ff02d2170490cb006fe34271 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 27741245
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${worksrcpath}/gdal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/60625
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-charls-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://download.osgeo.org/gdal/${version}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
# this can be removed in a future version of MacPorts
# see https://github.com/macports/macports-base/pull/161
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-charls-configure.diff b/gis/gdal/files/patch-charls-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9b36d21d383..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-charls-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,218 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.old 2020-05-04 11:06:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2020-06-27 08:50:55.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30259,26 +30259,32 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CHARLS_INC=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$with_charls" = "yes" -o "$with_charls" = "" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ac_header in CharLS/interface.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for ac_header in charls/version.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- do :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_fn_c_check_header_mongrel "$LINENO" "CharLS/interface.h" "ac_cv_header_CharLS_interface_h" "$ac_includes_default"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "x$ac_cv_header_CharLS_interface_h" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_fn_c_check_header_mongrel "$LINENO" "charls/version.h" "ac_cv_header_charls_version_h" "$ac_includes_default"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x$ac_cv_header_charls_version_h" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define HAVE_CHARLS_INTERFACE_H 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HAVE_CHARLS_VERSION_H 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$ac_cv_header_CharLS_interface_h" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JpegLsDecode in -lCharLS" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo_n "checking for JpegLsDecode in -lCharLS... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if ${ac_cv_lib_CharLS_JpegLsDecode+:} false; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "$ac_cv_header_charls_version_h" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_ext=cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ac_cpp='$CXXCPP $CPPFLAGS'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JpegLsDecode in -lcharls" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo_n "checking for JpegLsDecode in -lcharls... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if ${ac_cv_lib_charls_JpegLsDecode+:} false; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS="-lCharLS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS="-lcharls $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30297,46 +30303,46 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if ac_fn_c_try_link "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_cv_lib_CharLS_JpegLsDecode=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if ac_fn_cxx_try_link "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_cv_lib_charls_JpegLsDecode=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_cv_lib_CharLS_JpegLsDecode=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_cv_lib_charls_JpegLsDecode=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS=$ac_check_lib_save_LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_CharLS_JpegLsDecode" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo "$ac_cv_lib_CharLS_JpegLsDecode" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "x$ac_cv_lib_CharLS_JpegLsDecode" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_charls_JpegLsDecode" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo "$ac_cv_lib_charls_JpegLsDecode" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x$ac_cv_lib_charls_JpegLsDecode" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_CHARLS=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_ext=c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ac_cpp='$CPP $CPPFLAGS'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$HAVE_CHARLS" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS="-lCharLS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CHARLS_INC="-DCHARLS_INTERFACE_H"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS="-lcharls $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CHARLS_INC="-DCHARLS_2_1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ac_header in CharLS/charls.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for ac_header in CharLS/interface.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- do :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_fn_c_check_header_mongrel "$LINENO" "CharLS/charls.h" "ac_cv_header_CharLS_charls_h" "$ac_includes_default"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "x$ac_cv_header_CharLS_charls_h" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_fn_c_check_header_mongrel "$LINENO" "CharLS/interface.h" "ac_cv_header_CharLS_interface_h" "$ac_includes_default"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x$ac_cv_header_CharLS_interface_h" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define HAVE_CHARLS_CHARLS_H 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HAVE_CHARLS_INTERFACE_H 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$ac_cv_header_CharLS_charls_h" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_ext=cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ac_cpp='$CXXCPP $CPPFLAGS'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JpegLsDecode in -lCharLS" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "$ac_cv_header_CharLS_interface_h" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JpegLsDecode in -lCharLS" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "checking for JpegLsDecode in -lCharLS... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ${ac_cv_lib_CharLS_JpegLsDecode+:} false; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30361,7 +30367,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if ac_fn_cxx_try_link "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if ac_fn_c_try_link "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_lib_CharLS_JpegLsDecode=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_lib_CharLS_JpegLsDecode=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30376,21 +30382,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_CHARLS=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_ext=c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ac_cpp='$CPP $CPPFLAGS'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ac_compiler_gnu=$ac_cv_c_compiler_gnu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$HAVE_CHARLS" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS="-lCharLS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CHARLS_INC="-DCHARLS_2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "$HAVE_CHARLS" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS="-lCharLS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CHARLS_INC="-DCHARLS_INTERFACE_H"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ac_header in charls/charls.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for ac_header in CharLS/charls.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- do :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_fn_c_check_header_mongrel "$LINENO" "charls/charls.h" "ac_cv_header_charls_charls_h" "$ac_includes_default"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "x$ac_cv_header_charls_charls_h" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_fn_c_check_header_mongrel "$LINENO" "CharLS/charls.h" "ac_cv_header_CharLS_charls_h" "$ac_includes_default"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x$ac_cv_header_CharLS_charls_h" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HAVE_CHARLS_CHARLS_H 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30399,20 +30399,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$ac_cv_header_charls_charls_h" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_ext=cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "$ac_cv_header_CharLS_charls_h" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_ext=cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cpp='$CXXCPP $CPPFLAGS'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JpegLsDecode in -lcharls" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo_n "checking for JpegLsDecode in -lcharls... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if ${ac_cv_lib_charls_JpegLsDecode+:} false; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JpegLsDecode in -lCharLS" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo_n "checking for JpegLsDecode in -lCharLS... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if ${ac_cv_lib_CharLS_JpegLsDecode+:} false; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS="-lcharls $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS="-lCharLS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30432,31 +30432,31 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ac_fn_cxx_try_link "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_cv_lib_charls_JpegLsDecode=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_cv_lib_CharLS_JpegLsDecode=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_cv_lib_charls_JpegLsDecode=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_cv_lib_CharLS_JpegLsDecode=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS=$ac_check_lib_save_LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_charls_JpegLsDecode" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo "$ac_cv_lib_charls_JpegLsDecode" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "x$ac_cv_lib_charls_JpegLsDecode" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_CharLS_JpegLsDecode" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo "$ac_cv_lib_CharLS_JpegLsDecode" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x$ac_cv_lib_CharLS_JpegLsDecode" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_CHARLS=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_ext=c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_ext=c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cpp='$CPP $CPPFLAGS'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_compiler_gnu=$ac_cv_c_compiler_gnu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$HAVE_CHARLS" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS="-lcharls $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CHARLS_INC="-DCHARLS_2_1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "$HAVE_CHARLS" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS="-lCharLS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CHARLS_INC="-DCHARLS_2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span></pre><pre style='margin:0'>
</pre>