cec2f8e770
Changes: https://github.com/OSGeo/gdal/releases https://github.com/OSGeo/gdal/blob/master/gdal/NEWS
58 lines
2.6 KiB
Plaintext
58 lines
2.6 KiB
Plaintext
% sed -e 's|-lminizip|-lkmlminizip|; s|IlmImf|OpenEXR|' configure
|
|
|
|
--- configure.orig 2021-06-28 10:57:58 UTC
|
|
+++ configure
|
|
@@ -36537,9 +36537,9 @@ $as_echo "$LIBKML_VERSION" >&6; }
|
|
libkml_include_dir2="$libkml_prefix/include/kml"
|
|
libkml_include_dir3="$libkml_prefix/include/kml/third_party/boost_1_34_1"
|
|
if test "$libkml_prefix" = "/usr"; then
|
|
- libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
|
|
+ libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lkmlminizip -luriparser"
|
|
else
|
|
- libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
|
|
+ libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lkmlminizip -luriparser"
|
|
fi
|
|
run_libkml_test="yes"
|
|
elif test "$libkml_requested" = "yes"; then
|
|
@@ -42246,13 +42246,13 @@ fi
|
|
# Test that the package found is for the right architecture
|
|
saved_LIBS="$LIBS"
|
|
LIBS="$EXR_LIBS"
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ImfTiledInputReadTile in -lIlmImf" >&5
|
|
-$as_echo_n "checking for ImfTiledInputReadTile in -lIlmImf... " >&6; }
|
|
-if ${ac_cv_lib_IlmImf_ImfTiledInputReadTile+:} false; then :
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ImfTiledInputReadTile in -lOpenEXR" >&5
|
|
+$as_echo_n "checking for ImfTiledInputReadTile in -lOpenEXR... " >&6; }
|
|
+if ${ac_cv_lib_OpenEXR_ImfTiledInputReadTile+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lIlmImf $LIBS"
|
|
+LIBS="-lOpenEXR $LIBS"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
@@ -42272,17 +42272,17 @@ return ImfTiledInputReadTile ();
|
|
}
|
|
_ACEOF
|
|
if ac_fn_c_try_link "$LINENO"; then :
|
|
- ac_cv_lib_IlmImf_ImfTiledInputReadTile=yes
|
|
+ ac_cv_lib_OpenEXR_ImfTiledInputReadTile=yes
|
|
else
|
|
- ac_cv_lib_IlmImf_ImfTiledInputReadTile=no
|
|
+ ac_cv_lib_OpenEXR_ImfTiledInputReadTile=no
|
|
fi
|
|
rm -f core conftest.err conftest.$ac_objext \
|
|
conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_IlmImf_ImfTiledInputReadTile" >&5
|
|
-$as_echo "$ac_cv_lib_IlmImf_ImfTiledInputReadTile" >&6; }
|
|
-if test "x$ac_cv_lib_IlmImf_ImfTiledInputReadTile" = xyes; then :
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_OpenEXR_ImfTiledInputReadTile" >&5
|
|
+$as_echo "$ac_cv_lib_OpenEXR_ImfTiledInputReadTile" >&6; }
|
|
+if test "x$ac_cv_lib_OpenEXR_ImfTiledInputReadTile" = xyes; then :
|
|
HAVE_EXR=yes
|
|
else
|
|
HAVE_EXR=no
|