Check-in [3d39e95bc2]
Not logged in
Home Timeline Branches Tags Tickets Wiki Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:fixing the ./configure script: --enable-geocallbacks=no is the new default and fixing some flaws for --enable-freexl=no
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 3d39e95bc27c4be4fcdcc268433bf58ed78ed13e
User & Date: sandro 2012-01-21 16:53:28
Context
2012-01-21
16:59
including the m4 dir so to enable autoreconf check-in: 676cc990ad user: sandro tags: trunk
16:53
fixing the ./configure script: --enable-geocallbacks=no is the new default and fixing some flaws for --enable-freexl=no check-in: 3d39e95bc2 user: sandro tags: trunk
12:45
fixing a rare bug affecting rings-to-polygon association [SHP read]. check-in: 467b5bb610 user: sandro tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to configure. 

1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
.....
16976
16977
16978
16979
16980
16981
16982
16983
16984
16985
16986
16987
16988
16989
16990
.....
16994
16995
16996
16997
16998
16999
17000
17001
17002
17003
17004
17005
17006
17007
17008
17009
17010
17011
.....
17059
17060
17061
17062
17063
17064
17065
17066
17067
17068
17069
17070
17071
17072
17073
.....
17149
17150
17151
17152
17153
17154
17155
17156
17157
17158
17159
17160
17161
17162
17163
.....
17233
17234
17235
17236
17237
17238
17239
17240
17241
17242
17243
17244
17245
17246
17247
.....
17312
17313
17314
17315
17316
17317
17318
17319
17320
17321
17322
17323
17324
17325
17326
.....
17575
17576
17577
17578
17579
17580
17581
17582
17583
17584
17585
17586
17587
17588
17589
.....
17665
17666
17667
17668
17669
17670
17671
17672
17673
17674
17675
17676
17677
17678
17679

  --enable-dependency-tracking   do not reject slow dependency extractors
  --enable-shared[=PKGS]  build shared libraries [default=yes]
  --enable-static[=PKGS]  build static libraries [default=yes]
  --enable-fast-install[=PKGS]
                          optimize for fast installation [default=yes]
  --disable-libtool-lock  avoid locking (might break parallel builds)
  --enable-mathsql        enables SQL math functions [default=yes]
  --enable-geocallbacks   enables geometry callbacks [default=yes]
  --enable-proj           enables PROJ.4 inclusion [default=yes]
  --enable-geos           enables GEOS inclusion [default=yes]
  --enable-geosadvanced   enables GEOS advanced features [default=yes]
  --enable-iconv          enables ICONV inclusion [default=yes]
  --enable-freexl         enables FreeXL inclusion [default=yes]
  --enable-epsg           enables full EPSG dataset support [default=yes]
  --enable-gcov           turn on code coverage analysis tools
................................................................................
#-----------------------------------------------------------------------
#   --enable-mathsql
#
# Check whether --enable-mathsql was given.
if test "${enable_mathsql+set}" = set; then :
  enableval=$enable_mathsql;
else
  mathsql=yes
fi

if test x"$enable_mathsql" != "xno"; then
  OMIT_MATHSQL_FLAGS=
else
  OMIT_MATHSQL_FLAGS=-DOMIT_MATHSQL
fi
................................................................................
#-----------------------------------------------------------------------
#   --enable-geocallbacks
#
# Check whether --enable-geocallbacks was given.
if test "${enable_geocallbacks+set}" = set; then :
  enableval=$enable_geocallbacks;
else
  geocallbacks=yes
fi

if test x"$enable_geocallbacks" != "xno"; then
  OMIT_GEOCALLBACKS_FLAGS=
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_rtree_geometry_callback in -lsqlite3" >&5
$as_echo_n "checking for sqlite3_rtree_geometry_callback in -lsqlite3... " >&6; }
if ${ac_cv_lib_sqlite3_sqlite3_rtree_geometry_callback+:} false; then :
  $as_echo_n "(cached) " >&6
else
  ac_check_lib_save_LIBS=$LIBS
................................................................................
#-----------------------------------------------------------------------
#   --enable-proj
#
# Check whether --enable-proj was given.
if test "${enable_proj+set}" = set; then :
  enableval=$enable_proj;
else
  proj=yes
fi

if test x"$enable_proj" != "xno"; then
  OMIT_PROJ_FLAGS=
  for ac_header in proj_api.h
do :
  ac_fn_c_check_header_mongrel "$LINENO" "proj_api.h" "ac_cv_header_proj_api_h" "$ac_includes_default"
................................................................................
#-----------------------------------------------------------------------
#   --enable-geos
#
# Check whether --enable-geos was given.
if test "${enable_geos+set}" = set; then :
  enableval=$enable_geos;
else
  geos=yes
fi

