.drone-1.0.yml

@@ -5,71 +5,30 @@
 # See https://git.osgeo.org/gitea/postgis/postgis-docker
 # todo: add docker images from https://hub.docker.com/r/postgis/postgis-build-env/tags/
 test-image: &test-image docker.kbt.io/postgis/build-test:trisquel2
+clone: &clone
+    image: plugins/git
+    depth: 20
+    recursive: false
+
 kind: pipeline
-name: pg-9.5
+name: build
+clone: *clone
 steps:
-  - name: build
+  - name: build-9.5
     image: *test-image
     pull: always
     commands:
-      - export PGVER=9.5
-      - service postgresql start $PGVER
-      - export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
-      - export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
-      - psql --version
-      - ./autogen.sh
-      - ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
-      - make -j
-      # we should maybe wait for postgresql service to startup here...
-      - psql -c "select version()" template1
-      - make check RUNTESTFLAGS=-v
-      - make install
-      - utils/check_all_upgrades.sh -s
-        `grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`
----
-test-image: &test-image docker.kbt.io/postgis/build-test:trisquel2
-kind: pipeline
-name: pg-9.6
-steps:
-  - name: build
+      - PGVER=9.5 sh ci/dronie/postgis_regress.sh
+
+  - name: build-9.6
     image: *test-image
     pull: always
     commands:
-      - export PGVER=9.6
-      - service postgresql start $PGVER
-      - export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
-      - export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
-      - psql --version
-      - ./autogen.sh
-      - ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
-      - make -j
-      # we should maybe wait for postgresql service to startup here...
-      - psql -c "select version()" template1
-      - make check RUNTESTFLAGS=-v
-      - make install
-      - utils/check_all_upgrades.sh -s
-        `grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`
----
-test-image: &test-image docker.kbt.io/postgis/build-test:trisquel2
-kind: pipeline
-name: pg-10
-steps:
-  - name: build
+      - PGVER=9.6 sh ci/dronie/postgis_regress.sh
+
+  - name: build-10
     image: *test-image
     pull: always
     commands:
-      - export PGVER=10
-      - service postgresql start $PGVER
-      - export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
-      - export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
-      - psql --version
-      - ./autogen.sh
-      - ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
-      - make -j
-      # we should maybe wait for postgresql service to startup here...
-      - psql -c "select version()" template1
-      - make check RUNTESTFLAGS=-v
-      - make install
-      - utils/check_all_upgrades.sh -s
-        `grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`
+      - PGVER=10 sh ci/dronie/postgis_regress.sh
 ...

.gitlab-ci.yml

@@ -17,8 +17,8 @@ test:
     - ./autogen.sh
     - ./configure CFLAGS="-Wall -fno-omit-frame-pointer -Werror"
     - make
-    - make check RUNTESTFLAGS=-v
-    - make check RUNTESTFLAGS="-v --dumprestore"
+    - RUNTESTFLAGS=-v make check
+    - RUNTESTFLAGS="-v --dumprestore" make check
     - make install
-    - make installcheck RUNTESTFLAGS=-v
-    - make installcheck RUNTESTFLAGS="-v --dumprestore"
+    - RUNTESTFLAGS=-v make installcheck
+    - RUNTESTFLAGS="-v --dumprestore" make installcheck

GNUmakefile.in

@@ -16,7 +16,7 @@ POSTGIS_MICRO_VERSION=@POSTGIS_MICRO_VERSION@
 PERL = @PERL@
 
 # todo: add more rules here, like uninstall, clean...
-all install uninstall noop clean distclean check:
+all install uninstall noop clean distclean check-unit check-regress:
 	for s in $(SUBDIRS); do \
 		echo "---- Making $@ in $${s}"; \
 		$(MAKE) -C $${s} $@ || exit 1; \
@@ -39,7 +39,9 @@ clean-local:
 # TODO: drop 'test' target..
 test: check
 
-check: all docs-check check-no-trailing-blanks
+check: check-no-trailing-blanks check-unit check-regress docs-check
+
+check-unit check-regress docs-check: all
 
 check-no-trailing-blanks:
 	! find . -name '*.c' -o -name '*.h' -o -name '*.proto' | \
@@ -53,14 +55,22 @@ check-no-trailing-blanks:
 installcheck: installcheck-base installcheck-upgrade
 
 installcheck-base:
-	RUNTESTFLAGS="$(RUNTESTFLAGS) --extension" $(MAKE) check
+	RUNTESTFLAGS="$(RUNTESTFLAGS) --extension" $(MAKE) check-regress
 
 # only run upgrade test if RUNTESTFLAGS was not already doing that
-installcheck-upgrade:
+installcheck-upgrade: installcheck-upgrade-byfunc
 	if test -z `echo "$(RUNTESTFLAGS)" | grep -- --upgrade`; then \
 		RUNTESTFLAGS="$(RUNTESTFLAGS) --extension \
 			--upgrade-path unpackaged--$(POSTGIS_MAJOR_VERSION).$(POSTGIS_MINOR_VERSION).$(POSTGIS_MICRO_VERSION)" \
-			$(MAKE) check; \
+			$(MAKE) check-regress; \
+	fi
+
+# only run upgrade test if RUNTESTFLAGS was not already doing that
+installcheck-upgrade-byfunc:
+	if test -z `echo "$(RUNTESTFLAGS)" | grep -- --upgrade`; then \
+		RUNTESTFLAGS="$(RUNTESTFLAGS) --extension \
+			--upgrade-path unpackaged--$(POSTGIS_MAJOR_VERSION).$(POSTGIS_MINOR_VERSION).$(POSTGIS_MICRO_VERSION)!" \
+			$(MAKE) check-regress; \
 	fi
 
 distclean: distclean-local

