[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89

Bas Couwenberg sebastic at xs4all.nl
Tue Oct 8 22:34:50 UTC 2013 

The following commit has been merged in the master branch:
commit 3f7a20be6db649285f606f4d20e6f948cfc17b1e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Oct 7 00:51:25 2013 +0200

    Use dh-autoreconf for retooling.
    
    Use dh-autoreconf for retooling.
    Drop reautoconfiscated.diff, no longer required.

diff --git a/debian/README.source b/debian/README.source
index 37f6c8c..0dd3f9f 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -17,8 +17,6 @@ the system provided. The Boost library is currently so oldi (and weak)
 that it is better using the internal one (which is not exposed).
 
 This is done by changing the Makefile.am automake set of scripts
-and autoreconfiguring. Quilt is used to do that in two steps
-and create a couple of suitable patches. The reautoconfiscated.diff
-patch can be obtained by running 'autoreconf --install --force --verbose'
-after applying the automake.diff one.
+and autoreconfiguring. Quilt is used to patch the build system and
+dh-autoreconf to reconfigure it.
 
diff --git a/debian/changelog b/debian/changelog
index e638e1c..fddc9cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low
   * Update copyright file using copyright-format 1.0.
   * Add lintian override for source-contains-prebuilt-windows-binary.
   * Use minimal dh rules, handle Multi-Arch paths.
+  * Use dh-autoreconf for retooling.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 05 Oct 2013 21:15:09 +0200
 
diff --git a/debian/control b/debian/control
index 4befdc5..da5cc7e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
  , Bas Couwenberg <sebastic at xs4all.nl>
 Build-Depends: debhelper (>= 9), autotools-dev, libexpat1-dev, zlib1g-dev, default-jdk,
  python-dev (>=  2.6.6-3~), python-all-dev (>= 2.6.6-3~), liburiparser-dev (>= 0.7.1), chrpath,
- libcurl4-openssl-dev, swig
+ libcurl4-openssl-dev, swig, dh-autoreconf
 X-Python-Version: 2.7
 Standards-Version: 3.9.3
 Homepage: http://code.google.com/p/libkml/
diff --git a/debian/patches/automake.diff b/debian/patches/automake.diff
index dbf4fbd..d02510e 100644
--- a/debian/patches/automake.diff
+++ b/debian/patches/automake.diff
@@ -215,9 +215,9 @@
               $(top_builddir)/src/kml/dom/libkmldom.la \
 --- a/third_party/Makefile.am
 +++ b/third_party/Makefile.am
-@@ -1,11 +1,10 @@
- uriparser = uriparser-0.7.5
- 
+@@ -1,11 +1,8 @@
+-uriparser = uriparser-0.7.5
+-
  AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \
 -	      -I$(top_srcdir)/third_party/$(uriparser)/include \
  	      -I$(top_srcdir)/third_party/googletest-r108 \
@@ -228,7 +228,7 @@
  noinst_LTLIBRARIES = libgtest.la libgtest_main.la
  
  libminizip_la_SOURCES = \
-@@ -15,27 +14,6 @@ libminizip_la_SOURCES = \
+@@ -15,27 +12,6 @@ libminizip_la_SOURCES = \
  	zlib-1.2.3/contrib/minizip/zip.c
  libminizip_la_LDFLAGS = -lz
  
@@ -256,3 +256,19 @@
  boost_root = boost_1_34_1
  boost = $(boost_root)/boost
  boostinc = $(includedir)/kml/third_party/$(boost)
+@@ -162,15 +138,6 @@ EXTRA_DIST = \
+ 	$(googletest)/include/gtest/internal/gtest-port.h \
+ 	$(googletest)/include/gtest/internal/gtest-string.h \
+ 	$(googletest)/include/gtest/internal/gtest-type-util.h \
+-	$(uriparser)/COPYING \
+-	$(uriparser).win32/debug/uriparser.lib \
+-	$(uriparser).win32/release/uriparser.lib \
+-	$(uriparser)/include/uriparser/Uri.h \
+-	$(uriparser)/include/uriparser/UriBase.h \
+-	$(uriparser)/include/uriparser/UriDefsAnsi.h \
+-	$(uriparser)/include/uriparser/UriDefsConfig.h \
+-	$(uriparser)/include/uriparser/UriDefsUnicode.h \
+-	$(uriparser)/include/uriparser/UriIp4.h \
+ 	zlib-1.2.3/zconf.h \
+ 	zlib-1.2.3/zlib.h \
+ 	zlib-1.2.3/contrib/minizip/crypt.h \
diff --git a/debian/patches/ld-as-needed.diff b/debian/patches/ld-as-needed.diff
index 743ddee..f6a726c 100644
--- a/debian/patches/ld-as-needed.diff
+++ b/debian/patches/ld-as-needed.diff
@@ -31,34 +31,6 @@
  	$(top_builddir)/src/kml/base/libkmlbase.la
  
  printgeometry_SOURCES = printgeometry.cc
---- a/examples/regionator/Makefile.in
-+++ b/examples/regionator/Makefile.in
-@@ -52,11 +52,11 @@ PROGRAMS = $(noinst_PROGRAMS)
- am_csvregionator_OBJECTS = csvregionator.$(OBJEXT)
- csvregionator_OBJECTS = $(am_csvregionator_OBJECTS)
- csvregionator_DEPENDENCIES =  \
-+	$(top_builddir)/src/kml/convenience/libkmlconvenience.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/engine/libkmlengine.la \
--	$(top_builddir)/src/kml/regionator/libkmlregionator.la \
--	$(top_builddir)/src/kml/convenience/libkmlconvenience.la
-+	$(top_builddir)/src/kml/regionator/libkmlregionator.la
- am_kmlregionator_OBJECTS = kmlregionator.$(OBJEXT)
- kmlregionator_OBJECTS = $(am_kmlregionator_OBJECTS)
- kmlregionator_DEPENDENCIES =  \
-@@ -232,9 +232,9 @@ kmlregionator_SOURCES = kmlregionator.cc
- kmlregionator_LDADD = \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
--	$(top_builddir)/src/kml/engine/libkmlengine.la \
- 	$(top_builddir)/src/kml/regionator/libkmlregionator.la \
--	$(top_builddir)/src/kml/convenience/libkmlconvenience.la
-+	$(top_builddir)/src/kml/convenience/libkmlconvenience.la \
-+	$(top_builddir)/src/kml/engine/libkmlengine.la
- 
- all: all-am
- 
 --- a/examples/regionator/Makefile.am
 +++ b/examples/regionator/Makefile.am
 @@ -10,17 +10,17 @@ noinst_PROGRAMS = csvregionator kmlregio
@@ -83,36 +55,3 @@
 +	$(top_builddir)/src/kml/convenience/libkmlconvenience.la \
 +	$(top_builddir)/src/kml/engine/libkmlengine.la
  
---- a/examples/helloworld/Makefile.in
-+++ b/examples/helloworld/Makefile.in
-@@ -345,8 +345,8 @@ circlegen_SOURCES = circlegen.cc
- circlegen_LDADD = \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
--	$(top_builddir)/src/kml/engine/libkmlengine.la \
--	$(top_builddir)/src/kml/convenience/libkmlconvenience.la
-+	$(top_builddir)/src/kml/convenience/libkmlconvenience.la \
-+	$(top_builddir)/src/kml/engine/libkmlengine.la
- 
- checklinks_SOURCES = checklinks.cc
- checklinks_LDADD = \
-@@ -394,8 +394,8 @@ hellohref_LDADD = \
- 
- hellokmz_SOURCES = hellokmz.cc
- hellokmz_LDADD = \
--	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/engine/libkmlengine.la \
-+	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la
- 
- helloregion_SOURCES = helloregion.cc
-@@ -421,8 +421,8 @@ parsens_LDADD = \
- 
- prettykml_SOURCES = prettykml.cc
- prettykml_LDADD = \
--	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/engine/libkmlengine.la \
-+	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la
- 
- printgeometry_SOURCES = printgeometry.cc
diff --git a/debian/patches/reautoconfiscated.diff b/debian/patches/reautoconfiscated.diff
deleted file mode 100644
index 5b93d23..0000000
--- a/debian/patches/reautoconfiscated.diff
+++ /dev/null
@@ -1,463 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -14847,7 +14847,7 @@ fi
- PLATFORM=
- SHLIBSUFFIX=
- case "`uname -s`" in
--	Linux)	PLATFORM=linux
-+	Linux|GNU/kFreeBSD|GNU)	PLATFORM=linux
- 		SHLIBSUFFIX="so"
- 	;;
- 	Darwin)	PLATFORM=darwin
---- a/examples/engine/Makefile.in
-+++ b/examples/engine/Makefile.in
-@@ -308,7 +308,7 @@ top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir)/src \
- 	      -I$(top_srcdir)/third_party/boost_1_34_1
- 
-- at GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
-+ at GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
- balloonwalker_SOURCES = balloonwalker.cc
- balloonwalker_LDADD = \
- 	$(top_builddir)/src/kml/engine/libkmlengine.la \
---- a/examples/gpx/Makefile.in
-+++ b/examples/gpx/Makefile.in
-@@ -209,7 +209,7 @@ top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir)/src \
- 	      -I$(top_srcdir)/third_party/boost_1_34_1
- 
-- at GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
-+ at GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
- gpxtracktokml_SOURCES = gpxtracktokml.cc
- gpxtracktokml_LDADD = \
- 	$(top_builddir)/src/kml/convenience/libkmlconvenience.la \
---- a/examples/gx/Makefile.in
-+++ b/examples/gx/Makefile.in
-@@ -216,7 +216,7 @@ top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir)/src \
- 	      -I$(top_srcdir)/third_party/boost_1_34_1
- 
-- at GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
-+ at GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
- gpxfly_SOURCES = gpxfly.cc
- gpxfly_LDADD = \
- 	$(top_builddir)/src/kml/convenience/libkmlconvenience.la \
---- a/examples/hellonet/Makefile.in
-+++ b/examples/hellonet/Makefile.in
-@@ -384,7 +384,7 @@ top_srcdir = @top_srcdir@
- @HAVE_CURL_TRUE@	      -I$(top_srcdir)/examples/hellonet \
- @HAVE_CURL_TRUE@	      -I$(top_srcdir)/third_party/boost_1_34_1
- 
-- at GCC_TRUE@@HAVE_CURL_TRUE at AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
-+ at GCC_TRUE@@HAVE_CURL_TRUE at AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
- @HAVE_CURL_TRUE at noinst_LTLIBRARIES = libcurlfetch.la
- @HAVE_CURL_TRUE at libcurlfetch_la_SOURCES = curlfetch.cc
- @HAVE_CURL_TRUE at libcurlfetch_la_LIBADD = -lcurl
---- a/examples/helloworld/Makefile.in
-+++ b/examples/helloworld/Makefile.in
-@@ -332,7 +332,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
- 	      -I$(top_srcdir)/examples/helloworld \
- 	      -I$(top_srcdir)/third_party/boost_1_34_1
- 
-- at GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
-+ at GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
- noinst_LTLIBRARIES = libhelloutil.la
- libhelloutil_la_SOURCES = print.cc
- libhelloutil_la_LIBADD = $(top_builddir)/third_party/libminizip.la
---- a/examples/regionator/Makefile.in
-+++ b/examples/regionator/Makefile.in
-@@ -219,7 +219,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
-               -I$(top_srcdir)/third_party/boost_1_34_1 \
-               -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
- 
-- at GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
-+ at GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
- csvregionator_SOURCES = csvregionator.cc
- csvregionator_LDADD = \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
---- a/examples/xsd/Makefile.in
-+++ b/examples/xsd/Makefile.in
-@@ -241,7 +241,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
- 	      -I$(top_srcdir)/examples/xsd \
- 	      -I$(top_srcdir)/third_party/boost_1_34_1
- 
-- at GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
-+ at GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
- xsdchildren_SOURCES = xsdchildren.cc
- xsdchildren_LDADD = \
- 	$(top_builddir)/src/kml/xsd/libkmlxsd.la \
---- a/src/kml/base/Makefile.in
-+++ b/src/kml/base/Makefile.in
-@@ -86,8 +86,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
- 	"$(DESTDIR)$(libkmlbaseincludedir)"
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libkmlbase_la_DEPENDENCIES =  \
--	$(top_builddir)/third_party/libminizip.la \
--	$(top_builddir)/third_party/liburiparser.la
-+	$(top_builddir)/third_party/libminizip.la
- am_libkmlbase_la_OBJECTS = attributes.lo csv_splitter.lo date_time.lo \
- 	expat_handler_ns.lo expat_parser.lo file.lo file_posix.lo \
- 	math_util.lo mimetypes.lo referent.lo string_util.lo \
-@@ -177,7 +176,6 @@ math_util_test_LINK = $(LIBTOOL) --tag=C
- am_net_cache_test_OBJECTS = net_cache_test-net_cache_test.$(OBJEXT)
- net_cache_test_OBJECTS = $(am_net_cache_test_OBJECTS)
- net_cache_test_DEPENDENCIES = libkmlbase.la \
--	$(top_builddir)/third_party/liburiparser.la \
- 	$(top_builddir)/third_party/libgtest_main.la
- net_cache_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-@@ -218,7 +216,6 @@ am_uri_parser_test_OBJECTS =  \
- 	uri_parser_test-uri_parser_test.$(OBJEXT)
- uri_parser_test_OBJECTS = $(am_uri_parser_test_OBJECTS)
- uri_parser_test_DEPENDENCIES = libkmlbase.la \
--	$(top_builddir)/third_party/liburiparser.la \
- 	$(top_builddir)/third_party/libgtest_main.la
- uri_parser_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-@@ -463,12 +460,11 @@ top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir)/src \
-               -I$(top_srcdir)/third_party/boost_1_34_1 \
-               -I$(top_srcdir)/third_party/googletest-r108/include \
--              -I$(top_srcdir)/third_party/uriparser-0.7.5/include \
-               -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
- 
-- at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
-- at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
--libkmlbase_la_LDFLAGS = -lexpat
-+ at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
-+ at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
-+libkmlbase_la_LDFLAGS = -lexpat -luriparser
- lib_LTLIBRARIES = libkmlbase.la
- libkmlbase_la_SOURCES = \
- 	attributes.cc \
-@@ -489,8 +485,7 @@ libkmlbase_la_SOURCES = \
- 	zip_file.cc
- 
- libkmlbase_la_LIBADD = \
--	$(top_builddir)/third_party/libminizip.la \
--	$(top_builddir)/third_party/liburiparser.la
-+	$(top_builddir)/third_party/libminizip.la
- 
- 
- # These header files will be installed in $(includedir)/kml/base
-@@ -570,8 +565,7 @@ math_util_test_LDADD = libkmlbase.la \
- 
- net_cache_test_SOURCES = net_cache_test.cc
- net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
--net_cache_test_LDADD = libkmlbase.la \
--        $(top_builddir)/third_party/liburiparser.la \
-+net_cache_test_LDADD = libkmlbase.la -luriparser \
- 	$(top_builddir)/third_party/libgtest_main.la
- 
- referent_test_SOURCES = referent_test.cc
-@@ -596,8 +590,7 @@ time_util_test_LDADD = libkmlbase.la \
- 
- uri_parser_test_SOURCES = uri_parser_test.cc
- uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
--uri_parser_test_LDADD = libkmlbase.la \
--        $(top_builddir)/third_party/liburiparser.la \
-+uri_parser_test_LDADD = libkmlbase.la -luriparser \
- 	$(top_builddir)/third_party/libgtest_main.la
- 
- util_test_SOURCES = util_test.cc
---- a/src/kml/convenience/Makefile.in
-+++ b/src/kml/convenience/Makefile.in
-@@ -439,8 +439,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
- 	      -I$(top_srcdir)/third_party/boost_1_34_1 \
-               -I$(top_srcdir)/third_party/googletest-r108/include
- 
-- at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
-- at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
-+ at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
-+ at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
- 
- # These header files are added to the distribution such that it can be built,
- # but these header files should not be used in application code.
---- a/src/kml/dom/Makefile.in
-+++ b/src/kml/dom/Makefile.in
-@@ -797,8 +797,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
- 	     -I$(top_srcdir)/third_party/boost_1_34_1 \
- 	     -I$(top_srcdir)/third_party/googletest-r108/include
- 
-- at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
-- at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
-+ at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
-+ at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
- lib_LTLIBRARIES = libkmldom.la
- libkmldom_la_SOURCES = \
- 	abstractlatlonbox.cc \
---- a/src/kml/engine/Makefile.in
-+++ b/src/kml/engine/Makefile.in
-@@ -393,7 +393,6 @@ style_inliner_test_OBJECTS = $(am_style_
- style_inliner_test_DEPENDENCIES = libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
--	$(top_builddir)/third_party/liburiparser.la \
- 	$(top_builddir)/third_party/libgtest_main.la
- style_inliner_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-@@ -647,8 +646,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
- 	     -I$(top_srcdir)/third_party/boost_1_34_1 \
- 	     -I$(top_srcdir)/third_party/googletest-r108/include
- 
-- at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
-- at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
-+ at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
-+ at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
- lib_LTLIBRARIES = libkmlengine.la
- libkmlengine_la_SOURCES = \
- 	clone.cc \
-@@ -913,8 +912,7 @@ style_inliner_test_SOURCES = style_inlin
- style_inliner_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- style_inliner_test_LDADD = libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
--	$(top_builddir)/src/kml/base/libkmlbase.la \
--	$(top_builddir)/third_party/liburiparser.la \
-+	$(top_builddir)/src/kml/base/libkmlbase.la -luriparser \
- 	$(top_builddir)/third_party/libgtest_main.la
- 
- style_merger_test_SOURCES = style_merger_test.cc
---- a/src/kml/regionator/Makefile.in
-+++ b/src/kml/regionator/Makefile.in
-@@ -299,8 +299,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
-              -I$(top_srcdir)/third_party/boost_1_34_1 \
- 	     -I$(top_srcdir)/third_party/googletest-r108/include
- 
-- at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
-- at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
-+ at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
-+ at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
- lib_LTLIBRARIES = libkmlregionator.la
- libkmlregionator_la_SOURCES = \
- 	feature_list_region_handler.cc \
---- a/src/kml/xsd/Makefile.in
-+++ b/src/kml/xsd/Makefile.in
-@@ -342,8 +342,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
-               -I$(top_srcdir)/third_party/boost_1_34_1 \
- 	      -I$(top_srcdir)/third_party/googletest-r108/include
- 
-- at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
-- at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
-+ at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
-+ at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
- lib_LTLIBRARIES = libkmlxsd.la
- libkmlxsd_la_SOURCES = \
- 	xsd_complex_type.cc \
---- a/src/swig/Makefile.in
-+++ b/src/swig/Makefile.in
-@@ -334,8 +334,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = java python
- AM_CPPFLAGS = -I$(top_srcdir)/src \
--	      -I$(top_srcdir)/third_party/boost_1_34_1 \
--	      -I$(top_srcdir)/third_party/uriparser-0.7.5/include
-+	      -I$(top_srcdir)/third_party/boost_1_34_1
- 
- COMMONLIBS = $(top_builddir)/src/kml/engine/libkmlengine.la \
-              $(top_builddir)/src/kml/dom/libkmldom.la \
---- a/third_party/Makefile.in
-+++ b/third_party/Makefile.in
-@@ -98,15 +98,6 @@ libminizip_la_OBJECTS = $(am_libminizip_
- libminizip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(libminizip_la_LDFLAGS) $(LDFLAGS) -o $@
--liburiparser_la_LIBADD =
--am_liburiparser_la_OBJECTS = UriCommon.lo UriCompare.lo UriEscape.lo \
--	UriFile.lo UriIp4.lo UriIp4Base.lo UriNormalize.lo \
--	UriNormalizeBase.lo UriParse.lo UriParseBase.lo UriQuery.lo \
--	UriRecompose.lo UriResolve.lo UriShorten.lo
--liburiparser_la_OBJECTS = $(am_liburiparser_la_OBJECTS)
--liburiparser_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(liburiparser_la_LDFLAGS) $(LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
-@@ -130,9 +121,9 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBT
- 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
- SOURCES = $(libgtest_la_SOURCES) $(libgtest_main_la_SOURCES) \
--	$(libminizip_la_SOURCES) $(liburiparser_la_SOURCES)
-+	$(libminizip_la_SOURCES)
- DIST_SOURCES = $(libgtest_la_SOURCES) $(libgtest_main_la_SOURCES) \
--	$(libminizip_la_SOURCES) $(liburiparser_la_SOURCES)
-+	$(libminizip_la_SOURCES)
- HEADERS = $(libboostconfigcompilerinclude_HEADERS) \
- 	$(libboostconfiginclude_HEADERS) \
- 	$(libboostconfigno_tr1include_HEADERS) \
-@@ -276,11 +267,10 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- uriparser = uriparser-0.7.5
- AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \
--	      -I$(top_srcdir)/third_party/$(uriparser)/include \
- 	      -I$(top_srcdir)/third_party/googletest-r108 \
- 	      -I$(top_srcdir)/third_party/googletest-r108/include
- 
--lib_LTLIBRARIES = libminizip.la liburiparser.la
-+lib_LTLIBRARIES = libminizip.la
- noinst_LTLIBRARIES = libgtest.la libgtest_main.la
- libminizip_la_SOURCES = \
- 	zlib-1.2.3/contrib/minizip/unzip.c \
-@@ -289,27 +279,6 @@ libminizip_la_SOURCES = \
- 	zlib-1.2.3/contrib/minizip/zip.c
- 
- libminizip_la_LDFLAGS = -lz
--liburiparser_la_SOURCES = \
--	$(uriparser)/lib/UriCommon.c \
--	$(uriparser)/lib/UriCommon.h \
--	$(uriparser)/lib/UriCompare.c \
--	$(uriparser)/lib/UriEscape.c \
--	$(uriparser)/lib/UriFile.c \
--	$(uriparser)/lib/UriIp4.c \
--	$(uriparser)/lib/UriIp4Base.c \
--	$(uriparser)/lib/UriIp4Base.h \
--	$(uriparser)/lib/UriNormalize.c \
--	$(uriparser)/lib/UriNormalizeBase.c \
--	$(uriparser)/lib/UriNormalizeBase.h \
--	$(uriparser)/lib/UriParse.c \
--	$(uriparser)/lib/UriParseBase.c \
--	$(uriparser)/lib/UriParseBase.h \
--	$(uriparser)/lib/UriQuery.c \
--	$(uriparser)/lib/UriRecompose.c \
--	$(uriparser)/lib/UriResolve.c \
--	$(uriparser)/lib/UriShorten.c
--
--liburiparser_la_LDFLAGS = -version-info 1:5:0
- boost_root = boost_1_34_1
- boost = $(boost_root)/boost
- boostinc = $(includedir)/kml/third_party/$(boost)
-@@ -542,8 +511,6 @@ libgtest_main.la: $(libgtest_main_la_OBJ
- 	$(CXXLINK)  $(libgtest_main_la_OBJECTS) $(libgtest_main_la_LIBADD) $(LIBS)
- libminizip.la: $(libminizip_la_OBJECTS) $(libminizip_la_DEPENDENCIES) 
- 	$(libminizip_la_LINK) -rpath $(libdir) $(libminizip_la_OBJECTS) $(libminizip_la_LIBADD) $(LIBS)
--liburiparser.la: $(liburiparser_la_OBJECTS) $(liburiparser_la_DEPENDENCIES) 
--	$(liburiparser_la_LINK) -rpath $(libdir) $(liburiparser_la_OBJECTS) $(liburiparser_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -551,20 +518,6 @@ mostlyclean-compile:
- distclean-compile:
- 	-rm -f *.tab.c
- 
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriCommon.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriCompare.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriEscape.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriFile.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriIp4.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriIp4Base.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriNormalize.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriNormalizeBase.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriParse.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriParseBase.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriQuery.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriRecompose.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriResolve.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriShorten.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtest-death-test.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtest-filepath.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtest-port.Plo at am__quote@
-@@ -626,104 +579,6 @@ zip.lo: zlib-1.2.3/contrib/minizip/zip.c
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zip.lo `test -f 'zlib-1.2.3/contrib/minizip/zip.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/zip.c
- 
--UriCommon.lo: $(uriparser)/lib/UriCommon.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriCommon.lo -MD -MP -MF $(DEPDIR)/UriCommon.Tpo -c -o UriCommon.lo `test -f '$(uriparser)/lib/UriCommon.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriCommon.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriCommon.Tpo $(DEPDIR)/UriCommon.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(uriparser)/lib/UriCommon.c' object='UriCommon.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriCommon.lo `test -f '$(uriparser)/lib/UriCommon.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriCommon.c
--
--UriCompare.lo: $(uriparser)/lib/UriCompare.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriCompare.lo -MD -MP -MF $(DEPDIR)/UriCompare.Tpo -c -o UriCompare.lo `test -f '$(uriparser)/lib/UriCompare.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriCompare.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriCompare.Tpo $(DEPDIR)/UriCompare.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(uriparser)/lib/UriCompare.c' object='UriCompare.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriCompare.lo `test -f '$(uriparser)/lib/UriCompare.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriCompare.c
--
--UriEscape.lo: $(uriparser)/lib/UriEscape.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriEscape.lo -MD -MP -MF $(DEPDIR)/UriEscape.Tpo -c -o UriEscape.lo `test -f '$(uriparser)/lib/UriEscape.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriEscape.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriEscape.Tpo $(DEPDIR)/UriEscape.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(uriparser)/lib/UriEscape.c' object='UriEscape.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriEscape.lo `test -f '$(uriparser)/lib/UriEscape.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriEscape.c
--
--UriFile.lo: $(uriparser)/lib/UriFile.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriFile.lo -MD -MP -MF $(DEPDIR)/UriFile.Tpo -c -o UriFile.lo `test -f '$(uriparser)/lib/UriFile.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriFile.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriFile.Tpo $(DEPDIR)/UriFile.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(uriparser)/lib/UriFile.c' object='UriFile.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriFile.lo `test -f '$(uriparser)/lib/UriFile.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriFile.c
--
--UriIp4.lo: $(uriparser)/lib/UriIp4.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriIp4.lo -MD -MP -MF $(DEPDIR)/UriIp4.Tpo -c -o UriIp4.lo `test -f '$(uriparser)/lib/UriIp4.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriIp4.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriIp4.Tpo $(DEPDIR)/UriIp4.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(uriparser)/lib/UriIp4.c' object='UriIp4.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriIp4.lo `test -f '$(uriparser)/lib/UriIp4.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriIp4.c
--
--UriIp4Base.lo: $(uriparser)/lib/UriIp4Base.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriIp4Base.lo -MD -MP -MF $(DEPDIR)/UriIp4Base.Tpo -c -o UriIp4Base.lo `test -f '$(uriparser)/lib/UriIp4Base.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriIp4Base.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriIp4Base.Tpo $(DEPDIR)/UriIp4Base.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(uriparser)/lib/UriIp4Base.c' object='UriIp4Base.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriIp4Base.lo `test -f '$(uriparser)/lib/UriIp4Base.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriIp4Base.c
--
--UriNormalize.lo: $(uriparser)/lib/UriNormalize.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriNormalize.lo -MD -MP -MF $(DEPDIR)/UriNormalize.Tpo -c -o UriNormalize.lo `test -f '$(uriparser)/lib/UriNormalize.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriNormalize.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriNormalize.Tpo $(DEPDIR)/UriNormalize.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(uriparser)/lib/UriNormalize.c' object='UriNormalize.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriNormalize.lo `test -f '$(uriparser)/lib/UriNormalize.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriNormalize.c
--
--UriNormalizeBase.lo: $(uriparser)/lib/UriNormalizeBase.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriNormalizeBase.lo -MD -MP -MF $(DEPDIR)/UriNormalizeBase.Tpo -c -o UriNormalizeBase.lo `test -f '$(uriparser)/lib/UriNormalizeBase.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriNormalizeBase.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriNormalizeBase.Tpo $(DEPDIR)/UriNormalizeBase.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(uriparser)/lib/UriNormalizeBase.c' object='UriNormalizeBase.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriNormalizeBase.lo `test -f '$(uriparser)/lib/UriNormalizeBase.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriNormalizeBase.c
--
--UriParse.lo: $(uriparser)/lib/UriParse.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriParse.lo -MD -MP -MF $(DEPDIR)/UriParse.Tpo -c -o UriParse.lo `test -f '$(uriparser)/lib/UriParse.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriParse.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriParse.Tpo $(DEPDIR)/UriParse.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(uriparser)/lib/UriParse.c' object='UriParse.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriParse.lo `test -f '$(uriparser)/lib/UriParse.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriParse.c
--
--UriParseBase.lo: $(uriparser)/lib/UriParseBase.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriParseBase.lo -MD -MP -MF $(DEPDIR)/UriParseBase.Tpo -c -o UriParseBase.lo `test -f '$(uriparser)/lib/UriParseBase.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriParseBase.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriParseBase.Tpo $(DEPDIR)/UriParseBase.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(uriparser)/lib/UriParseBase.c' object='UriParseBase.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriParseBase.lo `test -f '$(uriparser)/lib/UriParseBase.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriParseBase.c
--
--UriQuery.lo: $(uriparser)/lib/UriQuery.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriQuery.lo -MD -MP -MF $(DEPDIR)/UriQuery.Tpo -c -o UriQuery.lo `test -f '$(uriparser)/lib/UriQuery.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriQuery.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriQuery.Tpo $(DEPDIR)/UriQuery.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(uriparser)/lib/UriQuery.c' object='UriQuery.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriQuery.lo `test -f '$(uriparser)/lib/UriQuery.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriQuery.c
--
--UriRecompose.lo: $(uriparser)/lib/UriRecompose.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriRecompose.lo -MD -MP -MF $(DEPDIR)/UriRecompose.Tpo -c -o UriRecompose.lo `test -f '$(uriparser)/lib/UriRecompose.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriRecompose.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriRecompose.Tpo $(DEPDIR)/UriRecompose.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(uriparser)/lib/UriRecompose.c' object='UriRecompose.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriRecompose.lo `test -f '$(uriparser)/lib/UriRecompose.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriRecompose.c
--
--UriResolve.lo: $(uriparser)/lib/UriResolve.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriResolve.lo -MD -MP -MF $(DEPDIR)/UriResolve.Tpo -c -o UriResolve.lo `test -f '$(uriparser)/lib/UriResolve.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriResolve.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriResolve.Tpo $(DEPDIR)/UriResolve.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(uriparser)/lib/UriResolve.c' object='UriResolve.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriResolve.lo `test -f '$(uriparser)/lib/UriResolve.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriResolve.c
--
--UriShorten.lo: $(uriparser)/lib/UriShorten.c
-- at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriShorten.lo -MD -MP -MF $(DEPDIR)/UriShorten.Tpo -c -o UriShorten.lo `test -f '$(uriparser)/lib/UriShorten.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriShorten.c
-- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriShorten.Tpo $(DEPDIR)/UriShorten.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(uriparser)/lib/UriShorten.c' object='UriShorten.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriShorten.lo `test -f '$(uriparser)/lib/UriShorten.c' || echo '$(srcdir)/'`$(uriparser)/lib/UriShorten.c
--
- .cc.o:
- @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
diff --git a/debian/patches/series b/debian/patches/series
index 67efa04..47ef8a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 kfreebsd.diff
 hurd.diff
 automake.diff
-reautoconfiscated.diff
 clone.diff
 ld-as-needed.diff
 feature_view_test.diff
diff --git a/debian/patches/swig.diff b/debian/patches/swig.diff
index a87de13..9631f68 100644
--- a/debian/patches/swig.diff
+++ b/debian/patches/swig.diff
@@ -1,28 +1,3 @@
---- a/configure
-+++ b/configure
-@@ -15039,14 +15039,14 @@ $as_echo "no" >&6; }
- fi
- 
- 
--	if test "x$SWIG" != x; then
--		SWIG_VERSION=`swig -version 2>&1|grep Version|cut -d" " -f3`
--		if test ${SWIG_VERSION:4} -lt 35; then
--			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built." >&5
--$as_echo "$as_me: WARNING: You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built." >&2;}
--			SWIG=
--		fi
--	fi
-+#	if test "x$SWIG" != x; then
-+#		SWIG_VERSION=`swig -version 2>&1|grep Version|cut -d" " -f3`
-+#		if test ${SWIG_VERSION:4} -lt 35; then
-+#			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built." >&5
-+#$as_echo "$as_me: WARNING: You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built." >&2;}
-+#			SWIG=
-+#		fi
-+#	fi
- fi
-  if test "x$SWIG" != x; then
-   WITH_SWIG_TRUE=
 --- a/configure.ac
 +++ b/configure.ac
 @@ -86,13 +86,13 @@ AC_ARG_ENABLE(swig,
diff --git a/debian/rules b/debian/rules
index 5278bf3..94242dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ DEB_CONFIGURE_EXTRA_FLAGS = --enable-systempython --with-java-include-dir=$(JAVA
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
-	dh $@ --with python2
+	dh $@ --with autoreconf,python2
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS)

-- 
A library to manipulate KML 2.2 OGC standard files

More information about the Pkg-grass-devel mailing list