if test x"$enable_geos" != "xno"; then
  OMIT_GEOS_FLAGS=
  for ac_header in geos_c.h
do :
  ac_fn_c_check_header_mongrel "$LINENO" "geos_c.h" "ac_cv_header_geos_c_h" "$ac_includes_default"
................................................................................
  #-----------------------------------------------------------------------
  #   --enable-geosadvanced
  #
  # Check whether --enable-geosadvanced was given.
if test "${enable_geosadvanced+set}" = set; then :
  enableval=$enable_geosadvanced;
else
  geosadvanced=yes
fi

  if test x"$enable_geosadvanced" != "xno"; then
	  GEOSADVANCED_FLAGS=-DGEOS_ADVANCED
	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing GEOSCoveredBy" >&5
$as_echo_n "checking for library containing GEOSCoveredBy... " >&6; }
if ${ac_cv_search_GEOSCoveredBy+:} false; then :
................................................................................
#-----------------------------------------------------------------------
#   --enable-iconv
#
# Check whether --enable-iconv was given.
if test "${enable_iconv+set}" = set; then :
  enableval=$enable_iconv;
else
  geos=yes
fi

if test x"$enable_iconv" != "xno"; then
  OMIT_ICONV_FLAGS=
  for ac_header in iconv.h
do :
  ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
................................................................................
#-----------------------------------------------------------------------
#   --enable-freexl
#
# Check whether --enable-freexl was given.
if test "${enable_freexl+set}" = set; then :
  enableval=$enable_freexl;
else
  proj=yes
fi

if test x"$enable_freexl" != "xno"; then
  OMIT_FREEXL_FLAGS=
  for ac_header in freexl.h
do :
  ac_fn_c_check_header_mongrel "$LINENO" "freexl.h" "ac_cv_header_freexl_h" "$ac_includes_default"
................................................................................
#-----------------------------------------------------------------------
#   --enable-epsg
#
# Check whether --enable-epsg was given.
if test "${enable_epsg+set}" = set; then :
  enableval=$enable_epsg;
else
  epsg=yes
fi

if test x"$enable_epsg" != "xno"; then
  OMIT_EPSG_FLAGS=
else
  OMIT_EPSG_FLAGS=-DOMIT_EPSG
fi








|







 







|







 







|


|







 







|







 







|







 







|







 







|







 







|







 







|








1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
.....
16976
16977
16978
16979
16980
16981
16982
16983
16984
16985
16986
16987
16988
16989
16990
.....
16994
16995
16996
16997
16998
16999
17000
17001
17002
17003
17004
17005
17006
17007
17008
17009
17010
17011
.....
17059
17060
17061
17062
17063
17064
17065
17066
17067
17068
17069
17070
17071
17072
17073
.....
17149
17150
17151
17152
17153
17154
17155
17156
17157
17158
17159
17160
17161
17162
17163
.....
17233
17234
17235
17236
17237
17238
17239
17240
17241
17242
17243
17244
17245
17246
17247
.....
17312
17313
17314
17315
17316
17317
17318
17319
17320
17321
17322
17323
17324
17325
17326
.....
17575
17576
17577
17578
17579
17580
17581
17582
17583
17584
17585
17586
17587
17588
17589
.....
17665
17666
17667
17668
17669
17670
17671
17672
17673
17674
17675
17676
17677
17678
17679

  --enable-dependency-tracking   do not reject slow dependency extractors
  --enable-shared[=PKGS]  build shared libraries [default=yes]
  --enable-static[=PKGS]  build static libraries [default=yes]
  --enable-fast-install[=PKGS]
                          optimize for fast installation [default=yes]
  --disable-libtool-lock  avoid locking (might break parallel builds)
  --enable-mathsql        enables SQL math functions [default=yes]
  --enable-geocallbacks   enables geometry callbacks [default=no]
  --enable-proj           enables PROJ.4 inclusion [default=yes]
  --enable-geos           enables GEOS inclusion [default=yes]
  --enable-geosadvanced   enables GEOS advanced features [default=yes]
  --enable-iconv          enables ICONV inclusion [default=yes]
  --enable-freexl         enables FreeXL inclusion [default=yes]
  --enable-epsg           enables full EPSG dataset support [default=yes]
  --enable-gcov           turn on code coverage analysis tools
................................................................................
#-----------------------------------------------------------------------
#   --enable-mathsql
#
# Check whether --enable-mathsql was given.
if test "${enable_mathsql+set}" = set; then :
  enableval=$enable_mathsql;
else
  enable_mathsql=yes
fi

if test x"$enable_mathsql" != "xno"; then
  OMIT_MATHSQL_FLAGS=
else
  OMIT_MATHSQL_FLAGS=-DOMIT_MATHSQL