NEWS

+PostGIS 3.0.0beta1
+2019/09/28
+For full changes and enhancements, refer to PostGIS 3.0.0.
+This version requires PostgreSQL 9.5+-12 and GEOS >= 3.6+
+Additional features enabled if you are running Proj6+ and PostgreSQL 12
+Additional performance enhancements if running GEOS 3.8+
+
+* Major highlights *
+  - #4492, Fix ST_Simplify ignoring the value of the 3rd parameter (Raúl Marín)
+  - #4494, Fix ST_Simplify output having an outdated bbox (Raúl Marín)
+  - #4493, Fix ST_RemoveRepeatedPoints output having an outdated bbox (Raúl Marín)
+  - #4495, Fix ST_SnapToGrid output having an outdated bbox (Raúl Marín)
+  - #4496, Make ST_Simplify(TRIANGLE) collapse if requested (Raúl Marín)
+  - #4501, Allow postgis_tiger_geocoder to be installable by non-super users (Regina Obe)
+  - #4503, Speed up the calculation of cartesian bbox (Raúl Marín)
+  - #4504, shp2pgsql -D not working with schema qualified tables (Regina Obe)
+  - #4505, Speed up conversion of geometries to/from GEOS (Dan Baston)
+  - #4507, Use GEOSMakeValid and GEOSBuildArea for GEOS 3.8+ (Dan Baston)
+  - #4491, Speed up ST_RemoveRepeatedPoints (Raúl Marín)
+  - #4509, Update geocoder for tiger 2019 (Regina Obe)
+  - #4338, Census block level data (tabblock table) not loading (Regina Obe)
+
+
 PostGIS 3.0.0alpha4
 2019/08/10
 For full changes and enhancements, refer to PostGIS 3.0.0.
@@ -81,8 +104,7 @@ PostGIS 3.0.0alpha1
   - #4258, #4278 Enhance postgis functions ST_Area, ST_Distance, ST_Intersection,
            ST_Difference, ST_Union, ST_Intersects, ST_3DIntersects, ST_3DDistance
            to handle types (Solid PolyhedralSurface, TINS) that were only available in SFCGAL.
-           Remove postgis.backend switch.
-          (Darafei Praliaskouski)
+           Remove postgis.backend switch. (Darafei Praliaskouski)
   - #4230, SP-GiST and GiST support for ND box operators overlaps, contains,
            within, equals (Esteban Zimányi and Arthur Lesuisse from Université
            Libre de Bruxelles (ULB), Darafei Praliaskouski)
@@ -155,6 +177,8 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
   - #4176, ST_Intersects supports GEOMETRYCOLLECTION (Darafei Praliaskouski)
   - #4181, ST_AsMVTGeom: Avoid type changes due to validation (Raúl Marín)
   - #4183, ST_AsMVTGeom: Drop invalid geometries after simplification (Raúl Marín)
+  - #4196, Have postgis_extensions_upgrade() package unpackaged extensions
+           (Sandro Santilli)
   - #4215, Use floating point compare in ST_DumpAsPolygons (Darafei Praliaskouski)
   - #4155, Support for GEOMETRYCOLLECTION, POLYGON, TIN, TRIANGLE in
            ST_LocateBetween and ST_LocateBetweenElevations (Darafei Praliaskouski)
@@ -203,6 +227,9 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
   - #4277, ST_GeomFromGeoJSON now marks SRID=4326 by default as per RFC7946,
            ST_AsGeoJSON sets SRID in JSON output if it differs from 4326.
            (Darafei Praliaskouski)
+  - #3979, postgis_sfcgal_noop() round trip function (Lucas C. Villa Real)
+  - #4328, ST_3DIntersects for 2D TINs. (Darafei Praliaskouski)
+  - #4509, Update geocoder for tiger 2019 (Regina Obe)
 
 * Fixes *
   - #4342, Move deprecated functions into legacy.sql file
@@ -230,6 +257,7 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
   - #4406, Throw on invalid characters when decoding geohash (Raúl Marín)
   - #4459, Fix ST_Subdivide crash on intermediate EMPTY (Darafei Praliaskouski)
   - #4470, ST_GeomFromGeoJSON crash on empty rings (Darafei Praliaskouski)
+  - #4387, Re-enable OSS Fuzz and fuzz geojson parser (Darafei Praliaskouski)
 
 
 PostGIS 2.5.0
@@ -438,7 +466,10 @@ PostGIS 2.4.0
   - #2464, ST_CurveToLine with MaxError tolerance (Sandro Santilli / KKGeo)
   - #3599, Geobuf output support via ST_AsGeobuf (Björn Harrtell)
   - #3661, Mapbox vector tile output support via ST_AsMVT (Björn Harrtell / CartoDB)
-  - #3689, Add orientation checking and forcing functions (Dan Baston)
+  - #3689, Add orientation checking and forcing functions:
+           ST_IsPolygonCW, ST_IsPolygonCCW,
+           ST_ForcePolygonCW, ST_ForcePolygonCCW
+           (Dan Baston)
   - #3753, Gist penalty speed improvements for 2D and ND points
            (Darafei Praliaskouski, Andrey Borodin)
   - #3677, ST_FrechetDistance (Shinichi Sugiyama)

README.postgis

 PostGIS - Geographic Information Systems Extensions to PostgreSQL
 =================================================================
 
-:Version: 3.0.0alpah2
-:Date: 2019-06-02
+:Version: 3.0.0beta1
+:Date: 2019-09-28
 :Website: https://postgis.net
 
 This distribution contains a module which implements GIS simple features, ties

Version.config

@@ -5,7 +5,7 @@
 
 POSTGIS_MAJOR_VERSION=3
 POSTGIS_MINOR_VERSION=0
