Attachment 226269 Details for Bug 257001 – New configure patch for --with-scfgal=no

[patch] New configure patch for --with-scfgal=no

file_257001.txt (text/plain), 3.23 KB, created by Robert Kruus on 2021-07-06 14:37:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Kruus

Created: 2021-07-06 14:37:13 UTC

Size: 3.23 KB

patch

obsolete

>sed -e 's|-lminizip|-lkmlminizip|; s|IlmImf|OpenEXR|' configure
>
>--- configure.orig      2021-04-26 12:29:56 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
>@@ -38626,6 +38626,7 @@ fi
>     { $as_echo "$as_me:${as_lineno-$LINENO}: result: SFCGAL support disabled" >&5
> $as_echo "SFCGAL support disabled" >&6; }
>     SFCGAL_CONFIG=no
>+    HAVE_SFCGAL_RESULT="no"
>
>   elif test x"$with_sfcgal" = x"yes" -o x"$with_sfcgal" = x"" ; then
>
>@@ -38672,7 +38673,6 @@ fi
>
>     if test x"$with_sfcgal" = x"" ; then
>       ac_sfcgal_config_auto=yes
>-    fi
>
>   else
>
>@@ -38907,6 +38907,7 @@ $as_echo "$as_me: Using C API from SFCGAL $SFCGAL_VERS
>   LIBS="${SFCGAL_LIBS} ${LIBS}"
>   HAVE_SFCGAL_RESULT="yes"
> fi
>+fi
>
>
>
>@@ -42250,13 +42251,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.  */
>
>@@ -42276,17 +42277,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

Actions: View | Diff

Attachments on bug 257001: 226248 | 226269