fi
................................................................................
#-----------------------------------------------------------------------
#   --enable-geocallbacks
#
# Check whether --enable-geocallbacks was given.
if test "${enable_geocallbacks+set}" = set; then :
  enableval=$enable_geocallbacks;
else
  enable_geocallbacks=no
fi

if test x"$enable_geocallbacks" == "xyes"; then
  OMIT_GEOCALLBACKS_FLAGS=
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_rtree_geometry_callback in -lsqlite3" >&5
$as_echo_n "checking for sqlite3_rtree_geometry_callback in -lsqlite3... " >&6; }
if ${ac_cv_lib_sqlite3_sqlite3_rtree_geometry_callback+:} false; then :
  $as_echo_n "(cached) " >&6
else
  ac_check_lib_save_LIBS=$LIBS
................................................................................
#-----------------------------------------------------------------------
#   --enable-proj
#
# Check whether --enable-proj was given.
if test "${enable_proj+set}" = set; then :
  enableval=$enable_proj;
else
  enable_proj=yes
fi

if test x"$enable_proj" != "xno"; then
  OMIT_PROJ_FLAGS=
  for ac_header in proj_api.h
do :
  ac_fn_c_check_header_mongrel "$LINENO" "proj_api.h" "ac_cv_header_proj_api_h" "$ac_includes_default"
................................................................................
#-----------------------------------------------------------------------
#   --enable-geos
#
# Check whether --enable-geos was given.
if test "${enable_geos+set}" = set; then :
  enableval=$enable_geos;
else
  enable_geos=yes
fi

if test x"$enable_geos" != "xno"; then
  OMIT_GEOS_FLAGS=
  for ac_header in geos_c.h
do :
  ac_fn_c_check_header_mongrel "$LINENO" "geos_c.h" "ac_cv_header_geos_c_h" "$ac_includes_default"
................................................................................
  #-----------------------------------------------------------------------
  #   --enable-geosadvanced
  #
  # Check whether --enable-geosadvanced was given.
if test "${enable_geosadvanced+set}" = set; then :
  enableval=$enable_geosadvanced;
else
  enable_geosadvanced=yes
fi

  if test x"$enable_geosadvanced" != "xno"; then
	  GEOSADVANCED_FLAGS=-DGEOS_ADVANCED
	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing GEOSCoveredBy" >&5
$as_echo_n "checking for library containing GEOSCoveredBy... " >&6; }
if ${ac_cv_search_GEOSCoveredBy+:} false; then :
................................................................................
#-----------------------------------------------------------------------
#   --enable-iconv
#
# Check whether --enable-iconv was given.
if test "${enable_iconv+set}" = set; then :
  enableval=$enable_iconv;
else
  enable_iconv=yes
fi

if test x"$enable_iconv" != "xno"; then
  OMIT_ICONV_FLAGS=
  for ac_header in iconv.h
do :
  ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
................................................................................
#-----------------------------------------------------------------------
#   --enable-freexl
#
# Check whether --enable-freexl was given.
if test "${enable_freexl+set}" = set; then :
  enableval=$enable_freexl;
else
  enable_freexl=yes
fi

if test x"$enable_freexl" != "xno"; then
  OMIT_FREEXL_FLAGS=
  for ac_header in freexl.h
do :
  ac_fn_c_check_header_mongrel "$LINENO" "freexl.h" "ac_cv_header_freexl_h" "$ac_includes_default"
................................................................................
#-----------------------------------------------------------------------
#   --enable-epsg
#
# Check whether --enable-epsg was given.
if test "${enable_epsg+set}" = set; then :
  enableval=$enable_epsg;
else
  enable_epsg=yes
fi

if test x"$enable_epsg" != "xno"; then
  OMIT_EPSG_FLAGS=
else
  OMIT_EPSG_FLAGS=-DOMIT_EPSG
fi

Changes to configure.ac. 

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
...
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
...
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
...
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
...
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198

		spatialite.pc])

#-----------------------------------------------------------------------
#   --enable-mathsql
#
AC_ARG_ENABLE(mathsql, [AS_HELP_STRING(
  [--enable-mathsql], [enables SQL math functions [default=yes]])],
  [], [mathsql=yes])
if test x"$enable_mathsql" != "xno"; then
  OMIT_MATHSQL_FLAGS=
else
  OMIT_MATHSQL_FLAGS=-DOMIT_MATHSQL
fi
AC_SUBST(OMIT_MATHSQL_FLAGS)
#-----------------------------------------------------------------------

#-----------------------------------------------------------------------
#   --enable-geocallbacks
#
AC_ARG_ENABLE(geocallbacks, [AS_HELP_STRING(
  [--enable-geocallbacks], [enables geometry callbacks [default=yes]])],
  [], [geocallbacks=yes])