-POSTGIS_MICRO_VERSION=0alpha4
+POSTGIS_MICRO_VERSION=0beta1
 
 # Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
 # when changing POSTGIS_MINOR_VERSION

aclocal.m4

@@ -45,6 +45,7 @@ esac
 ])
 
 m4_include([macros/ac_proj4_version.m4])
+m4_include([macros/ac_protobufc_version.m4])
 m4_include([macros/ax_cxx_compile_stdcxx.m4])
 m4_include([macros/gettext.m4])
 m4_include([macros/gtk-2.0.m4])

build-aux/ltmain.sh

@@ -31,7 +31,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-10"
+VERSION="2.4.6 Debian-2.4.6-11"
 package_revision=2.4.6
 
 
@@ -2141,7 +2141,7 @@ include the following information:
        compiler:       $LTCC
        compiler flags: $LTCFLAGS
        linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname $scriptversion Debian-2.4.6-10
+       version:        $progname $scriptversion Debian-2.4.6-11
        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
 

ci/bessie32/postgis_regress.sh

-export PATH=${PATH}:/usr/local:/usr/local/lib:/usr/local/bin
+#export PATH=${PATH}:/usr/local:/usr/local/lib:/usr/local/bin
 sh autogen.sh
-./configure --with-libiconv=/usr/local --without-interrupt-tests
+./configure --with-libiconv=/usr/local --without-wagyu --without-interrupt-tests
 make clean
 make
 export PGUSER=postgres

ci/dronie/postgis_regress.sh

+#!/bin/bash
+
+# Exit on first error
+set -e
+
+service postgresql start $PGVER
+export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
+export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
+psql --version
+./autogen.sh
+./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
+make clean
+make -j
+# we should maybe wait for postgresql service to startup here...
+psql -c "select version()" template1
+RUNTESTFLAGS=-v make check
+make install
+RUNTESTFLAGS=-v make installcheck
+utils/check_all_upgrades.sh -s \
+  `grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`

ci/travis/run_usan_clang.sh

@@ -10,7 +10,7 @@ export ASAN_OPTIONS=halt_on_error=false,leak_check_at_exit=false,exitcode=0
 export MSAN_OPTIONS=halt_on_error=false,leak_check_at_exit=false,exitcode=0
 
 #Run postgres preloading sanitizer libs
-LD_PRELOAD=/usr/lib/clang/7/lib/linux/libclang_rt.asan-x86_64.so /usr/local/pgsql/bin/pg_ctl -c -l /tmp/logfile start
+LD_PRELOAD=/usr/lib/clang/8/lib/linux/libclang_rt.asan-x86_64.so /usr/local/pgsql/bin/pg_ctl -c -l /tmp/logfile start
 
 
 # Build with Clang and usan flags

ci/winnie/build_postgis.sh

 #!/bin/bash
 set -e
 if  [[ "${OVERRIDE}" == '' ]] ; then
-	export GEOS_VER=3.8
+	export GEOS_VER=3.8.0beta1
 	export GDAL_VER=2.2.4
 	export PROJ_VER=4.9.3
 	export SFCGAL_VER=1.3.2

ci/winnie/package_postgis.sh

@@ -16,7 +16,7 @@
 #otherwise use the ones jenkins passes thru
 #!/bin/bash
 if  [[ "${OVERRIDE}" == '' ]] ; then
-	export GEOS_VER=3.8
+	export GEOS_VER=3.8.0beta1
 	export GDAL_VER=2.2.4
 	export PROJ_VER=4.9.3
 	export SFCGAL_VER=1.3.2

ci/winnie/regress_postgis.sh

 #!/bin/bash
 set -e
 if  [[ "${OVERRIDE}" == '' ]] ; then
-	export GEOS_VER=3.8
+	export GEOS_VER=3.8.0beta1
 	export GDAL_VER=2.2.4
 	export PROJ_VER=4.9.3
 	export SFCGAL_VER=1.3.2

configure

@@ -681,10 +681,11 @@ IGE_MAC_LIBS
 IGE_MAC_CFLAGS
 GTK_LIBS
 GTK_CFLAGS
-HAVE_PROTOBUF
 PROTOBUF_LDFLAGS
 PROTOBUF_CPPFLAGS
-PROTOCC_VERSION
+PROTOC_VERSION
+HAVE_GEOBUF
+HAVE_PROTOBUF
 PROTOCC
 PROTOBUFC_LIBS
 PROTOBUFC_CFLAGS
@@ -901,6 +902,8 @@ with_json
 with_jsondir
 with_protobuf
 with_protobufdir
+with_protobuf_inc
+with_protobuf_lib
 with_gui
 enable_gtktest
 enable_debug
@@ -1612,6 +1615,12 @@ Optional Packages:
   --with-jsondir=PATH     specify the json-c installation directory
   --without-protobuf      build without protobuf-c support
   --with-protobufdir=PATH specify the protobuf-c installation directory
+  --with-protobuf-inc=PATH
+                          google/protobuf-c/protobuf-c.h header installation
+                          directory
+  --with-protobuf-lib=PATH
+                          libprotobuf-c.so/dll/dylib library installation
+                          directory
   --with-gui              compile the data import GUI (requires GTK+2.0)
   --without-address-standardizer
                           Disable the address_standardizer extension
@@ -17599,7 +17608,8 @@ fi
 CHECK_PROTOBUF=yes
-HAVE_PROTOBUF=no
+HAVE_PROTOBUF=yes
+HAVE_GEOBUF=no
 # Check whether --with-protobuf was given.
@@ -17611,98 +17621,10 @@ fi
 if test "$CHECK_PROTOBUF" != "no"; then
