1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
|
Obtained from: https://github.com/OSGeo/gdal/commit/b414b0a0594b3e9c175a001e8455819463039eb6
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
@@ -38323,6 +38323,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: GEOS support disabled" >&5
$as_echo "GEOS support disabled" >&6; }
GEOS_CONFIG=no
+ HAVE_GEOS=no
elif test x"$with_geos" = x"yes" -o x"$with_geos" = x"" ; then
@@ -38580,15 +38581,13 @@ $as_echo "$as_me: WARNING: GEOS was found on your syst
else
- if test $ac_geos_config_auto = "no" ; then
+ if test x"$with_geos" != x"no" -a x"$with_geos" != x ; then
as_fn_error $? "GEOS support explicitly enabled, but geos-config could not be found" "$LINENO" 5
fi
fi
-HAVE_GEOS_RESULT="no"
if test "${HAVE_GEOS}" = "yes" ; then
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: Using C API from GEOS $GEOS_VERSION" >&5
$as_echo "$as_me: Using C API from GEOS $GEOS_VERSION" >&6;}
@@ -38602,7 +38601,6 @@ $as_echo "$as_me: Using C API from GEOS $GEOS_VERSION"
GEOS_LIBS="$STRIPPED_LIBRARY_NAME"
LIBS="${GEOS_LIBS} ${LIBS}"
- HAVE_GEOS_RESULT="yes"
fi
@@ -38625,6 +38623,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: SFCGAL support disabled" >&5
$as_echo "SFCGAL support disabled" >&6; }
+ HAVE_SFCGAL=no
SFCGAL_CONFIG=no
elif test x"$with_sfcgal" = x"yes" -o x"$with_sfcgal" = x"" ; then
@@ -38883,15 +38882,13 @@ $as_echo "$as_me: WARNING: SFCGAL was found on your sy
else
- if test $ac_sfcgal_config_auto = "no" ; then
+ if test x"$with_sfcgal" != x"no" -a x"$with_sfcgal" != x ; then
as_fn_error $? "SFCGAL support explicitly enabled, but sfcgal-config could not be found" "$LINENO" 5
fi
fi
-HAVE_SFCGAL_RESULT="no"
if test "${HAVE_SFCGAL}" = "yes" ; then
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: Using C API from SFCGAL $SFCGAL_VERSION" >&5
$as_echo "$as_me: Using C API from SFCGAL $SFCGAL_VERSION" >&6;}
@@ -38905,7 +38902,6 @@ $as_echo "$as_me: Using C API from SFCGAL $SFCGAL_VERS
SFCGAL_LIBS="$STRIPPED_LIBRARY_NAME"
LIBS="${SFCGAL_LIBS} ${LIBS}"
- HAVE_SFCGAL_RESULT="yes"
fi
@@ -42250,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. */
@@ -42276,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
@@ -44998,7 +44994,7 @@ echo " FreeXL support: ${HAVE_FREEXL}"
echo " GEORASTER support: ${HAVE_GEORASTER}"
-echo " GEOS support: ${HAVE_GEOS_RESULT}"
+echo " GEOS support: ${HAVE_GEOS}"
echo " Google libkml support: ${HAVE_LIBKML}"
@@ -45162,7 +45158,7 @@ echo " RasterLite2 support: ${HAVE_RASTERLITE2}
echo " RDB support: ${RDB_SETTING}"
-echo " SFCGAL support: ${HAVE_SFCGAL_RESULT}"
+echo " SFCGAL support: ${HAVE_SFCGAL}"
echo " SOSI support: ${SOSI_ENABLED}"
|