if test x"$enable_geocallbacks" != "xno"; then
  OMIT_GEOCALLBACKS_FLAGS=
  AC_CHECK_LIB(sqlite3,sqlite3_rtree_geometry_callback,,AC_MSG_ERROR([obsolete 'libsqlite3' (< v.3.7.3). please retry specifying: --disable-geocallbacks]),-lm)
else
  OMIT_GEOCALLBACKS_FLAGS=-DOMIT_GEOCALLBACKS
fi
AC_SUBST(OMIT_GEOCALLBACKS_FLAGS)
#-----------------------------------------------------------------------

#-----------------------------------------------------------------------
#   --enable-proj
#
AC_ARG_ENABLE(proj, [AS_HELP_STRING(
  [--enable-proj], [enables PROJ.4 inclusion [default=yes]])],
  [], [proj=yes])
if test x"$enable_proj" != "xno"; then
  OMIT_PROJ_FLAGS=
  AC_CHECK_HEADERS(proj_api.h,, [AC_MSG_ERROR([cannot find proj_api.h, bailing out])])
  AC_SEARCH_LIBS(pj_init_plus,proj,,AC_MSG_ERROR(['libproj' is required but it doesn't seem to be installed on this system.]),-lm)
else
  OMIT_PROJ_FLAGS=-DOMIT_PROJ
fi
................................................................................
#-----------------------------------------------------------------------

#-----------------------------------------------------------------------
#   --enable-geos
#
AC_ARG_ENABLE(geos, [AS_HELP_STRING(
  [--enable-geos], [enables GEOS inclusion [default=yes]])],
  [], [geos=yes])
if test x"$enable_geos" != "xno"; then
  OMIT_GEOS_FLAGS=
  AC_CHECK_HEADERS(geos_c.h,, [AC_MSG_ERROR([cannot find geos_c.h, bailing out])])
  AC_SEARCH_LIBS(GEOSTopologyPreserveSimplify,geos_c,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seem to be installed on this system.]),-lm -lgeos)
  #-----------------------------------------------------------------------
  #   --enable-geosadvanced
  #
  AC_ARG_ENABLE(geosadvanced, [AS_HELP_STRING(
	  [--enable-geosadvanced], [enables GEOS advanced features [default=yes]])],
	  [], [geosadvanced=yes])
  if test x"$enable_geosadvanced" != "xno"; then
	  GEOSADVANCED_FLAGS=-DGEOS_ADVANCED
	  AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([obsolete 'libgeos_c' (< v.3.3.0). please retry specifying: --disable-geosadvanced.]),-lm -lgeos)
  else
	  GEOSADVANCED_FLAGS=
  fi
	  AC_SUBST(GEOSADVANCED_FLAGS)
................................................................................
AC_SUBST(OMIT_GEOS_FLAGS)

#-----------------------------------------------------------------------
#   --enable-iconv
#
AC_ARG_ENABLE(iconv, [AS_HELP_STRING(
  [--enable-iconv], [enables ICONV inclusion [default=yes]])],
  [], [geos=yes])
if test x"$enable_iconv" != "xno"; then
  OMIT_ICONV_FLAGS=
  AC_CHECK_HEADERS(iconv.h,, [AC_MSG_ERROR([cannot find iconv.h, bailing out])])