-# Check whether --with-protobufdir was given.
-if test "${with_protobufdir+set}" = set; then :
-  withval=$with_protobufdir; PROTOBUFDIR="$withval"
-else
-  PROTOBUFDIR=
-fi
-
-
-            if test ! "x$PROTOBUFDIR" = "x"; then
-    	    	if test "x$PROTOBUFDIR" = "xyes"; then
-    		as_fn_error $? "you must specify a parameter to --with-protobufdir, e.g. --with-protobufdir=/path/to" "$LINENO" 5
-    	else
-    		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using user-specified protobuf-c directory: $PROTOBUFDIR" >&5
-$as_echo "Using user-specified protobuf-c directory: $PROTOBUFDIR" >&6; }
-
-    		    		PROTOBUF_CPPFLAGS="-I$PROTOBUFDIR/include"
-    		PROTOBUF_LDFLAGS="-L$PROTOBUFDIR/lib"
-    	fi
-
 	CPPFLAGS_SAVE="$CPPFLAGS"
-        CPPFLAGS="$PROTOBUF_CPPFLAGS"
-        ac_fn_c_check_header_mongrel "$LINENO" "protobuf-c/protobuf-c.h" "ac_cv_header_protobuf_c_protobuf_c_h" "$ac_includes_default"
-if test "x$ac_cv_header_protobuf_c_protobuf_c_h" = xyes; then :
-
-else
-  as_fn_error $? "unable to find $PROTOBUFDIR/include/protobuf-c/protobuf-c.h" "$LINENO" 5
-
-fi
-
-
-        CPPFLAGS="$CPPFLAGS_SAVE"
-
-                LIBS_SAVE="$LIBS"
-        LIBS="$PROTOBUF_LDFLAGS"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for protobuf_c_message_check in -lprotobuf-c" >&5
-$as_echo_n "checking for protobuf_c_message_check in -lprotobuf-c... " >&6; }
-if ${ac_cv_lib_protobuf_c_protobuf_c_message_check+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lprotobuf-c  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char protobuf_c_message_check ();
-int
-main ()
-{
-return protobuf_c_message_check ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_protobuf_c_protobuf_c_message_check=yes
-else
-  ac_cv_lib_protobuf_c_protobuf_c_message_check=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_protobuf_c_protobuf_c_message_check" >&5
-$as_echo "$ac_cv_lib_protobuf_c_protobuf_c_message_check" >&6; }
-if test "x$ac_cv_lib_protobuf_c_protobuf_c_message_check" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPROTOBUF_C 1
-_ACEOF
-
-  LIBS="-lprotobuf-c $LIBS"
-
-else
-  as_fn_error $? "unable to link protobuf-c from $PROTOBUFDIR/lib" "$LINENO" 5
-
-fi
-
-        HAVE_PROTOBUF=yes
-        PROTOBUF_LDFLAGS="-L$PROTOBUFDIR/lib -lprotobuf-c"
-        LIBS="$LIBS_SAVE"
-        else
-        if test -z "$PKG_CONFIG"; then
-        	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find pkg-config, disabling protobuf support." >&5
-$as_echo "$as_me: WARNING: Cannot find pkg-config, disabling protobuf support." >&2;}
-        	HAVE_PROTOBUF=no
-        else
+	LDFLAGS_SAVE="$LDFLAGS"
+		if test -n "$PKG_CONFIG"; then
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PROTOBUFC" >&5
@@ -17712,12 +17634,12 @@ if test -n "$PROTOBUFC_CFLAGS"; then
     pkg_cv_PROTOBUFC_CFLAGS="$PROTOBUFC_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprotobuf-c >= 1.1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libprotobuf-c >= 1.1.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprotobuf-c >= 1.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libprotobuf-c >= 1.0.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_PROTOBUFC_CFLAGS=`$PKG_CONFIG --cflags "libprotobuf-c >= 1.1.0" 2>/dev/null`
+  pkg_cv_PROTOBUFC_CFLAGS=`$PKG_CONFIG --cflags "libprotobuf-c >= 1.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -17729,12 +17651,12 @@ if test -n "$PROTOBUFC_LIBS"; then
     pkg_cv_PROTOBUFC_LIBS="$PROTOBUFC_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprotobuf-c >= 1.1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libprotobuf-c >= 1.1.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprotobuf-c >= 1.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libprotobuf-c >= 1.0.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_PROTOBUFC_LIBS=`$PKG_CONFIG --libs "libprotobuf-c >= 1.1.0" 2>/dev/null`
+  pkg_cv_PROTOBUFC_LIBS=`$PKG_CONFIG --libs "libprotobuf-c >= 1.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -17755,85 +17677,235 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PROTOBUFC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libprotobuf-c >= 1.1.0" 2>&1`
+	        PROTOBUFC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libprotobuf-c >= 1.0.0" 2>&1`
         else
-	        PROTOBUFC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libprotobuf-c >= 1.1.0" 2>&1`
+	        PROTOBUFC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libprotobuf-c >= 1.0.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PROTOBUFC_PKG_ERRORS" >&5
-	HAVE_PROTOBUF=no
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libprotobuf-c not found in pkg-config" >&5
+$as_echo "libprotobuf-c not found in pkg-config" >&6; }
+
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	HAVE_PROTOBUF=no
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libprotobuf-c not found in pkg-config" >&5
+$as_echo "libprotobuf-c not found in pkg-config" >&6; }
+
 else
 	PROTOBUFC_CFLAGS=$pkg_cv_PROTOBUFC_CFLAGS
 	PROTOBUFC_LIBS=$pkg_cv_PROTOBUFC_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-                    HAVE_PROTOBUF=yes;
-                    PROTOBUF_CPPFLAGS=$PROTOBUFC_CFLAGS;
-                    PROTOBUF_LDFLAGS=$PROTOBUFC_LIBS
+				PROTOBUF_CPPFLAGS="$PROTOBUFC_CFLAGS";
+				PROTOBUF_LDFLAGS="$PROTOBUFC_LIBS";
 fi
 	fi
+
+
+# Check whether --with-protobufdir was given.
+if test "${with_protobufdir+set}" = set; then :
+  withval=$with_protobufdir;
+			if test "x$withval" = "xyes"; then
+				as_fn_error $? "you must specify a parameter to --with-protobufdir, e.g. --with-protobufdir=/usr/local" "$LINENO" 5
+			else
+				PROTOBUF_LDFLAGS="-L$withval/lib -lprotobuf-c";
+				PROTOBUF_CPPFLAGS="-I$withval/include"
 			fi
-    if test "$HAVE_PROTOBUF" = "yes"; then
-    	# Extract the first word of "protoc-c", so it can be a program name with args.
-set dummy protoc-c; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PROTOCC+:} false; then :
+fi
+
+
+
+# Check whether --with-protobuf-inc was given.
+if test "${with_protobuf_inc+set}" = set; then :
+  withval=$with_protobuf_inc;
+			PROTOBUF_CPPFLAGS="-I$withval"
+
+fi
+
+
+
+# Check whether --with-protobuf-lib was given.
+if test "${with_protobuf_lib+set}" = set; then :
+  withval=$with_protobuf_lib;
+			PROTOBUF_LDFLAGS="-L$withval -lprotobuf-c"
+
+fi
+
+
+	if test -n "$PROTOBUF_CPPFLAGS"; then
+		CPPFLAGS="$PROTOBUF_CPPFLAGS"
+	fi
+
+	if test -n "$PROTOBUF_LDFLAGS"; then
+		LDFLAGS="$PROTOBUF_LDFLAGS"
+	fi
+
+		ac_fn_c_check_header_mongrel "$LINENO" "protobuf-c/protobuf-c.h" "ac_cv_header_protobuf_c_protobuf_c_h" "$ac_includes_default"
+if test "x$ac_cv_header_protobuf_c_protobuf_c_h" = xyes; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: unable to find protobuf-c/protobuf-c.h using $CPPFLAGS" >&5
+$as_echo "unable to find protobuf-c/protobuf-c.h using $CPPFLAGS" >&6; }
+		HAVE_PROTOBUF=no
+
+fi
+
+
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for protobuf_c_message_init in -lprotobuf-c" >&5
+$as_echo_n "checking for protobuf_c_message_init in -lprotobuf-c... " >&6; }
+if ${ac_cv_lib_protobuf_c_protobuf_c_message_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $PROTOCC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PROTOCC="$PROTOCC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PROTOCC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lprotobuf-c  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char protobuf_c_message_init ();
+int
+main ()
+{
+return protobuf_c_message_init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_protobuf_c_protobuf_c_message_init=yes
+else
+  ac_cv_lib_protobuf_c_protobuf_c_message_init=no
 fi
-done
-  done
-IFS=$as_save_IFS
-  ;;
-esac
+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_protobuf_c_protobuf_c_message_init" >&5
+$as_echo "$ac_cv_lib_protobuf_c_protobuf_c_message_init" >&6; }
+if test "x$ac_cv_lib_protobuf_c_protobuf_c_message_init" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPROTOBUF_C 1
+_ACEOF
+
+  LIBS="-lprotobuf-c $LIBS"
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: unable to link protobuf-c using $LDFLAGS" >&5
+$as_echo "unable to link protobuf-c using $LDFLAGS" >&6; }
+		HAVE_PROTOBUF=no
 fi
-PROTOCC=$ac_cv_path_PROTOCC
-if test -n "$PROTOCC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROTOCC" >&5
-$as_echo "$PROTOCC" >&6; }
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for protobuf_c_version in -lprotobuf-c" >&5
+$as_echo_n "checking for protobuf_c_version in -lprotobuf-c... " >&6; }
+if ${ac_cv_lib_protobuf_c_protobuf_c_version+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lprotobuf-c  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char protobuf_c_version ();
+int
+main ()
+{
+return protobuf_c_version ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_protobuf_c_protobuf_c_version=yes
+else
+  ac_cv_lib_protobuf_c_protobuf_c_version=no
 fi
-    	if test "x$PROTOCC" = "x"; then
-    	  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Protobuf compiler missing, disabling protobuf support." >&5
-$as_echo "$as_me: WARNING: Protobuf compiler missing, disabling protobuf support." >&2;}
-    	  HAVE_PROTOBUF=no
+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_protobuf_c_protobuf_c_version" >&5
+$as_echo "$ac_cv_lib_protobuf_c_protobuf_c_version" >&6; }
+if test "x$ac_cv_lib_protobuf_c_protobuf_c_version" = xyes; then :
+$as_echo "#define HAVE_PROTOBUF_C_VERSION 1" >>confdefs.h
+fi
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking protobuf-c version" >&5
+$as_echo_n "checking protobuf-c version... " >&6; }
+
+
+	if test "$cross_compiling" = yes; then :
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
 else
-$as_echo "#define HAVE_LIBPROTOBUF 1" >>confdefs.h
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+			#ifdef HAVE_STDINT_H
+			#include <stdio.h>
+			#endif
+			#include "protobuf-c/protobuf-c.h"
+
+int
+main ()
+{
+
+			FILE *fp = fopen("conftest.out", "w");
+			fprintf(fp, "%d\n", PROTOBUF_C_VERSION_NUMBER);
+			fclose(fp);
+
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+						PROTOC_VERSION=`cat conftest.out`
+
+else
+
+				PROTOC_VERSION="0"
 fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-        if test "$HAVE_PROTOBUF" = "yes"; then
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROTOC_VERSION" >&5
+$as_echo "$PROTOC_VERSION" >&6; }
+
+	CPPFLAGS="$CPPFLAGS_SAVE"
+	LDFLAGS="$LDFLAGS_SAVE"
+
 		# Extract the first word of "protoc-c", so it can be a program name with args.
 set dummy protoc-c; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -17874,17 +17946,26 @@ $as_echo "no" >&6; }
 fi