# on some systems "iconv()" lives in libc. On others it lives in libiconv
#  on older systems "libiconv()" lives in libiconv
  AC_SEARCH_LIBS(iconv,iconv,,
    AC_SEARCH_LIBS(libiconv,iconv,,AC_MSG_ERROR(['libiconv' is required but it doesn't seem to be installed on this system.]),))
................................................................................
AC_SUBST(OMIT_ICONV_FLAGS)

#-----------------------------------------------------------------------
#   --enable-freexl
#
AC_ARG_ENABLE(freexl, [AS_HELP_STRING(
  [--enable-freexl], [enables FreeXL inclusion [default=yes]])],
  [], [proj=yes])
if test x"$enable_freexl" != "xno"; then
  OMIT_FREEXL_FLAGS=
  AC_CHECK_HEADERS(freexl.h,, [AC_MSG_ERROR([cannot find freexl.h, bailing out])])
  AC_SEARCH_LIBS(freexl_open,freexl,,AC_MSG_ERROR(['libfreexl' is required but it doesn't seem to be installed on this system.]),-lm)
else
  OMIT_FREEXL_FLAGS=-DOMIT_FREEXL
fi
................................................................................
#-----------------------------------------------------------------------

#-----------------------------------------------------------------------
#   --enable-epsg
#
AC_ARG_ENABLE(epsg, [AS_HELP_STRING(
  [--enable-epsg], [enables full EPSG dataset support [default=yes]])],
  [], [epsg=yes])
if test x"$enable_epsg" != "xno"; then
  OMIT_EPSG_FLAGS=
else
  OMIT_EPSG_FLAGS=-DOMIT_EPSG
fi
AC_SUBST(OMIT_EPSG_FLAGS)
#-----------------------------------------------------------------------








|












|
|
|













|







 







|









|







 







|







 







|







 







|








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
...
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
...
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
...
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
...
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198

		spatialite.pc])

#-----------------------------------------------------------------------
#   --enable-mathsql
#
AC_ARG_ENABLE(mathsql, [AS_HELP_STRING(
  [--enable-mathsql], [enables SQL math functions [default=yes]])],
  [], [enable_mathsql=yes])
if test x"$enable_mathsql" != "xno"; then
  OMIT_MATHSQL_FLAGS=
else
  OMIT_MATHSQL_FLAGS=-DOMIT_MATHSQL
fi
AC_SUBST(OMIT_MATHSQL_FLAGS)
#-----------------------------------------------------------------------

#-----------------------------------------------------------------------
#   --enable-geocallbacks
#
AC_ARG_ENABLE(geocallbacks, [AS_HELP_STRING(
  [--enable-geocallbacks], [enables geometry callbacks [default=no]])],
  [], [enable_geocallbacks=no])
if test x"$enable_geocallbacks" == "xyes"; then
  OMIT_GEOCALLBACKS_FLAGS=
  AC_CHECK_LIB(sqlite3,sqlite3_rtree_geometry_callback,,AC_MSG_ERROR([obsolete 'libsqlite3' (< v.3.7.3). please retry specifying: --disable-geocallbacks]),-lm)
else
  OMIT_GEOCALLBACKS_FLAGS=-DOMIT_GEOCALLBACKS
fi
AC_SUBST(OMIT_GEOCALLBACKS_FLAGS)
#-----------------------------------------------------------------------

#-----------------------------------------------------------------------
#   --enable-proj
#
AC_ARG_ENABLE(proj, [AS_HELP_STRING(
  [--enable-proj], [enables PROJ.4 inclusion [default=yes]])],
  [], [enable_proj=yes])
if test x"$enable_proj" != "xno"; then
  OMIT_PROJ_FLAGS=
  AC_CHECK_HEADERS(proj_api.h,, [AC_MSG_ERROR([cannot find proj_api.h, bailing out])])
  AC_SEARCH_LIBS(pj_init_plus,proj,,AC_MSG_ERROR(['libproj' is required but it doesn't seem to be installed on this system.]),-lm)
else
  OMIT_PROJ_FLAGS=-DOMIT_PROJ
fi
................................................................................
#-----------------------------------------------------------------------

#-----------------------------------------------------------------------
#   --enable-geos
#
AC_ARG_ENABLE(geos, [AS_HELP_STRING(
  [--enable-geos], [enables GEOS inclusion [default=yes]])],
  [], [enable_geos=yes])
if test x"$enable_geos" != "xno"; then
  OMIT_GEOS_FLAGS=
  AC_CHECK_HEADERS(geos_c.h,, [AC_MSG_ERROR([cannot find geos_c.h, bailing out])])
  AC_SEARCH_LIBS(GEOSTopologyPreserveSimplify,geos_c,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seem to be installed on this system.]),-lm -lgeos)
  #-----------------------------------------------------------------------
  #   --enable-geosadvanced
  #
  AC_ARG_ENABLE(geosadvanced, [AS_HELP_STRING(
	  [--enable-geosadvanced], [enables GEOS advanced features [default=yes]])],
	  [], [enable_geosadvanced=yes])
  if test x"$enable_geosadvanced" != "xno"; then
	  GEOSADVANCED_FLAGS=-DGEOS_ADVANCED
	  AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([obsolete 'libgeos_c' (< v.3.3.0). please retry specifying: --disable-geosadvanced.]),-lm -lgeos)
  else
	  GEOSADVANCED_FLAGS=
  fi
	  AC_SUBST(GEOSADVANCED_FLAGS)
................................................................................
AC_SUBST(OMIT_GEOS_FLAGS)

#-----------------------------------------------------------------------
#   --enable-iconv
#
AC_ARG_ENABLE(iconv, [AS_HELP_STRING(
  [--enable-iconv], [enables ICONV inclusion [default=yes]])],
  [], [enable_iconv=yes])
if test x"$enable_iconv" != "xno"; then
  OMIT_ICONV_FLAGS=
  AC_CHECK_HEADERS(iconv.h,, [AC_MSG_ERROR([cannot find iconv.h, bailing out])])
# on some systems "iconv()" lives in libc. On others it lives in libiconv
#  on older systems "libiconv()" lives in libiconv
  AC_SEARCH_LIBS(iconv,iconv,,
    AC_SEARCH_LIBS(libiconv,iconv,,AC_MSG_ERROR(['libiconv' is required but it doesn't seem to be installed on this system.]),))
................................................................................
AC_SUBST(OMIT_ICONV_FLAGS)

#-----------------------------------------------------------------------
#   --enable-freexl
#
AC_ARG_ENABLE(freexl, [AS_HELP_STRING(
  [--enable-freexl], [enables FreeXL inclusion [default=yes]])],
  [], [enable_freexl=yes])
if test x"$enable_freexl" != "xno"; then
  OMIT_FREEXL_FLAGS=
  AC_CHECK_HEADERS(freexl.h,, [AC_MSG_ERROR([cannot find freexl.h, bailing out])])
  AC_SEARCH_LIBS(freexl_open,freexl,,AC_MSG_ERROR(['libfreexl' is required but it doesn't seem to be installed on this system.]),-lm)
else
  OMIT_FREEXL_FLAGS=-DOMIT_FREEXL
fi
................................................................................
#-----------------------------------------------------------------------

#-----------------------------------------------------------------------
#   --enable-epsg
#
AC_ARG_ENABLE(epsg, [AS_HELP_STRING(
  [--enable-epsg], [enables full EPSG dataset support [default=yes]])],
  [], [enable_epsg=yes])
if test x"$enable_epsg" != "xno"; then
  OMIT_EPSG_FLAGS=
else
  OMIT_EPSG_FLAGS=-DOMIT_EPSG
fi
AC_SUBST(OMIT_EPSG_FLAGS)
#-----------------------------------------------------------------------

Changes to src/automake/configure.ac. 

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
...
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
...
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
...
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
...
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178

		spatialite.pc])

#-----------------------------------------------------------------------
#   --enable-mathsql
#
AC_ARG_ENABLE(mathsql, [AS_HELP_STRING(
  [--enable-mathsql], [enables SQL math functions [default=yes]])],
  [], [mathsql=yes])
if test x"$enable_mathsql" != "xno"; then
  OMIT_MATHSQL_FLAGS=
else
  OMIT_MATHSQL_FLAGS=-DOMIT_MATHSQL
fi
AC_SUBST(OMIT_MATHSQL_FLAGS)
#-----------------------------------------------------------------------

#-----------------------------------------------------------------------
#   --enable-geocallbacks
#
AC_ARG_ENABLE(geocallbacks, [AS_HELP_STRING(
  [--enable-geocallbacks], [enables geometry callbacks [default=yes]])],
  [], [geocallbacks=yes])
if test x"$enable_geocallbacks" != "xno"; then
  OMIT_GEOCALLBACKS_FLAGS=
else
  OMIT_GEOCALLBACKS_FLAGS=-DOMIT_GEOCALLBACKS
fi
AC_SUBST(OMIT_GEOCALLBACKS_FLAGS)
#-----------------------------------------------------------------------

#-----------------------------------------------------------------------
#   --enable-proj
#
AC_ARG_ENABLE(proj, [AS_HELP_STRING(
  [--enable-proj], [enables PROJ.4 inclusion [default=yes]])],
  [], [proj=yes])
if test x"$enable_proj" != "xno"; then
  OMIT_PROJ_FLAGS=
  AC_CHECK_HEADERS(proj_api.h,, [AC_MSG_ERROR([cannot find proj_api.h, bailing out])])
  AC_SEARCH_LIBS(pj_init_plus,proj,,AC_MSG_ERROR(['libproj' is required but it doesn't seem to be installed on this system.]),-lm)
else
  OMIT_PROJ_FLAGS=-DOMIT_PROJ
fi
................................................................................
#-----------------------------------------------------------------------

#-----------------------------------------------------------------------
#   --enable-geos
#
AC_ARG_ENABLE(geos, [AS_HELP_STRING(
  [--enable-geos], [enables GEOS inclusion [default=yes]])],
  [], [geos=yes])
if test x"$enable_geos" != "xno"; then
  OMIT_GEOS_FLAGS=
  AC_CHECK_HEADERS(geos_c.h,, [AC_MSG_ERROR([cannot find geos_c.h, bailing out])])
  AC_SEARCH_LIBS(GEOSTopologyPreserveSimplify,geos_c,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seem to be installed on this system.]),-lm -lgeos)
  #-----------------------------------------------------------------------
  #   --enable-geosadvanced
  #
  AC_ARG_ENABLE(geosadvanced, [AS_HELP_STRING(
	  [--enable-geosadvanced], [enables GEOS advanced features [default=yes]])],
	  [], [geosadvanced=yes])
  if test x"$enable_geosadvanced" != "xno"; then
	  GEOSADVANCED_FLAGS=-DGEOS_ADVANCED
	  AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([obsolete 'libgeos_c' (< v.3.3.0). please retry specifying: --disable-geosadvanced.]),-lm -lgeos)
  else
	  GEOSADVANCED_FLAGS=
  fi
	  AC_SUBST(GEOSADVANCED_FLAGS)
................................................................................
AC_SUBST(OMIT_GEOS_FLAGS)

#-----------------------------------------------------------------------
#   --enable-iconv
#
AC_ARG_ENABLE(iconv, [AS_HELP_STRING(
  [--enable-iconv], [enables ICONV inclusion [default=yes]])],
  [], [geos=yes])
if test x"$enable_iconv" != "xno"; then
  OMIT_ICONV_FLAGS=
  AC_CHECK_HEADERS(iconv.h,, [AC_MSG_ERROR([cannot find iconv.h, bailing out])])
# on some systems "iconv()" lives in libc. On others it lives in libiconv
#  on older systems "libiconv()" lives in libiconv
  AC_SEARCH_LIBS(iconv,iconv,,
    AC_SEARCH_LIBS(libiconv,iconv,,AC_MSG_ERROR(['libiconv' is required but it doesn't seem to be installed on this system.]),))
................................................................................
AC_SUBST(OMIT_ICONV_FLAGS)

#-----------------------------------------------------------------------
#   --enable-freexl
#
AC_ARG_ENABLE(freexl, [AS_HELP_STRING(
  [--enable-freexl], [enables FreeXL inclusion [default=yes]])],
  [], [proj=yes])
if test x"$enable_freexl" != "xno"; then
  OMIT_FREEXL_FLAGS=
  AC_CHECK_HEADERS(freexl.h,, [AC_MSG_ERROR([cannot find freexl.h, bailing out])])
  AC_SEARCH_LIBS(freexl_open,freexl,,AC_MSG_ERROR(['libfreexl' is required but it doesn't seem to be installed on this system.]),-lm)
else
  OMIT_FREEXL_FLAGS=-DOMIT_FREEXL
fi
................................................................................
#-----------------------------------------------------------------------

#-----------------------------------------------------------------------
#   --enable-epsg
#
AC_ARG_ENABLE(epsg, [AS_HELP_STRING(
  [--enable-epsg], [enables full EPSG dataset support [default=yes]])],
  [], [epsg=yes])
if test x"$enable_epsg" != "xno"; then
  OMIT_EPSG_FLAGS=
else
  OMIT_EPSG_FLAGS=-DOMIT_EPSG
fi
AC_SUBST(OMIT_EPSG_FLAGS)
#-----------------------------------------------------------------------








|












|
|
|












|







 







|









|







 







|







 







|







 







|








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
...
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
...
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
...
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
...
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178

		spatialite.pc])

#-----------------------------------------------------------------------
#   --enable-mathsql
#
AC_ARG_ENABLE(mathsql, [AS_HELP_STRING(
  [--enable-mathsql], [enables SQL math functions [default=yes]])],
  [], [enable_mathsql=yes])
if test x"$enable_mathsql" != "xno"; then
  OMIT_MATHSQL_FLAGS=
else
  OMIT_MATHSQL_FLAGS=-DOMIT_MATHSQL
fi
AC_SUBST(OMIT_MATHSQL_FLAGS)
#-----------------------------------------------------------------------

#-----------------------------------------------------------------------
#   --enable-geocallbacks
#
AC_ARG_ENABLE(geocallbacks, [AS_HELP_STRING(
  [--enable-geocallbacks], [enables geometry callbacks [default=no]])],
  [], [enable_geocallbacks=no])
if test x"$enable_geocallbacks" == "xyes"; then
  OMIT_GEOCALLBACKS_FLAGS=
else
  OMIT_GEOCALLBACKS_FLAGS=-DOMIT_GEOCALLBACKS
fi
AC_SUBST(OMIT_GEOCALLBACKS_FLAGS)
#-----------------------------------------------------------------------

#-----------------------------------------------------------------------
#   --enable-proj
#
AC_ARG_ENABLE(proj, [AS_HELP_STRING(
  [--enable-proj], [enables PROJ.4 inclusion [default=yes]])],
  [], [enable_proj=yes])
if test x"$enable_proj" != "xno"; then
  OMIT_PROJ_FLAGS=
  AC_CHECK_HEADERS(proj_api.h,, [AC_MSG_ERROR([cannot find proj_api.h, bailing out])])
  AC_SEARCH_LIBS(pj_init_plus,proj,,AC_MSG_ERROR(['libproj' is required but it doesn't seem to be installed on this system.]),-lm)
else
  OMIT_PROJ_FLAGS=-DOMIT_PROJ
fi
................................................................................
#-----------------------------------------------------------------------

#-----------------------------------------------------------------------
#   --enable-geos
#
AC_ARG_ENABLE(geos, [AS_HELP_STRING(
  [--enable-geos], [enables GEOS inclusion [default=yes]])],
  [], [enable_geos=yes])
if test x"$enable_geos" != "xno"; then
  OMIT_GEOS_FLAGS=
  AC_CHECK_HEADERS(geos_c.h,, [AC_MSG_ERROR([cannot find geos_c.h, bailing out])])
  AC_SEARCH_LIBS(GEOSTopologyPreserveSimplify,geos_c,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seem to be installed on this system.]),-lm -lgeos)
  #-----------------------------------------------------------------------
  #   --enable-geosadvanced
  #
  AC_ARG_ENABLE(geosadvanced, [AS_HELP_STRING(
	  [--enable-geosadvanced], [enables GEOS advanced features [default=yes]])],
	  [], [enable_geosadvanced=yes])
  if test x"$enable_geosadvanced" != "xno"; then
	  GEOSADVANCED_FLAGS=-DGEOS_ADVANCED
	  AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([obsolete 'libgeos_c' (< v.3.3.0). please retry specifying: --disable-geosadvanced.]),-lm -lgeos)
  else
	  GEOSADVANCED_FLAGS=
  fi
	  AC_SUBST(GEOSADVANCED_FLAGS)
................................................................................
AC_SUBST(OMIT_GEOS_FLAGS)

#-----------------------------------------------------------------------
#   --enable-iconv
#
AC_ARG_ENABLE(iconv, [AS_HELP_STRING(
  [--enable-iconv], [enables ICONV inclusion [default=yes]])],
  [], [enable_iconv=yes])
if test x"$enable_iconv" != "xno"; then
  OMIT_ICONV_FLAGS=
  AC_CHECK_HEADERS(iconv.h,, [AC_MSG_ERROR([cannot find iconv.h, bailing out])])
# on some systems "iconv()" lives in libc. On others it lives in libiconv
#  on older systems "libiconv()" lives in libiconv
  AC_SEARCH_LIBS(iconv,iconv,,
    AC_SEARCH_LIBS(libiconv,iconv,,AC_MSG_ERROR(['libiconv' is required but it doesn't seem to be installed on this system.]),))
................................................................................
AC_SUBST(OMIT_ICONV_FLAGS)

#-----------------------------------------------------------------------
#   --enable-freexl
#
AC_ARG_ENABLE(freexl, [AS_HELP_STRING(
  [--enable-freexl], [enables FreeXL inclusion [default=yes]])],
  [], [enable_freexl=yes])
if test x"$enable_freexl" != "xno"; then
  OMIT_FREEXL_FLAGS=
  AC_CHECK_HEADERS(freexl.h,, [AC_MSG_ERROR([cannot find freexl.h, bailing out])])
  AC_SEARCH_LIBS(freexl_open,freexl,,AC_MSG_ERROR(['libfreexl' is required but it doesn't seem to be installed on this system.]),-lm)
else
  OMIT_FREEXL_FLAGS=-DOMIT_FREEXL
fi
................................................................................
#-----------------------------------------------------------------------

#-----------------------------------------------------------------------
#   --enable-epsg
#
AC_ARG_ENABLE(epsg, [AS_HELP_STRING(
  [--enable-epsg], [enables full EPSG dataset support [default=yes]])],
  [], [enable_epsg=yes])
if test x"$enable_epsg" != "xno"; then
  OMIT_EPSG_FLAGS=
else
  OMIT_EPSG_FLAGS=-DOMIT_EPSG
fi
AC_SUBST(OMIT_EPSG_FLAGS)
#-----------------------------------------------------------------------

Changes to src/shapefiles/shapefiles.c. 

58
59
60
61
62
63
64

65

66
67
68
69
70
71
72

#include <sqlite3.h>
#endif

#include <spatialite/gaiaaux.h>
#include <spatialite/gaiageo.h>
#include <spatialite.h>


#include <freexl.h>


#if defined(_WIN32) && !defined(__MINGW32__)
#define strcasecmp	_stricmp
#endif

struct dupl_column
{








>

>








58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74

#include <sqlite3.h>
#endif

#include <spatialite/gaiaaux.h>
#include <spatialite/gaiageo.h>
#include <spatialite.h>

#ifndef OMIT_FREEXL
#include <freexl.h>
#endif

#if defined(_WIN32) && !defined(__MINGW32__)
#define strcasecmp	_stricmp
#endif

struct dupl_column
{

Keep in touch ... join the community, subscribe the SpatiaLite Users mailing list
SpatiaLite is developed and maintained by Alessandro Furieri a.furieri@lqt.it
Fossil version 2.13 [e7bba4ff36] 2020-11-01 00:13:51