-        PROTOCC_SEMVER=$($PROTOCC --version | grep protobuf-c | awk '{print $2}')
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking protoc-c version... $PROTOCC_SEMVER" >&5
-$as_echo "checking protoc-c version... $PROTOCC_SEMVER" >&6; }
-        PROTOCC_VERSION_MAJOR=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $1}')
-        PROTOCC_VERSION_MINOR=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $2}')
-        PROTOCC_VERSION_PATCH=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $3}')
-        PROTOCC_VERSION=$(expr 10000 \* $PROTOCC_VERSION_MAJOR + 100 \* $PROTOCC_VERSION_MINOR + $PROTOCC_VERSION_PATCH)
-        if test $PROTOCC_VERSION -ge 10100; then
+	if test -z "$PROTOCC"; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Cannot find protoc-c protobuf compiler on the PATH: $PATH" >&5
+$as_echo "Cannot find protoc-c protobuf compiler on the PATH: $PATH" >&6; }
+		HAVE_PROTOBUF=no
+	fi
+
+	    if test "$HAVE_PROTOBUF" = "yes"; then
+
+$as_echo "#define HAVE_LIBPROTOBUF 1" >>confdefs.h
+
+
+cat >>confdefs.h <<_ACEOF
+#define LIBPROTOBUF_VERSION $PROTOC_VERSION
+_ACEOF
+
+		if test $PROTOC_VERSION -ge 1001000; then
 $as_echo "#define HAVE_GEOBUF 1" >>confdefs.h
+			HAVE_GEOBUF=yes
 		fi
 	fi
@@ -17892,6 +17973,8 @@ $as_echo "#define HAVE_GEOBUF 1" >>confdefs.h
+
+
 fi
@@ -18878,13 +18961,11 @@ if test "x$HAVE_PROTOBUF" = "xyes"; then
 # Check whether --with-wagyu was given.
 if test "${with_wagyu+set}" = set; then :
-  withval=$with_wagyu; HAVE_WAGYU=no
-else
-  HAVE_WAGYU=yes
+  withval=$with_wagyu;
 fi
-    if test "x$HAVE_WAGYU" = "xyes"; then
+    if test "x$with_wagyu" != xno; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: WAGYU: Wagyu usage requested" >&5
 $as_echo "WAGYU: Wagyu usage requested" >&6; }
@@ -22942,6 +23023,7 @@ $as_echo "$as_me: WARNING: \"Could not find a C++ standard library\"" >&2;}
             CXXFLAGS="$CXXFLAGS_SAVE"
             CPPFLAGS="$CPPFLAGS_SAVE"
+            HAVE_WAGYU=yes
 $as_echo "#define HAVE_WAGYU 1" >>confdefs.h
@@ -25590,11 +25672,11 @@ $as_echo "  Libxml2 version:      ${POSTGIS_LIBXML2_VERSION}" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:   JSON-C support:       ${HAVE_JSON}" >&5
 $as_echo "  JSON-C support:       ${HAVE_JSON}" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   protobuf-c support:   ${HAVE_PROTOBUF}" >&5
-$as_echo "  protobuf-c support:   ${HAVE_PROTOBUF}" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:   protobuf support:     ${HAVE_PROTOBUF}" >&5
+$as_echo "  protobuf support:     ${HAVE_PROTOBUF}" >&6; }
 if test "x$HAVE_PROTOBUF" = "xyes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result:   protobuf-c version:   ${PROTOCC_SEMVER}" >&5
-$as_echo "  protobuf-c version:   ${PROTOCC_SEMVER}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result:   protobuf-c version:   ${PROTOC_VERSION}" >&5
+$as_echo "  protobuf-c version:   ${PROTOC_VERSION}" >&6; }
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:   PCRE support:         ${HAVE_PCRE}" >&5

configure.ac

@@ -973,95 +973,106 @@ dnl Detect if protobuf-c installed
 dnl ===========================================================================
 
 CHECK_PROTOBUF=yes
-HAVE_PROTOBUF=no
+HAVE_PROTOBUF=yes
+HAVE_GEOBUF=no
 
 AC_ARG_WITH([protobuf],
 	[AS_HELP_STRING([--without-protobuf], [build without protobuf-c support])],
 	[CHECK_PROTOBUF="$withval"], [])
 
-dnl User didn't turn off protobuf support so...
+dnl User didn't turn OFF protobuf support so...
 if test "$CHECK_PROTOBUF" != "no"; then
 
-    AC_ARG_WITH([protobufdir],
-    	[AS_HELP_STRING([--with-protobufdir=PATH], [specify the protobuf-c installation directory])],
-    	[PROTOBUFDIR="$withval"], [PROTOBUFDIR=])
+	dnl Need to find libdir, incdir and protoc-c compiler
 
-    dnl User specified the directory to find protobuf in, check that and
-    dnl fail if it doesn't work
-    if test ! "x$PROTOBUFDIR" = "x"; then
-    	dnl Make sure that the directory exists
-    	if test "x$PROTOBUFDIR" = "xyes"; then
-    		AC_MSG_ERROR([you must specify a parameter to --with-protobufdir, e.g. --with-protobufdir=/path/to])
-    	else
-    		AC_MSG_RESULT([Using user-specified protobuf-c directory: $PROTOBUFDIR])
+	CPPFLAGS_SAVE="$CPPFLAGS"
+	LDFLAGS_SAVE="$LDFLAGS"
 
-    		dnl Add the include directory to PROTOBUF_CPPFLAGS
-    		PROTOBUF_CPPFLAGS="-I$PROTOBUFDIR/include"
-    		PROTOBUF_LDFLAGS="-L$PROTOBUFDIR/lib"
+	dnl Try pkgconfig first
+	if test -n "$PKG_CONFIG"; then
+		dnl Ensure libprotobuf-c is of minimum required version
+		PKG_CHECK_MODULES([PROTOBUFC], [libprotobuf-c >= 1.0.0], [
+				PROTOBUF_CPPFLAGS="$PROTOBUFC_CFLAGS";
+				PROTOBUF_LDFLAGS="$PROTOBUFC_LIBS";
+			], [
+				AC_MSG_RESULT([libprotobuf-c not found in pkg-config])
+			])
 	fi
 
-        dnl Check that we can find the protobuf/protobuf.h header file
-        CPPFLAGS_SAVE="$CPPFLAGS"
+	AC_ARG_WITH([protobufdir],
+		[AS_HELP_STRING([--with-protobufdir=PATH], [specify the protobuf-c installation directory])],[
+			if test "x$withval" = "xyes"; then
+				AC_MSG_ERROR([you must specify a parameter to --with-protobufdir, e.g. --with-protobufdir=/usr/local])
+			else
+				PROTOBUF_LDFLAGS="-L$withval/lib -lprotobuf-c";
+				PROTOBUF_CPPFLAGS="-I$withval/include"
+			fi
+		], [])
+
+	AC_ARG_WITH([protobuf-inc],
+		[AS_HELP_STRING([--with-protobuf-inc=PATH], [google/protobuf-c/protobuf-c.h header installation directory])], [
+			PROTOBUF_CPPFLAGS="-I$withval"
+		],[])
+
+	AC_ARG_WITH([protobuf-lib],
+		[AS_HELP_STRING([--with-protobuf-lib=PATH], [libprotobuf-c.so/dll/dylib library installation directory])], [
+			PROTOBUF_LDFLAGS="-L$withval -lprotobuf-c"
+		],[])
+
+	if test -n "$PROTOBUF_CPPFLAGS"; then
 		CPPFLAGS="$PROTOBUF_CPPFLAGS"
+	fi
+
+	if test -n "$PROTOBUF_LDFLAGS"; then
+		LDFLAGS="$PROTOBUF_LDFLAGS"
+	fi
+
+	dnl confirm that discovered/configured include path works
 	AC_CHECK_HEADER([protobuf-c/protobuf-c.h], [],
-		    AC_MSG_ERROR([unable to find $PROTOBUFDIR/include/protobuf-c/protobuf-c.h])
+		AC_MSG_RESULT([unable to find protobuf-c/protobuf-c.h using $CPPFLAGS])
+		HAVE_PROTOBUF=no
 	)
-        CPPFLAGS="$CPPFLAGS_SAVE"
 
-        dnl Ensure we can link against libprotobuf-c
-        LIBS_SAVE="$LIBS"
-        LIBS="$PROTOBUF_LDFLAGS"
-        AC_CHECK_LIB([protobuf-c], [protobuf_c_message_check], [],
-            AC_MSG_ERROR([unable to link protobuf-c from $PROTOBUFDIR/lib])
+	dnl confirm that discovered/configured library path works
+	AC_CHECK_LIB([protobuf-c], [protobuf_c_message_init], [],
+		AC_MSG_RESULT([unable to link protobuf-c using $LDFLAGS])
+		HAVE_PROTOBUF=no
 	)
-        HAVE_PROTOBUF=yes
-        PROTOBUF_LDFLAGS="-L$PROTOBUFDIR/lib -lprotobuf-c"
-        LIBS="$LIBS_SAVE"
 
-    dnl No user-specified protobuf dir, try to find one using pkg-config
-    else
-        if test -z "$PKG_CONFIG"; then
-        	AC_MSG_WARN([Cannot find pkg-config, disabling protobuf support.])
-        	HAVE_PROTOBUF=no
-        else
-        	dnl Ensure libprotobuf-c is of minimum required version
-        	PKG_CHECK_MODULES([PROTOBUFC], [libprotobuf-c >= 1.1.0], [
-                    HAVE_PROTOBUF=yes;
-                    PROTOBUF_CPPFLAGS=$PROTOBUFC_CFLAGS;
-                    PROTOBUF_LDFLAGS=$PROTOBUFC_LIBS
-                ],
-                [HAVE_PROTOBUF=no])
-        fi
-    fi
+	AC_CHECK_LIB([protobuf-c], [protobuf_c_version],
+		AC_DEFINE([HAVE_PROTOBUF_C_VERSION], [1], [Define to 1 if protobuf_c_version() is present]),
+		[])
 
-    if test "$HAVE_PROTOBUF" = "yes"; then
+	AC_MSG_CHECKING([protobuf-c version])
+	AC_PROTOBUFC_VERSION([PROTOC_VERSION])
+	AC_MSG_RESULT([$PROTOC_VERSION])
+
+	CPPFLAGS="$CPPFLAGS_SAVE"
+	LDFLAGS="$LDFLAGS_SAVE"
+
+	dnl confirm that protobuf compiler is available
 	AC_PATH_PROG(PROTOCC, protoc-c)
-    	if test "x$PROTOCC" = "x"; then
-    	  AC_MSG_WARN([Protobuf compiler missing, disabling protobuf support.])
+	if test -z "$PROTOCC"; then
+		AC_MSG_RESULT([Cannot find protoc-c protobuf compiler on the PATH: $PATH])
 		HAVE_PROTOBUF=no
-    	else
-    	  AC_DEFINE([HAVE_LIBPROTOBUF], [1], [Define to 1 if libprotobuf-c is present])
-    	fi
 	fi
 
-    dnl Get version number for protoc-c
+	dnl all tests passed! turn on compile-time defines
     if test "$HAVE_PROTOBUF" = "yes"; then
-        AC_PATH_PROG(PROTOCC, protoc-c)
-        PROTOCC_SEMVER=$($PROTOCC --version | grep protobuf-c | awk '{print $2}')
-        AC_MSG_RESULT([checking protoc-c version... $PROTOCC_SEMVER])
-        PROTOCC_VERSION_MAJOR=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $1}')
-        PROTOCC_VERSION_MINOR=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $2}')
-        PROTOCC_VERSION_PATCH=$(echo "$PROTOCC_SEMVER" | tr '.' ' ' | awk '{print $3}')
-        PROTOCC_VERSION=$(expr 10000 \* $PROTOCC_VERSION_MAJOR + 100 \* $PROTOCC_VERSION_MINOR + $PROTOCC_VERSION_PATCH)
-        if test $PROTOCC_VERSION -ge 10100; then
-            AC_DEFINE([HAVE_GEOBUF], [1], [Define to 1 if libprotobuf-c is >= 1.1])
+		AC_DEFINE([HAVE_LIBPROTOBUF], [1], [Define to 1 if libprotobuf-c is present])
+		AC_DEFINE_UNQUOTED([LIBPROTOBUF_VERSION], [$PROTOC_VERSION], [Numeric version number for libprotobuf-c])
+		if test $PROTOC_VERSION -ge 1001000; then
+			AC_DEFINE([HAVE_GEOBUF], [1], [Define to 1 if libprotobuf is >= 1.1])
+			HAVE_GEOBUF=yes
 		fi
 	fi
 
-    AC_SUBST([PROTOCC_VERSION])
+    AC_SUBST([HAVE_PROTOBUF])
+    AC_SUBST([HAVE_GEOBUF])
+    AC_SUBST([PROTOC_VERSION])
     AC_SUBST([PROTOBUF_CPPFLAGS])
     AC_SUBST([PROTOBUF_LDFLAGS])
-    AC_SUBST([HAVE_PROTOBUF])
+
 fi
 
 
@@ -1476,13 +1487,9 @@ dnl Wagyu will only be necessary if protobuf is present to build MVTs
 
 HAVE_WAGYU=no
 if test "x$HAVE_PROTOBUF" = "xyes"; then
-    AC_ARG_WITH(
-            [wagyu],
-            AC_HELP_STRING([--without-wagyu], [Don't use the wagyu library]),
-            [HAVE_WAGYU=no],
-            [HAVE_WAGYU=yes])
+    AC_ARG_WITH([wagyu], AC_HELP_STRING([--without-wagyu], [Don't use the wagyu library]), [], [])
 
-    if test "x$HAVE_WAGYU" = "xyes"; then
+    if test "x$with_wagyu" != xno; then
             AC_MSG_RESULT([WAGYU: Wagyu usage requested])
 
             DEPS_SUBDIR="deps"
@@ -1531,6 +1538,7 @@ if test "x$HAVE_PROTOBUF" = "xyes"; then
             CXXFLAGS="$CXXFLAGS_SAVE"
             CPPFLAGS="$CPPFLAGS_SAVE"
 
+            HAVE_WAGYU=yes
             AC_DEFINE([HAVE_WAGYU], [1], [Define to 1 if wagyu is being built])
             AC_SUBST([HAVE_WAGYU])
             AC_SUBST([WAGYU_CXX])
@@ -1642,9 +1650,9 @@ AC_MSG_RESULT([  Libxml2 config:       ${XML2CONFIG}])
 AC_MSG_RESULT([  Libxml2 version:      ${POSTGIS_LIBXML2_VERSION}])
 AC_MSG_RESULT([  JSON-C support:       ${HAVE_JSON}])
 
-AC_MSG_RESULT([  protobuf-c support:   ${HAVE_PROTOBUF}])
+AC_MSG_RESULT([  protobuf support:     ${HAVE_PROTOBUF}])
 if test "x$HAVE_PROTOBUF" = "xyes"; then
-  AC_MSG_RESULT([  protobuf-c version:   ${PROTOCC_SEMVER}])
+  AC_MSG_RESULT([  protobuf-c version:   ${PROTOC_VERSION}])
 fi
 
 AC_MSG_RESULT([  PCRE support:         ${HAVE_PCRE}])

debian/changelog

+postgis (3.0.0~beta1+dfsg-1~exp1) experimental; urgency=medium
+
+  * New upstream beta release.
+  * Update copyright for fuzzers sources.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 29 Sep 2019 08:00:25 +0200
+
 postgis (3.0.0~alpha4+dfsg-2~exp1) experimental; urgency=medium
 
   [ Christoph Berg ]

debian/copyright

@@ -150,6 +150,9 @@ Copyright: 2006-2014, Stephen Woodbridge
 License: Expat
 
 Files: fuzzers/fuzzingengine.c
+ fuzzers/geojson_import_fuzzer.cpp
+ fuzzers/geos_stub.h
+ fuzzers/proj_stub.h
  fuzzers/wkb_import_fuzzer.cpp
  fuzzers/wkt_import_fuzzer.cpp
 Copyright: 2017, Even Rouault <even.rouault@spatialys.com>

deps/Makefile

@@ -40,7 +40,7 @@ install:
 
 uninstall:
 
-check:
+check check-unit check-regress:
 
 clean:
 	$(MAKE) -C wagyu $@