[DebianGIS-dev] r2901 - in packages/libkml/trunk/debian: . patches
frankie at alioth.debian.org
frankie at alioth.debian.org
Fri Jun 25 09:49:42 UTC 2010
Author: frankie
Date: 2010-06-25 09:49:41 +0000 (Fri, 25 Jun 2010)
New Revision: 2901
Modified:
packages/libkml/trunk/debian/changelog
packages/libkml/trunk/debian/control
packages/libkml/trunk/debian/patches/automake.diff
packages/libkml/trunk/debian/patches/reautoconfiscated.diff
Log:
New upstream release.
Modified: packages/libkml/trunk/debian/changelog
===================================================================
--- packages/libkml/trunk/debian/changelog 2010-06-12 16:28:43 UTC (rev 2900)
+++ packages/libkml/trunk/debian/changelog 2010-06-25 09:49:41 UTC (rev 2901)
@@ -1,3 +1,11 @@
+libkml (1.2.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated automake.diff and reautoconfiscated patches to reflect changes
+ in building scripts. Note that boost is still embedded with old version 1.34.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Fri, 25 Jun 2010 11:42:15 +0200
+
libkml (1.1.0-1) unstable; urgency=low
* New upstream release:
Modified: packages/libkml/trunk/debian/control
===================================================================
--- packages/libkml/trunk/debian/control 2010-06-12 16:28:43 UTC (rev 2900)
+++ packages/libkml/trunk/debian/control 2010-06-25 09:49:41 UTC (rev 2901)
@@ -6,8 +6,8 @@
Build-Depends: cdbs, debhelper (>= 7), autotools-dev, libexpat1-dev, zlib1g-dev, default-jdk,
python-dev, python-all-dev, quilt, liburiparser-dev (>= 0.7.1), chrpath,
libcurl4-openssl-dev, swig, python-central
-XS-Python-Version: >= 2.4
-Standards-Version: 3.8.3
+XS-Python-Version: >= 2.5
+Standards-Version: 3.8.4
Homepage: http://code.google.com/p/libkml/
Vcs-Svn: svn://svn.debian.org/pkg-grass/packages/libkml/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/libkml/
Modified: packages/libkml/trunk/debian/patches/automake.diff
===================================================================
--- packages/libkml/trunk/debian/patches/automake.diff 2010-06-12 16:28:43 UTC (rev 2900)
+++ packages/libkml/trunk/debian/patches/automake.diff 2010-06-25 09:49:41 UTC (rev 2901)
@@ -1,7 +1,7 @@
-Index: libkml-1.1.0/examples/engine/Makefile.am
+Index: libkml-1.2.0/examples/engine/Makefile.am
===================================================================
---- libkml-1.1.0.orig/examples/engine/Makefile.am 2009-07-23 21:06:17.000000000 +0200
-+++ libkml-1.1.0/examples/engine/Makefile.am 2009-12-10 13:01:41.000000000 +0100
+--- libkml-1.2.0.orig/examples/engine/Makefile.am 2010-02-18 21:07:02.000000000 +0100
++++ libkml-1.2.0/examples/engine/Makefile.am 2010-06-25 11:30:17.000000000 +0200
@@ -2,7 +2,7 @@
-I$(top_srcdir)/third_party/boost_1_34_1
@@ -11,10 +11,10 @@
endif
noinst_PROGRAMS = \
-Index: libkml-1.1.0/examples/gpx/Makefile.am
+Index: libkml-1.2.0/examples/gpx/Makefile.am
===================================================================
---- libkml-1.1.0.orig/examples/gpx/Makefile.am 2009-07-23 21:06:17.000000000 +0200
-+++ libkml-1.1.0/examples/gpx/Makefile.am 2009-12-10 13:01:41.000000000 +0100
+--- libkml-1.2.0.orig/examples/gpx/Makefile.am 2009-07-23 21:06:17.000000000 +0200
++++ libkml-1.2.0/examples/gpx/Makefile.am 2010-06-25 11:30:17.000000000 +0200
@@ -2,7 +2,7 @@
-I$(top_srcdir)/third_party/boost_1_34_1
@@ -24,10 +24,10 @@
endif
noinst_PROGRAMS = gpxtracktokml
-Index: libkml-1.1.0/examples/gx/Makefile.am
+Index: libkml-1.2.0/examples/gx/Makefile.am
===================================================================
---- libkml-1.1.0.orig/examples/gx/Makefile.am 2009-07-23 21:06:19.000000000 +0200
-+++ libkml-1.1.0/examples/gx/Makefile.am 2009-12-10 13:01:41.000000000 +0100
+--- libkml-1.2.0.orig/examples/gx/Makefile.am 2009-07-23 21:06:19.000000000 +0200
++++ libkml-1.2.0/examples/gx/Makefile.am 2010-06-25 11:30:17.000000000 +0200
@@ -2,7 +2,7 @@
-I$(top_srcdir)/third_party/boost_1_34_1
@@ -37,10 +37,10 @@
endif
noinst_PROGRAMS = \
-Index: libkml-1.1.0/examples/hellonet/Makefile.am
+Index: libkml-1.2.0/examples/hellonet/Makefile.am
===================================================================
---- libkml-1.1.0.orig/examples/hellonet/Makefile.am 2009-10-26 22:45:45.000000000 +0100
-+++ libkml-1.1.0/examples/hellonet/Makefile.am 2009-12-10 13:01:41.000000000 +0100
+--- libkml-1.2.0.orig/examples/hellonet/Makefile.am 2010-02-18 21:07:02.000000000 +0100
++++ libkml-1.2.0/examples/hellonet/Makefile.am 2010-06-25 11:30:17.000000000 +0200
@@ -4,7 +4,7 @@
-I$(top_srcdir)/third_party/boost_1_34_1
@@ -49,11 +49,11 @@
+AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
endif
- noinst_PROGRAMS = getgmapkml kmlwalk kmzfetch listfeed listgmaps resolvestyle \
-Index: libkml-1.1.0/examples/helloworld/Makefile.am
+ noinst_PROGRAMS = csvurl2gmap getgmapkml getgsheetcsv getgsheetkml \
+Index: libkml-1.2.0/examples/helloworld/Makefile.am
===================================================================
---- libkml-1.1.0.orig/examples/helloworld/Makefile.am 2009-07-23 21:06:19.000000000 +0200
-+++ libkml-1.1.0/examples/helloworld/Makefile.am 2009-12-10 13:01:41.000000000 +0100
+--- libkml-1.2.0.orig/examples/helloworld/Makefile.am 2009-07-23 21:06:19.000000000 +0200
++++ libkml-1.2.0/examples/helloworld/Makefile.am 2010-06-25 11:30:17.000000000 +0200
@@ -4,7 +4,7 @@
@@ -63,10 +63,10 @@
endif
noinst_LTLIBRARIES = libhelloutil.la
-Index: libkml-1.1.0/examples/regionator/Makefile.am
+Index: libkml-1.2.0/examples/regionator/Makefile.am
===================================================================
---- libkml-1.1.0.orig/examples/regionator/Makefile.am 2009-07-23 21:06:18.000000000 +0200
-+++ libkml-1.1.0/examples/regionator/Makefile.am 2009-12-10 13:01:41.000000000 +0100
+--- libkml-1.2.0.orig/examples/regionator/Makefile.am 2009-07-23 21:06:18.000000000 +0200
++++ libkml-1.2.0/examples/regionator/Makefile.am 2010-06-25 11:30:17.000000000 +0200
@@ -3,7 +3,7 @@
-I$(top_srcdir)/third_party/zlib-1.2.3/contrib
@@ -76,10 +76,10 @@
endif
noinst_PROGRAMS = csvregionator
-Index: libkml-1.1.0/examples/xsd/Makefile.am
+Index: libkml-1.2.0/examples/xsd/Makefile.am
===================================================================
---- libkml-1.1.0.orig/examples/xsd/Makefile.am 2009-07-23 21:06:16.000000000 +0200
-+++ libkml-1.1.0/examples/xsd/Makefile.am 2009-12-10 13:01:41.000000000 +0100
+--- libkml-1.2.0.orig/examples/xsd/Makefile.am 2009-07-23 21:06:16.000000000 +0200
++++ libkml-1.2.0/examples/xsd/Makefile.am 2010-06-25 11:30:17.000000000 +0200
@@ -3,7 +3,7 @@
-I$(top_srcdir)/third_party/boost_1_34_1
@@ -89,15 +89,15 @@
endif
noinst_PROGRAMS = xsdchildren xsdcoverage xsdelements xsdenums xsdfind xsdtypes
-Index: libkml-1.1.0/src/kml/base/Makefile.am
+Index: libkml-1.2.0/src/kml/base/Makefile.am
===================================================================
---- libkml-1.1.0.orig/src/kml/base/Makefile.am 2009-10-26 22:45:29.000000000 +0100
-+++ libkml-1.1.0/src/kml/base/Makefile.am 2009-12-10 13:04:07.000000000 +0100
+--- libkml-1.2.0.orig/src/kml/base/Makefile.am 2010-01-14 01:16:30.000000000 +0100
++++ libkml-1.2.0/src/kml/base/Makefile.am 2010-06-25 11:32:49.000000000 +0200
@@ -1,15 +1,14 @@
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.1/include \
+- -I$(top_srcdir)/third_party/uriparser-0.7.5/include \
-I$(top_srcdir)/third_party/zlib-1.2.3/contrib
if GCC
@@ -122,7 +122,7 @@
# These header files will be installed in $(includedir)/kml/base
libkmlbaseincludedir = $(includedir)/kml/base
-@@ -130,8 +128,7 @@
+@@ -137,8 +135,7 @@
net_cache_test_SOURCES = net_cache_test.cc
net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
@@ -132,7 +132,7 @@
$(top_builddir)/third_party/libgtest.la
referent_test_SOURCES = referent_test.cc
-@@ -156,8 +153,7 @@
+@@ -163,8 +160,7 @@
uri_parser_test_SOURCES = uri_parser_test.cc
uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
@@ -142,10 +142,10 @@
$(top_builddir)/third_party/libgtest.la
util_test_SOURCES = util_test.cc
-Index: libkml-1.1.0/src/kml/convenience/Makefile.am
+Index: libkml-1.2.0/src/kml/convenience/Makefile.am
===================================================================
---- libkml-1.1.0.orig/src/kml/convenience/Makefile.am 2009-10-27 00:19:04.000000000 +0100
-+++ libkml-1.1.0/src/kml/convenience/Makefile.am 2009-12-10 13:01:41.000000000 +0100
+--- libkml-1.2.0.orig/src/kml/convenience/Makefile.am 2010-01-14 01:16:31.000000000 +0100
++++ libkml-1.2.0/src/kml/convenience/Makefile.am 2010-06-25 11:30:17.000000000 +0200
@@ -3,8 +3,8 @@
-I$(top_srcdir)/third_party/googletest-r108/include
@@ -156,11 +156,11 @@
+AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
endif
- EXTRA_DIST = \
-Index: libkml-1.1.0/src/kml/dom/Makefile.am
+ # These header files are added to the distribution such that it can be built,
+Index: libkml-1.2.0/src/kml/dom/Makefile.am
===================================================================
---- libkml-1.1.0.orig/src/kml/dom/Makefile.am 2009-07-23 21:05:40.000000000 +0200
-+++ libkml-1.1.0/src/kml/dom/Makefile.am 2009-12-10 13:01:41.000000000 +0100
+--- libkml-1.2.0.orig/src/kml/dom/Makefile.am 2010-01-14 01:16:22.000000000 +0100
++++ libkml-1.2.0/src/kml/dom/Makefile.am 2010-06-25 11:30:17.000000000 +0200
@@ -3,8 +3,8 @@
-I$(top_srcdir)/third_party/googletest-r108/include
@@ -172,10 +172,10 @@
endif
lib_LTLIBRARIES = libkmldom.la
-Index: libkml-1.1.0/src/kml/engine/Makefile.am
+Index: libkml-1.2.0/src/kml/engine/Makefile.am
===================================================================
---- libkml-1.1.0.orig/src/kml/engine/Makefile.am 2009-10-26 22:45:29.000000000 +0100
-+++ libkml-1.1.0/src/kml/engine/Makefile.am 2009-12-10 13:01:41.000000000 +0100
+--- libkml-1.2.0.orig/src/kml/engine/Makefile.am 2009-10-26 22:45:29.000000000 +0100
++++ libkml-1.2.0/src/kml/engine/Makefile.am 2010-06-25 11:30:17.000000000 +0200
@@ -3,8 +3,8 @@
-I$(top_srcdir)/third_party/googletest-r108/include
@@ -199,10 +199,10 @@
$(top_builddir)/third_party/libgtest.la
style_merger_test_SOURCES = style_merger_test.cc
-Index: libkml-1.1.0/src/kml/regionator/Makefile.am
+Index: libkml-1.2.0/src/kml/regionator/Makefile.am
===================================================================
---- libkml-1.1.0.orig/src/kml/regionator/Makefile.am 2009-07-23 21:05:44.000000000 +0200
-+++ libkml-1.1.0/src/kml/regionator/Makefile.am 2009-12-10 13:01:41.000000000 +0100
+--- libkml-1.2.0.orig/src/kml/regionator/Makefile.am 2010-02-18 21:07:00.000000000 +0100
++++ libkml-1.2.0/src/kml/regionator/Makefile.am 2010-06-25 11:30:17.000000000 +0200
@@ -4,8 +4,8 @@
@@ -214,10 +214,10 @@
endif
lib_LTLIBRARIES = libkmlregionator.la
-Index: libkml-1.1.0/src/kml/xsd/Makefile.am
+Index: libkml-1.2.0/src/kml/xsd/Makefile.am
===================================================================
---- libkml-1.1.0.orig/src/kml/xsd/Makefile.am 2009-07-23 21:05:48.000000000 +0200
-+++ libkml-1.1.0/src/kml/xsd/Makefile.am 2009-12-10 13:01:41.000000000 +0100
+--- libkml-1.2.0.orig/src/kml/xsd/Makefile.am 2009-07-23 21:05:48.000000000 +0200
++++ libkml-1.2.0/src/kml/xsd/Makefile.am 2010-06-25 11:30:17.000000000 +0200
@@ -3,8 +3,8 @@
-I$(top_srcdir)/third_party/googletest-r108/include
@@ -229,68 +229,60 @@
endif
lib_LTLIBRARIES = libkmlxsd.la
-Index: libkml-1.1.0/src/swig/Makefile.am
+Index: libkml-1.2.0/src/swig/Makefile.am
===================================================================
---- libkml-1.1.0.orig/src/swig/Makefile.am 2009-07-23 21:05:49.000000000 +0200
-+++ libkml-1.1.0/src/swig/Makefile.am 2009-12-10 13:01:41.000000000 +0100
+--- libkml-1.2.0.orig/src/swig/Makefile.am 2010-01-14 01:16:31.000000000 +0100
++++ libkml-1.2.0/src/swig/Makefile.am 2010-06-25 11:34:46.000000000 +0200
@@ -1,8 +1,7 @@
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.1/include
+- -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 \
-Index: libkml-1.1.0/third_party/Makefile.am
+Index: libkml-1.2.0/third_party/Makefile.am
===================================================================
---- libkml-1.1.0.orig/third_party/Makefile.am 2009-10-26 22:45:30.000000000 +0100
-+++ libkml-1.1.0/third_party/Makefile.am 2009-12-10 13:01:41.000000000 +0100
-@@ -1,9 +1,8 @@
+--- libkml-1.2.0.orig/third_party/Makefile.am 2010-02-18 21:07:01.000000000 +0100
++++ libkml-1.2.0/third_party/Makefile.am 2010-06-25 11:34:10.000000000 +0200
+@@ -1,11 +1,10 @@
+ uriparser = uriparser-0.7.5
+
AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \
-- -I$(top_srcdir)/third_party/uriparser-0.7.1/include \
+- -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
++lib_LTLIBRARIES = libminizip.la
noinst_LTLIBRARIES = libgtest.la
libminizip_la_SOURCES = \
-@@ -13,37 +12,6 @@
+@@ -15,27 +14,6 @@
zlib-1.2.3/contrib/minizip/zip.c
libminizip_la_LDFLAGS = -lz
-liburiparser_la_SOURCES = \
-- uriparser-0.7.1/lib/UriCommon.c \
-- uriparser-0.7.1/lib/UriCommon.h \
-- uriparser-0.7.1/lib/UriCompare.c \
-- uriparser-0.7.1/lib/UriEscape.c \
-- uriparser-0.7.1/lib/UriFile.c \
-- uriparser-0.7.1/lib/UriIp4.c \
-- uriparser-0.7.1/lib/UriIp4Base.c \
-- uriparser-0.7.1/lib/UriIp4Base.h \
-- uriparser-0.7.1/lib/UriNormalize.c \
-- uriparser-0.7.1/lib/UriNormalizeBase.c \
-- uriparser-0.7.1/lib/UriNormalizeBase.h \
-- uriparser-0.7.1/lib/UriParse.c \
-- uriparser-0.7.1/lib/UriParseBase.c \
-- uriparser-0.7.1/lib/UriParseBase.h \
-- uriparser-0.7.1/lib/UriQuery.c \
-- uriparser-0.7.1/lib/UriRecompose.c \
-- uriparser-0.7.1/lib/UriResolve.c \
-- uriparser-0.7.1/lib/UriShorten.c
--uriparser = uriparser-0.7.1
--uriparserinc = $(includedir)/kml/third_party/$(uriparser)/include
--liburiparserincludedir = $(uriparserinc)
--liburiparserinclude_HEADERS = \
-- $(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
+- $(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
Modified: packages/libkml/trunk/debian/patches/reautoconfiscated.diff
===================================================================
--- packages/libkml/trunk/debian/patches/reautoconfiscated.diff 2010-06-12 16:28:43 UTC (rev 2900)
+++ packages/libkml/trunk/debian/patches/reautoconfiscated.diff 2010-06-25 09:49:41 UTC (rev 2901)
@@ -1,10 +1,9 @@
-Index: libkml-1.1.0/aclocal.m4
-===================================================================
---- libkml-1.1.0.orig/aclocal.m4 2009-12-10 13:05:41.000000000 +0100
-+++ libkml-1.1.0/aclocal.m4 2009-12-10 17:29:30.000000000 +0100
+diff -urN libkml-1.2.0/aclocal.m4 libkml-1.2.0-new/aclocal.m4
+--- libkml-1.2.0/aclocal.m4 2010-01-14 01:17:27.000000000 +0100
++++ libkml-1.2.0-new/aclocal.m4 2010-06-25 11:39:50.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -32,7 +31,7 @@
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.2], [],
-+m4_if([$1], [1.11], [],
++m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -41,7 +40,7 @@
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.2])dnl
-+[AM_AUTOMAKE_VERSION([1.11])dnl
++[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -437,697 +436,9 @@
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-Index: libkml-1.1.0/config/config.guess
-===================================================================
---- libkml-1.1.0.orig/config/config.guess 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/config/config.guess 2009-12-10 17:29:34.000000000 +0100
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- # Free Software Foundation, Inc.
-
--timestamp='2008-01-23'
-+timestamp='2009-06-10'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -170,7 +170,7 @@
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-- | grep __ELF__ >/dev/null
-+ | grep -q __ELF__
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
-@@ -324,6 +324,9 @@
- case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7; exit ;;
- esac ;;
-+ s390x:SunOS:*:*)
-+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit ;;
- sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
-@@ -331,7 +334,20 @@
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ eval $set_cc_for_build
-+ SUN_ARCH="i386"
-+ # If there is a compiler, see if it is configured for 64-bit objects.
-+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+ # This test works for both compilers.
-+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+ grep IS_64BIT_ARCH >/dev/null
-+ then
-+ SUN_ARCH="x86_64"
-+ fi
-+ fi
-+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
-@@ -640,7 +656,7 @@
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-- grep __LP64__ >/dev/null
-+ grep -q __LP64__
- then
- HP_ARCH="hppa2.0w"
- else
-@@ -796,7 +812,7 @@
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
-- EM64T | authenticamd)
-+ EM64T | authenticamd | genuineintel)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- IA64)
-@@ -806,6 +822,9 @@
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-+ 8664:Windows_NT:*)
-+ echo x86_64-pc-mks
-+ exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -866,40 +885,17 @@
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- mips:Linux:*:*)
-+ mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
-- #undef mips
-- #undef mipsel
-+ #undef ${UNAME_MACHINE}
-+ #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mipsel
-+ CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips
-- #else
-- CPU=
-- #endif
-- #endif
--EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-- /^CPU/{
-- s: ::g
-- p
-- }'`"
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-- ;;
-- mips64:Linux:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #undef CPU
-- #undef mips64
-- #undef mips64el
-- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mips64el
-- #else
-- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips64
-+ CPU=${UNAME_MACHINE}
- #else
- CPU=
- #endif
-@@ -931,10 +927,13 @@
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
-- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
-+ padre:Linux:*:*)
-+ echo sparc-unknown-linux-gnu
-+ exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -982,17 +981,6 @@
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
-- a.out-i386-linux)
-- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-- exit ;;
-- coff-i386)
-- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-- exit ;;
-- "")
-- # Either a pre-BFD a.out linker (linux-gnuoldld) or
-- # one that does not give us useful --help.
-- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-- exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
-@@ -1058,7 +1046,7 @@
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
-- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- i*86:*DOS:*:*)
-@@ -1102,8 +1090,11 @@
- pc:*:*:*)
- # Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
-- # the processor, so we play safe by assuming i386.
-- echo i386-pc-msdosdjgpp
-+ # the processor, so we play safe by assuming i586.
-+ # Note: whatever this is, it MUST be the same as what config.sub
-+ # prints for the "djgpp" host, or else GDB configury will decide that
-+ # this is a cross-build.
-+ echo i586-pc-msdosdjgpp
- exit ;;
- Intel:Mach:3*:*)
- echo i386-pc-mach3
-@@ -1141,6 +1132,16 @@
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
-+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+ OS_REL='.3'
-+ test -r /etc/.relid \
-+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-@@ -1153,7 +1154,7 @@
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- SM[BE]S:UNIX_SV:*:*)
-@@ -1216,6 +1217,9 @@
- BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
- echo i586-pc-beos
- exit ;;
-+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
-+ echo i586-pc-haiku
-+ exit ;;
- SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
- exit ;;
-@@ -1324,6 +1328,9 @@
- i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
- exit ;;
-+ i*86:AROS:*:*)
-+ echo ${UNAME_MACHINE}-pc-aros
-+ exit ;;
- esac
-
- #echo '(No uname command or uname output not recognized.)' 1>&2
-Index: libkml-1.1.0/config/config.sub
-===================================================================
---- libkml-1.1.0.orig/config/config.sub 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/config/config.sub 2009-12-10 17:29:34.000000000 +0100
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- # Free Software Foundation, Inc.
-
--timestamp='2008-01-16'
-+timestamp='2009-06-11'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -122,6 +122,7 @@
- case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+ kopensolaris*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-@@ -152,6 +153,9 @@
- os=
- basic_machine=$1
- ;;
-+ -bluegene*)
-+ os=-cnk
-+ ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
-@@ -249,13 +253,16 @@
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-+ | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
-- | maxq | mb | microblaze | mcore | mep \
-+ | maxq | mb | microblaze | mcore | mep | metag \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-- | mips64vr | mips64vrel \
-+ | mips64octeon | mips64octeonel \
- | mips64orion | mips64orionel \
-+ | mips64r5900 | mips64r5900el \
-+ | mips64vr | mips64vrel \
- | mips64vr4100 | mips64vr4100el \
- | mips64vr4300 | mips64vr4300el \
- | mips64vr5000 | mips64vr5000el \
-@@ -268,6 +275,7 @@
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
-+ | moxie \
- | mt \
- | msp430 \
- | nios | nios2 \
-@@ -277,7 +285,7 @@
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- | pyramid \
- | score \
-- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-@@ -286,7 +294,7 @@
- | v850 | v850e \
- | we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-- | z8k)
-+ | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
- m6811 | m68hc11 | m6812 | m68hc12)
-@@ -329,14 +337,17 @@
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-+ | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-- | m88110-* | m88k-* | maxq-* | mcore-* \
-+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
-- | mips64vr-* | mips64vrel-* \
-+ | mips64octeon-* | mips64octeonel-* \
- | mips64orion-* | mips64orionel-* \
-+ | mips64r5900-* | mips64r5900el-* \
-+ | mips64vr-* | mips64vrel-* \
- | mips64vr4100-* | mips64vr4100el-* \
- | mips64vr4300-* | mips64vr4300el-* \
- | mips64vr5000-* | mips64vr5000el-* \
-@@ -358,20 +369,20 @@
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- | pyramid-* \
- | romp-* | rs6000-* \
-- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
-- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
- | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa*-* \
- | ymp-* \
-- | z8k-*)
-+ | z8k-* | z80-*)
- ;;
- # Recognize the basic CPU types without company name, with glob match.
- xtensa*)
-@@ -439,6 +450,10 @@
- basic_machine=m68k-apollo
- os=-bsd
- ;;
-+ aros)
-+ basic_machine=i386-pc
-+ os=-aros
-+ ;;
- aux)
- basic_machine=m68k-apple
- os=-aux
-@@ -455,10 +470,18 @@
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
-+ bluegene*)
-+ basic_machine=powerpc-ibm
-+ os=-cnk
-+ ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
- ;;
-+ cegcc)
-+ basic_machine=arm-unknown
-+ os=-cegcc
-+ ;;
- convex-c1)
- basic_machine=c1-convex
- os=-bsd
-@@ -526,6 +549,10 @@
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
-+ dicos)
-+ basic_machine=i686-pc
-+ os=-dicos
-+ ;;
- djgpp)
- basic_machine=i586-pc
- os=-msdosdjgpp
-@@ -1128,6 +1155,10 @@
- basic_machine=z8k-unknown
- os=-sim
- ;;
-+ z80-*-coff)
-+ basic_machine=z80-unknown
-+ os=-sim
-+ ;;
- none)
- basic_machine=none-none
- os=-none
-@@ -1166,7 +1197,7 @@
- we32k)
- basic_machine=we32k-att
- ;;
-- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-@@ -1236,10 +1267,11 @@
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+ | -kopensolaris* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-- | -aos* \
-+ | -aos* | -aros* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-@@ -1248,7 +1280,7 @@
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-- | -chorusos* | -chorusrdb* \
-+ | -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
-@@ -1388,6 +1420,9 @@
- -zvmoe)
- os=-zvmoe
- ;;
-+ -dicos*)
-+ os=-dicos
-+ ;;
- -none)
- ;;
- *)
-@@ -1585,7 +1620,7 @@
- -sunos*)
- vendor=sun
- ;;
-- -aix*)
-+ -cnk*|-aix*)
- vendor=ibm
- ;;
- -beos*)
-Index: libkml-1.1.0/config/depcomp
-===================================================================
---- libkml-1.1.0.orig/config/depcomp 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/config/depcomp 2009-12-10 17:29:39.000000000 +0100
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # depcomp - compile a program generating dependencies as side-effects
-
--scriptversion=2007-03-29.01
-+scriptversion=2009-04-28.21; # UTC
-
--# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
--# Foundation, Inc.
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-+# Software Foundation, Inc.
-
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -17,9 +17,7 @@
- # GNU General Public License for more details.
-
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -87,6 +85,15 @@
- depmode=dashmstdout
- fi
-
-+cygpath_u="cygpath -u -f -"
-+if test "$depmode" = msvcmsys; then
-+ # This is just like msvisualcpp but w/o cygpath translation.
-+ # Just convert the backslash-escaped backslashes to single forward
-+ # slashes to satisfy depend.m4
-+ cygpath_u="sed s,\\\\\\\\,/,g"
-+ depmode=msvisualcpp
-+fi
-+
- case "$depmode" in
- gcc3)
- ## gcc 3 implements dependency tracking that does exactly what
-@@ -192,14 +199,14 @@
- ' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
--' ' ' >> $depfile
-- echo >> $depfile
-+' ' ' >> "$depfile"
-+ echo >> "$depfile"
-
- # The second pass generates a dummy entry for each header file.
- tr ' ' '
- ' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-- >> $depfile
-+ >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
-@@ -328,7 +335,12 @@
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add `dependent.h:' lines.
-- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
-+ sed -ne '2,${
-+ s/^ *//
-+ s/ \\*$//
-+ s/$/:/
-+ p
-+ }' "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
-@@ -404,7 +416,7 @@
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
-- while test $1 != '--mode=compile'; do
-+ while test "X$1" != 'X--mode=compile'; do
- shift
- done
- shift
-@@ -455,32 +467,39 @@
- "$@" || exit $?
- # Remove any Libtool call
- if test "$libtool" = yes; then
-- while test $1 != '--mode=compile'; do
-+ while test "X$1" != 'X--mode=compile'; do
- shift
- done
- shift
- fi
- # X makedepend
- shift
-- cleared=no
-- for arg in "$@"; do
-+ cleared=no eat=no
-+ for arg
-+ do
- case $cleared in
- no)
- set ""; shift
- cleared=yes ;;
- esac
-+ if test $eat = yes; then
-+ eat=no
-+ continue
-+ fi
- case "$arg" in
- -D*|-I*)
- set fnord "$@" "$arg"; shift ;;
- # Strip any option that makedepend may not understand. Remove
- # the object too, otherwise makedepend will parse it as a source file.
-+ -arch)
-+ eat=yes ;;
- -*|$object)
- ;;
- *)
- set fnord "$@" "$arg"; shift ;;
- esac
- done
-- obj_suffix="`echo $object | sed 's/^.*\././'`"
-+ obj_suffix=`echo "$object" | sed 's/^.*\././'`
- touch "$tmpdepfile"
- ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
- rm -f "$depfile"
-@@ -500,7 +519,7 @@
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
-- while test $1 != '--mode=compile'; do
-+ while test "X$1" != 'X--mode=compile'; do
- shift
- done
- shift
-@@ -538,13 +557,27 @@
-
- msvisualcpp)
- # Important note: in order to support this mode, a compiler *must*
-- # always write the preprocessed file to stdout, regardless of -o,
-- # because we must use -o when running libtool.
-+ # always write the preprocessed file to stdout.
- "$@" || exit $?
-+
-+ # Remove the call to Libtool.
-+ if test "$libtool" = yes; then
-+ while test "X$1" != 'X--mode=compile'; do
-+ shift
-+ done
-+ shift
-+ fi
-+
- IFS=" "
- for arg
- do
- case "$arg" in
-+ -o)
-+ shift
-+ ;;
-+ $object)
-+ shift
-+ ;;
- "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
- set fnord "$@"
- shift
-@@ -557,16 +590,23 @@
- ;;
- esac
- done
-- "$@" -E |
-- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-+ "$@" -E 2>/dev/null |
-+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
-- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
-+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
- echo " " >> "$depfile"
-- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-+msvcmsys)
-+ # This case exists only to let depend.m4 do its work. It works by
-+ # looking at the text of this script. This case will never be run,
-+ # since it is checked for above.
-+ exit 1
-+ ;;
-+
- none)
- exec "$@"
- ;;
-@@ -585,5 +625,6 @@
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
- # time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-end: "$"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
- # End:
-Index: libkml-1.1.0/config/install-sh
-===================================================================
---- libkml-1.1.0.orig/config/install-sh 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/config/install-sh 2009-12-10 17:29:34.000000000 +0100
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # install - install a program, script, or datafile
-
--scriptversion=2006-12-25.00
-+scriptversion=2009-04-28.21; # UTC
-
- # This originates from X11R5 (mit/util/scripts/install.sh), which was
- # later released in X11R6 (xc/config/util/install.sh) with the
-@@ -515,5 +515,6 @@
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
- # time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-end: "$"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
- # End:
-Index: libkml-1.1.0/config/ltmain.sh
-===================================================================
---- libkml-1.1.0.orig/config/ltmain.sh 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/config/ltmain.sh 2009-12-10 17:29:25.000000000 +0100
+diff -urN libkml-1.2.0/config/ltmain.sh libkml-1.2.0-new/config/ltmain.sh
+--- libkml-1.2.0/config/ltmain.sh 2009-07-23 22:57:17.000000000 +0200
++++ libkml-1.2.0-new/config/ltmain.sh 2010-06-25 11:39:47.000000000 +0200
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
@@ -1195,169 +506,9 @@
case $deplib in
-L*) path="$deplib" ;;
*.la)
-Index: libkml-1.1.0/config/missing
-===================================================================
---- libkml-1.1.0.orig/config/missing 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/config/missing 2009-12-10 17:29:34.000000000 +0100
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
-
--scriptversion=2006-05-10.23
-+scriptversion=2009-04-28.21; # UTC
-
--# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-+# 2008, 2009 Free Software Foundation, Inc.
- # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
-
- # This program is free software; you can redistribute it and/or modify
-@@ -18,9 +18,7 @@
- # GNU General Public License for more details.
-
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -89,6 +87,9 @@
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-
-+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-+\`g' are ignored when checking the name.
-+
- Send bug reports to <bug-automake at gnu.org>."
- exit $?
- ;;
-@@ -106,15 +107,22 @@
-
- esac
-
-+# normalize program name to check for.
-+program=`echo "$1" | sed '
-+ s/^gnu-//; t
-+ s/^gnu//; t
-+ s/^g//; t'`
-+
- # Now exit if we have it, but it failed. Also exit now if we
- # don't have it and --version was passed (most likely to detect
--# the program).
-+# the program). This is about non-GNU programs, so use $1 not
-+# $program.
- case $1 in
-- lex|yacc)
-+ lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
-- tar)
-+ tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
-@@ -138,7 +146,7 @@
-
- # If it does not exist, or fails to run (possibly an outdated version),
- # try to emulate it.
--case $1 in
-+case $program in
- aclocal*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
-@@ -148,7 +156,7 @@
- touch aclocal.m4
- ;;
-
-- autoconf)
-+ autoconf*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
-@@ -157,7 +165,7 @@
- touch configure
- ;;
-
-- autoheader)
-+ autoheader*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
-@@ -187,7 +195,7 @@
- while read f; do touch "$f"; done
- ;;
-
-- autom4te)
-+ autom4te*)
- echo 1>&2 "\
- WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
-@@ -210,7 +218,7 @@
- fi
- ;;
-
-- bison|yacc)
-+ bison*|yacc*)
- echo 1>&2 "\
- WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
-@@ -240,7 +248,7 @@
- fi
- ;;
-
-- lex|flex)
-+ lex*|flex*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
-@@ -263,7 +271,7 @@
- fi
- ;;
-
-- help2man)
-+ help2man*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
-@@ -277,11 +285,11 @@
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
-- exit 1
-+ exit $?
- fi
- ;;
-
-- makeinfo)
-+ makeinfo*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
-@@ -310,7 +318,7 @@
- touch $file
- ;;
-
-- tar)
-+ tar*)
- shift
-
- # We have already tried tar in the generic part.
-@@ -363,5 +371,6 @@
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
- # time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-end: "$"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
- # End:
-Index: libkml-1.1.0/config.h.in
-===================================================================
---- libkml-1.1.0.orig/config.h.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/config.h.in 2009-12-10 17:29:33.000000000 +0100
+diff -urN libkml-1.2.0/config.h.in libkml-1.2.0-new/config.h.in
+--- libkml-1.2.0/config.h.in 2010-01-14 01:17:49.000000000 +0100
++++ libkml-1.2.0-new/config.h.in 2010-06-25 11:39:52.000000000 +0200
@@ -80,6 +80,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -1368,15 +519,123 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-Index: libkml-1.1.0/configure
-===================================================================
---- libkml-1.1.0.orig/configure 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/configure 2009-12-10 17:29:31.000000000 +0100
+diff -urN libkml-1.2.0/config.h.in~ libkml-1.2.0-new/config.h.in~
+--- libkml-1.2.0/config.h.in~ 1970-01-01 01:00:00.000000000 +0100
++++ libkml-1.2.0-new/config.h.in~ 2010-01-14 01:17:49.000000000 +0100
+@@ -0,0 +1,105 @@
++/* config.h.in. Generated from configure.ac by autoheader. */
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#undef HAVE_DLFCN_H
++
++/* Define to 1 if you have the <expat.h> header file. */
++#undef HAVE_EXPAT_H
++
++/* Define to 1 if you have the <float.h> header file. */
++#undef HAVE_FLOAT_H
++
++/* Define to 1 if you have the `floor' function. */
++#undef HAVE_FLOOR
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#undef HAVE_INTTYPES_H
++
++/* Define to 1 if you have the `expat' library (-lexpat). */
++#undef HAVE_LIBEXPAT
++
++/* Define to 1 if you have the <limits.h> header file. */
++#undef HAVE_LIMITS_H
++
++/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
++ to 0 otherwise. */
++#undef HAVE_MALLOC
++
++/* Define to 1 if you have the <memory.h> header file. */
++#undef HAVE_MEMORY_H
++
++/* Define to 1 if you have the `memset' function. */
++#undef HAVE_MEMSET
++
++/* Define to 1 if stdbool.h conforms to C99. */
++#undef HAVE_STDBOOL_H
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#undef HAVE_STDINT_H
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#undef HAVE_STDLIB_H
++
++/* Define to 1 if you have the <strings.h> header file. */
++#undef HAVE_STRINGS_H
++
++/* Define to 1 if you have the <string.h> header file. */
++#undef HAVE_STRING_H
++
++/* Define to 1 if you have the `strstr' function. */
++#undef HAVE_STRSTR
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#undef HAVE_SYS_STAT_H
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#undef HAVE_SYS_TYPES_H
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#undef HAVE_UNISTD_H
++
++/* Define to 1 if the system has the type `_Bool'. */
++#undef HAVE__BOOL
++
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++ */
++#undef LT_OBJDIR
++
++/* Name of package */
++#undef PACKAGE
++
++/* Define to the address where bug reports for this package should be sent. */
++#undef PACKAGE_BUGREPORT
++
++/* Define to the full name of this package. */
++#undef PACKAGE_NAME
++
++/* Define to the full name and version of this package. */
++#undef PACKAGE_STRING
++
++/* Define to the one symbol short name of this package. */
++#undef PACKAGE_TARNAME
++
++/* Define to the version of this package. */
++#undef PACKAGE_VERSION
++
++/* Define to 1 if you have the ANSI C header files. */
++#undef STDC_HEADERS
++
++/* Version number of package */
++#undef VERSION
++
++/* Define to empty if `const' does not conform to ANSI C. */
++#undef const
++
++/* Define to `__inline__' or `__inline' if that's what the C compiler
++ calls it, or to nothing if 'inline' is not supported under any name. */
++#ifndef __cplusplus
++#undef inline
++#endif
++
++/* Define to rpl_malloc if the replacement function should be used. */
++#undef malloc
++
++/* Define to `unsigned int' if <sys/types.h> does not define. */
++#undef size_t
+diff -urN libkml-1.2.0/configure libkml-1.2.0-new/configure
+--- libkml-1.2.0/configure 2010-01-14 01:17:29.000000000 +0100
++++ libkml-1.2.0-new/configure 2010-06-25 11:39:52.000000000 +0200
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for libkml 1.1.0.
-+# Generated by GNU Autoconf 2.65 for libkml 1.1.0.
+-# Generated by GNU Autoconf 2.63 for libkml 1.2.0.
++# Generated by GNU Autoconf 2.65 for libkml 1.2.0.
#
# Report bugs to <http://code.google.com/p/libkml/issues>.
#
@@ -2302,8 +1561,8 @@
# Identity of this package.
PACKAGE_NAME='libkml'
@@ -748,6 +704,7 @@
- PACKAGE_VERSION='1.1.0'
- PACKAGE_STRING='libkml 1.1.0'
+ PACKAGE_VERSION='1.2.0'
+ PACKAGE_STRING='libkml 1.2.0'
PACKAGE_BUGREPORT='http://code.google.com/p/libkml/issues'
+PACKAGE_URL=''
@@ -2462,7 +1721,7 @@
@@ -1695,48 +1644,580 @@
if $ac_init_version; then
cat <<\_ACEOF
- libkml configure 1.1.0
+ libkml configure 1.2.0
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
@@ -2478,7 +1737,7 @@
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
--It was created by libkml $as_me 1.1.0, which was
+-It was created by libkml $as_me 1.2.0, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+## ------------------------ ##
+## Autoconf initialization. ##
@@ -3038,7 +2297,7 @@
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
-+It was created by libkml $as_me 1.1.0, which was
++It was created by libkml $as_me 1.2.0, which was
+generated by GNU Autoconf 2.65. Invocation command line was
+
+ $ $0 $@
@@ -6390,15 +5649,6 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -5654,7 +5693,7 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
@@ -5733,7 +5772,7 @@
esac
@@ -8575,15 +7825,6 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -8903,7 +8522,7 @@
- lt_prog_compiler_static='-non_shared'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
@@ -9043,7 +8662,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
@@ -8750,34 +7991,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -9352,6 +8971,9 @@
- openbsd*)
- with_gnu_ld=no
- ;;
-+ linux* | k*bsd*-gnu)
-+ link_all_deplibs=no
-+ ;;
- esac
-
- ld_shlibs=yes
-@@ -9373,6 +8995,7 @@
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
-+ *GNU\ gold*) supports_anon_versioning=yes ;;
- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -9464,7 +9087,7 @@
- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- gnu* | linux* | tpf* | k*bsd*-gnu)
-+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
- case $cc_basename in
-@@ -9735,11 +9358,7 @@
+@@ -9735,11 +9354,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -8790,7 +8004,7 @@
/* end confdefs.h. */
int
-@@ -9750,27 +9369,7 @@
+@@ -9750,27 +9365,7 @@
return 0;
}
_ACEOF
@@ -8819,7 +8033,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -9784,16 +9383,9 @@
+@@ -9784,16 +9379,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -8838,7 +8052,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -9806,11 +9398,7 @@
+@@ -9806,11 +9394,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -8851,7 +8065,7 @@
/* end confdefs.h. */
int
-@@ -9821,27 +9409,7 @@
+@@ -9821,27 +9405,7 @@
return 0;
}
_ACEOF
@@ -8880,7 +8094,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -9855,16 +9423,9 @@
+@@ -9855,16 +9419,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -8899,7 +8113,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10076,42 +9637,16 @@
+@@ -10076,42 +9633,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -8947,7 +8161,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10367,7 +9902,7 @@
+@@ -10367,7 +9898,7 @@
fi
fi
@@ -8956,7 +8170,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -10404,16 +9939,16 @@
+@@ -10404,16 +9935,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -8977,7 +8191,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -10427,11 +9962,11 @@
+@@ -10427,11 +9958,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -8992,7 +8206,7 @@
then
archive_cmds_need_lc=no
else
-@@ -10442,7 +9977,7 @@
+@@ -10442,7 +9973,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -9001,7 +8215,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -10606,7 +10141,7 @@
+@@ -10606,7 +10137,7 @@
@@ -9010,16 +8224,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -11014,7 +10549,7 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -11028,11 +10563,7 @@
+@@ -11028,11 +10559,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -9032,7 +8237,7 @@
/* end confdefs.h. */
int
-@@ -11043,41 +10574,13 @@
+@@ -11043,41 +10570,13 @@
return 0;
}
_ACEOF
@@ -9078,7 +8283,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -11301,7 +10804,7 @@
+@@ -11301,7 +10800,7 @@
dynamic_linker=no
;;
esac
@@ -9087,7 +8292,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -11403,7 +10906,7 @@
+@@ -11403,7 +10902,7 @@
@@ -9096,7 +8301,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -11428,7 +10931,7 @@
+@@ -11428,7 +10927,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -9105,7 +8310,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -11473,18 +10976,14 @@
+@@ -11473,18 +10972,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -9127,7 +8332,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11502,43 +11001,18 @@
+@@ -11502,43 +10997,18 @@
return 0;
}
_ACEOF
@@ -9177,7 +8382,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11551,106 +11025,18 @@
+@@ -11551,106 +11021,18 @@
;;
*)
@@ -9289,7 +8494,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11668,145 +11054,32 @@
+@@ -11668,145 +11050,32 @@
return 0;
}
_ACEOF
@@ -9446,7 +8651,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11824,57 +11097,28 @@
+@@ -11824,57 +11093,28 @@
return 0;
}
_ACEOF
@@ -9513,7 +8718,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11892,57 +11136,28 @@
+@@ -11892,57 +11132,28 @@
return 0;
}
_ACEOF
@@ -9580,7 +8785,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11960,43 +11175,18 @@
+@@ -11960,43 +11171,18 @@
return 0;
}
_ACEOF
@@ -9630,7 +8835,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -12035,9 +11225,9 @@
+@@ -12035,9 +11221,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -9642,16 +8847,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12046,7 +11236,7 @@
+@@ -12046,7 +11232,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12049 "configure"
-+#line 11239 "configure"
++#line 11235 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12105,11 +11295,11 @@
+@@ -12105,11 +11291,11 @@
return status;
}
_LT_EOF
@@ -9666,7 +8871,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -12126,14 +11316,14 @@
+@@ -12126,14 +11312,14 @@
fi
@@ -9684,16 +8889,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12142,7 +11332,7 @@
+@@ -12142,7 +11328,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12145 "configure"
-+#line 11335 "configure"
++#line 11331 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12201,11 +11391,11 @@
+@@ -12201,11 +11387,11 @@
return status;
}
_LT_EOF
@@ -9708,7 +8913,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -12222,7 +11412,7 @@
+@@ -12222,7 +11408,7 @@
fi
@@ -9717,7 +8922,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -12261,12 +11451,12 @@
+@@ -12261,12 +11447,12 @@
striplib=
old_striplib=
@@ -9732,7 +8937,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -12275,15 +11465,15 @@
+@@ -12275,15 +11461,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -9751,7 +8956,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -12301,12 +11491,12 @@
+@@ -12301,12 +11487,12 @@
# Report which library types will actually be built
@@ -9767,7 +8972,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -12327,14 +11517,14 @@
+@@ -12327,14 +11513,14 @@
fi
;;
esac
@@ -9785,7 +8990,7 @@
$as_echo "$enable_static" >&6; }
-@@ -12475,7 +11665,7 @@
+@@ -12475,7 +11661,7 @@
# Check whether --with-gnu-ld was given.
@@ -9794,7 +8999,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -12484,7 +11674,7 @@
+@@ -12484,7 +11670,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -9803,7 +9008,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -12514,13 +11704,13 @@
+@@ -12514,13 +11700,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -9820,7 +9025,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -12551,18 +11741,16 @@
+@@ -12551,18 +11737,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -9844,7 +9049,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -12575,7 +11763,7 @@
+@@ -12575,7 +11759,7 @@
;;
esac
fi
@@ -9853,7 +9058,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12630,7 +11818,7 @@
+@@ -12630,7 +11814,7 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -9862,7 +9067,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
ld_shlibs_CXX=yes
case $host_os in
-@@ -12731,11 +11919,7 @@
+@@ -12731,11 +11915,7 @@
allow_undefined_flag_CXX='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
@@ -9875,7 +9080,7 @@
/* end confdefs.h. */
int
-@@ -12746,27 +11930,7 @@
+@@ -12746,27 +11926,7 @@
return 0;
}
_ACEOF
@@ -9904,7 +9109,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -12780,16 +11944,9 @@
+@@ -12780,16 +11940,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -9923,7 +9128,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -12803,11 +11960,7 @@
+@@ -12803,11 +11956,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -9936,7 +9141,7 @@
/* end confdefs.h. */
int
-@@ -12818,27 +11971,7 @@
+@@ -12818,27 +11967,7 @@
return 0;
}
_ACEOF
@@ -9965,7 +9170,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -12852,16 +11985,9 @@
+@@ -12852,16 +11981,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -9984,17 +9189,8 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -13146,7 +12272,7 @@
- inherit_rpath_CXX=yes
+@@ -13605,7 +12727,7 @@
;;
-
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -13605,7 +12731,7 @@
- ;;
esac
- { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
@@ -10002,7 +9198,7 @@
$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-@@ -13633,11 +12759,11 @@
+@@ -13633,11 +12755,11 @@
};
_LT_EOF
@@ -10017,7 +9213,7 @@
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-@@ -13818,7 +12944,7 @@
+@@ -13818,7 +12940,7 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -10026,16 +9222,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# C++ specific cases for pic, static, wl, etc.
-@@ -13974,7 +13100,7 @@
- ;;
- esac
- ;;
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- KCC*)
- # KAI C++ Compiler
-@@ -14135,7 +13261,7 @@
+@@ -14135,7 +13257,7 @@
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
;;
esac
@@ -10044,7 +9231,7 @@
$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-@@ -14144,9 +13270,9 @@
+@@ -14144,9 +13266,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
@@ -10056,21 +9243,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_CXX=no
-@@ -14162,11 +13288,11 @@
+@@ -14162,11 +13284,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14165: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13291: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13287: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14169: \$? = $ac_status" >&5
-+ echo "$as_me:13295: \$? = $ac_status" >&5
++ echo "$as_me:13291: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -14179,7 +13305,7 @@
+@@ -14179,7 +13301,7 @@
$RM conftest*
fi
@@ -10079,7 +9266,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-@@ -14200,9 +13326,9 @@
+@@ -14200,9 +13322,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
@@ -10091,7 +9278,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
-@@ -14228,7 +13354,7 @@
+@@ -14228,7 +13350,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -10100,7 +9287,7 @@
$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-@@ -14240,9 +13366,9 @@
+@@ -14240,9 +13362,9 @@
@@ -10112,21 +9299,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -14261,11 +13387,11 @@
+@@ -14261,11 +13383,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14264: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13390: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13386: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14268: \$? = $ac_status" >&5
-+ echo "$as_me:13394: \$? = $ac_status" >&5
++ echo "$as_me:13390: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -14287,14 +13413,14 @@
+@@ -14287,14 +13409,14 @@
$RM conftest*
fi
@@ -10144,21 +9331,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -14313,11 +13439,11 @@
+@@ -14313,11 +13435,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14316: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13442: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13438: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14320: \$? = $ac_status" >&5
-+ echo "$as_me:13446: \$? = $ac_status" >&5
++ echo "$as_me:13442: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -14339,7 +13465,7 @@
+@@ -14339,7 +13461,7 @@
$RM conftest*
fi
@@ -10167,7 +9354,7 @@
$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-@@ -14348,7 +13474,7 @@
+@@ -14348,7 +13470,7 @@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -10176,7 +9363,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -14356,10 +13482,10 @@
+@@ -14356,10 +13478,10 @@
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -10189,7 +9376,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -14369,7 +13495,7 @@
+@@ -14369,7 +13491,7 @@
@@ -10198,7 +9385,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14398,7 +13524,7 @@
+@@ -14398,7 +13520,7 @@
esac
exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
@@ -10207,7 +9394,7 @@
$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-@@ -14426,16 +13552,16 @@
+@@ -14426,16 +13548,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -10228,7 +9415,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -14449,11 +13575,11 @@
+@@ -14449,11 +13571,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
allow_undefined_flag_CXX=
@@ -10243,7 +9430,7 @@
then
archive_cmds_need_lc_CXX=no
else
-@@ -14464,7 +13590,7 @@
+@@ -14464,7 +13586,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -10252,7 +9439,7 @@
$as_echo "$archive_cmds_need_lc_CXX" >&6; }
;;
esac
-@@ -14535,7 +13661,7 @@
+@@ -14535,7 +13657,7 @@
@@ -10261,16 +9448,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
-@@ -14891,7 +14017,7 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -14905,11 +14031,7 @@
+@@ -14905,11 +14027,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
@@ -10283,7 +9461,7 @@
/* end confdefs.h. */
int
-@@ -14920,41 +14042,13 @@
+@@ -14920,41 +14038,13 @@
return 0;
}
_ACEOF
@@ -10329,7 +9507,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -15178,7 +14272,7 @@
+@@ -15178,7 +14268,7 @@
dynamic_linker=no
;;
esac
@@ -10338,7 +9516,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -15229,7 +14323,7 @@
+@@ -15229,7 +14319,7 @@
@@ -10347,7 +9525,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" ||
-@@ -15254,7 +14348,7 @@
+@@ -15254,7 +14344,7 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -10356,7 +9534,7 @@
$as_echo "$hardcode_action_CXX" >&6; }
if test "$hardcode_action_CXX" = relink ||
-@@ -15313,16 +14407,12 @@
+@@ -15313,16 +14403,12 @@
@@ -10376,7 +9554,7 @@
/* end confdefs.h. */
int
-@@ -15382,56 +14472,29 @@
+@@ -15382,56 +14468,29 @@
return 0;
}
_ACEOF
@@ -10440,7 +9618,7 @@
/* end confdefs.h. */
#ifndef __cplusplus
typedef int foo_t;
-@@ -15440,41 +14503,17 @@
+@@ -15440,41 +14499,17 @@
#endif
_ACEOF
@@ -10484,7 +9662,7 @@
case $ac_cv_c_inline in
inline | yes) ;;
*)
-@@ -15490,170 +14529,27 @@
+@@ -15490,170 +14525,27 @@
;;
esac
@@ -10663,7 +9841,7 @@
/* end confdefs.h. */
#if defined STDC_HEADERS || defined HAVE_STDLIB_H
# include <stdlib.h>
-@@ -15669,55 +14565,24 @@
+@@ -15669,55 +14561,24 @@
return 0;
}
_ACEOF
@@ -10727,7 +9905,7 @@
case " $LIBOBJS " in
*" malloc.$ac_objext "* ) ;;
-@@ -15726,27 +14591,20 @@
+@@ -15726,27 +14587,20 @@
esac
@@ -10760,7 +9938,7 @@
/* end confdefs.h. */
$ac_includes_default
-@@ -15779,44 +14637,17 @@
+@@ -15779,44 +14633,17 @@
}
_ACEOF
@@ -10810,7 +9988,7 @@
$as_echo "$ac_cv_func_strtod" >&6; }
if test $ac_cv_func_strtod = no; then
case " $LIBOBJS " in
-@@ -15825,105 +14656,20 @@
+@@ -15825,105 +14652,20 @@
;;
esac
@@ -10921,7 +10099,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15941,46 +14687,21 @@
+@@ -15941,46 +14683,21 @@
return 0;
}
_ACEOF
@@ -10975,7 +10153,7 @@
$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
fi
-@@ -15988,16 +14709,12 @@
+@@ -15988,16 +14705,12 @@
fi
@@ -10995,7 +10173,7 @@
/* end confdefs.h. */
#include <stdbool.h>
-@@ -16077,131 +14794,17 @@
+@@ -16077,131 +14790,17 @@
return 0;
}
_ACEOF
@@ -11132,17 +10310,16 @@
cat >>confdefs.h <<_ACEOF
#define HAVE__BOOL 1
-@@ -16212,108 +14815,13 @@
+@@ -16212,108 +14811,13 @@
if test $ac_cv_header_stdbool_h = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STDBOOL_H 1
-_ACEOF
-+$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
-
- fi
-
+-
+-fi
+-
-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
-$as_echo_n "checking for size_t... " >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
@@ -11221,18 +10398,19 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
+
- ac_cv_type_size_t=yes
--fi
--
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+-
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
--
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -11244,7 +10422,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -16335,7 +14843,7 @@
+@@ -16335,7 +14839,7 @@
PLATFORM=
SHLIBSUFFIX=
case "`uname -s`" in
@@ -11253,7 +10431,7 @@
SHLIBSUFFIX="so"
;;
Darwin) PLATFORM=darwin
-@@ -16350,474 +14858,75 @@
+@@ -16350,474 +14854,75 @@
# Check whether --with-expat-include-dir was given.
@@ -11764,7 +10942,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -16825,62 +14934,58 @@
+@@ -16825,62 +14930,58 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -11867,7 +11045,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -16890,16 +14995,16 @@
+@@ -16890,16 +14991,16 @@
# Check whether --enable-swig was given.
@@ -11887,7 +11065,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$SWIG"; then
-@@ -16910,24 +15015,24 @@
+@@ -16910,24 +15011,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11917,7 +11095,7 @@
$as_echo "no" >&6; }
fi
-@@ -16935,7 +15040,7 @@
+@@ -16935,7 +15036,7 @@
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
@@ -11926,7 +11104,7 @@
$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
-@@ -16951,7 +15056,7 @@
+@@ -16951,7 +15052,7 @@
# Check whether --enable-systempython was given.
@@ -11935,7 +11113,7 @@
enableval=$enable_systempython;
fi
-@@ -16962,16 +15067,16 @@
+@@ -16962,16 +15063,16 @@
if test "x$SWIG" != x; then
# Check whether --enable-java was given.
@@ -11955,7 +11133,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$JAVA"; then
-@@ -16982,14 +15087,14 @@
+@@ -16982,14 +15083,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11973,7 +11151,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_prog_JAVA" && ac_cv_prog_JAVA="nojava"
-@@ -16997,24 +15102,22 @@
+@@ -16997,24 +15098,22 @@
fi
JAVA=$ac_cv_prog_JAVA
if test -n "$JAVA"; then
@@ -12003,7 +11181,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$JAVAC"; then
-@@ -17025,14 +15128,14 @@
+@@ -17025,14 +15124,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12021,7 +11199,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_prog_JAVAC" && ac_cv_prog_JAVAC="nojavac"
-@@ -17040,24 +15143,22 @@
+@@ -17040,24 +15139,22 @@
fi
JAVAC=$ac_cv_prog_JAVAC
if test -n "$JAVAC"; then
@@ -12051,7 +11229,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$JAR"; then
-@@ -17068,14 +15169,14 @@
+@@ -17068,14 +15165,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12069,7 +11247,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_prog_JAR" && ac_cv_prog_JAR="nojar"
-@@ -17083,18 +15184,16 @@
+@@ -17083,18 +15180,16 @@
fi
JAR=$ac_cv_prog_JAR
if test -n "$JAR"; then
@@ -12091,7 +11269,7 @@
fi
if test "x$JAVA" != x; then
current_CPPFLAGS="$CPPFLAGS"
-@@ -17103,142 +15202,11 @@
+@@ -17103,142 +15198,11 @@
else
CPPFLAGS="-I$JAVA_INCLUDE_DIR -I$JAVA_INCLUDE_DIR/$PLATFORM"
fi
@@ -12237,7 +11415,7 @@
$as_echo "$as_me: WARNING: could not find jni.h. The Java bindings will not be built." >&2;}
JAVA=
-@@ -17260,16 +15228,16 @@
+@@ -17260,16 +15224,16 @@
if test "x$SWIG" != x; then
# Check whether --enable-python was given.
@@ -12257,7 +11435,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$PYTHON"; then
-@@ -17280,24 +15248,24 @@
+@@ -17280,24 +15244,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12287,7 +11465,7 @@
$as_echo "no" >&6; }
fi
-@@ -17306,154 +15274,23 @@
+@@ -17306,154 +15270,23 @@
PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"`
if test "$USE_DEFAULT_PYTHON_LIBDIR" = true; then
PYTHON_SITE_PACKAGES_DIR=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1,0)'`
@@ -12457,7 +11635,7 @@
$as_echo "$as_me: WARNING: could not find Python.h. The Python bindings will not be built." >&2;}
PYTHON=
-@@ -17464,20 +15301,15 @@
+@@ -17464,20 +15297,15 @@
if test "$PLATFORM" = "linux"; then
PYTHON_LIBNAME="python$PYTHON_VERSION"
fi
@@ -12482,7 +11660,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17495,47 +15327,20 @@
+@@ -17495,47 +15323,20 @@
return 0;
}
_ACEOF
@@ -12538,7 +11716,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_LIB$PYTHON_LIBNAME" | $as_tr_cpp` 1
_ACEOF
-@@ -17543,7 +15348,7 @@
+@@ -17543,7 +15344,7 @@
LIBS="-l$PYTHON_LIBNAME $LIBS"
else
@@ -12547,7 +11725,7 @@
$as_echo "$as_me: WARNING: could not find the Python library. The Python bindings will not be built." >&2;}
PYTHON=
-@@ -17569,9 +15374,9 @@
+@@ -17569,9 +15370,9 @@
if test -z "$CURL_CONFIG"; then
# Extract the first word of "curl-config", so it can be a program name with args.
set dummy curl-config; ac_word=$2
@@ -12559,7 +11737,7 @@
$as_echo_n "(cached) " >&6
else
case $CURL_CONFIG in
-@@ -17584,14 +15389,14 @@
+@@ -17584,14 +15385,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12577,7 +11755,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_CURL_CONFIG" && ac_cv_path_CURL_CONFIG="no"
-@@ -17600,10 +15405,10 @@
+@@ -17600,10 +15401,10 @@
fi
CURL_CONFIG=$ac_cv_path_CURL_CONFIG
if test -n "$CURL_CONFIG"; then
@@ -12590,7 +11768,7 @@
$as_echo "no" >&6; }
fi
-@@ -17616,24 +15421,24 @@
+@@ -17616,24 +15417,24 @@
echo "*** Or see http://curl.haxx.se/"
else
CURL_VERSION=`$CURL_CONFIG --version | cut -d" " -f2`
@@ -12621,7 +11799,7 @@
$as_echo "$CURL_LIBS" >&6; }
else
CURL_CFLAGS=""
-@@ -17650,9 +15455,7 @@
+@@ -17650,9 +15451,7 @@
if test $succeeded = yes; then
:
else
@@ -12632,7 +11810,7 @@
fi
if test "$CURL_LIBS"; then
-@@ -17697,13 +15500,13 @@
+@@ -17697,13 +15496,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -12648,7 +11826,7 @@
esac ;;
esac
done
-@@ -17711,8 +15514,8 @@
+@@ -17711,8 +15510,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -12659,7 +11837,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -17735,11 +15538,11 @@
+@@ -17735,11 +15534,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -12673,7 +11851,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -17759,85 +15562,67 @@
+@@ -17759,85 +15558,67 @@
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -12790,7 +11968,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -17847,17 +15632,18 @@
+@@ -17847,17 +15628,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -12816,7 +11994,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -17865,23 +15651,15 @@
+@@ -17865,23 +15647,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -12845,7 +12023,7 @@
as_nl='
'
export as_nl
-@@ -17889,7 +15667,13 @@
+@@ -17889,7 +15663,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -12860,7 +12038,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -17900,7 +15684,7 @@
+@@ -17900,7 +15680,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -12869,7 +12047,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -17923,13 +15707,6 @@
+@@ -17923,13 +15703,6 @@
}
fi
@@ -12883,7 +12061,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -17939,15 +15716,15 @@
+@@ -17939,15 +15712,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -12902,7 +12080,7 @@
IFS=$as_save_IFS
;;
-@@ -17959,12 +15736,16 @@
+@@ -17959,12 +15732,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -12923,7 +12101,7 @@
done
PS1='$ '
PS2='> '
-@@ -17976,7 +15757,89 @@
+@@ -17976,7 +15753,89 @@
LANGUAGE=C
export LANGUAGE
@@ -13014,7 +12192,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -17990,8 +15853,12 @@
+@@ -17990,8 +15849,12 @@
as_basename=false
fi
@@ -13028,7 +12206,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -18011,76 +15878,25 @@
+@@ -18011,76 +15874,25 @@
}
s/.*/./; q'`
@@ -13116,7 +12294,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -18109,8 +15925,56 @@
+@@ -18109,8 +15921,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -13174,7 +12352,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -18129,10 +15993,10 @@
+@@ -18129,10 +15989,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -13187,7 +12365,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -18147,13 +16011,19 @@
+@@ -18147,13 +16007,19 @@
exec 6>&1
@@ -13203,13 +12381,13 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by libkml $as_me 1.1.0, which was
+ This file was extended by libkml $as_me 1.2.0, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -18185,13 +16055,15 @@
+@@ -18185,13 +16051,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -13228,7 +12406,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -18210,16 +16082,17 @@
+@@ -18210,16 +16078,17 @@
Configuration commands:
$config_commands
@@ -13239,7 +12417,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- libkml config.status 1.1.0
+ libkml config.status 1.2.0
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
@@ -13250,7 +12428,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -18255,6 +16128,8 @@
+@@ -18255,6 +16124,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -13259,7 +12437,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -18262,20 +16137,19 @@
+@@ -18262,20 +16133,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -13284,7 +12462,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -18283,11 +16157,10 @@
+@@ -18283,11 +16153,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -13299,7 +12477,7 @@
ac_need_defaults=false ;;
esac
-@@ -18746,9 +16619,7 @@
+@@ -18747,9 +16616,7 @@
"xcode/Makefile") CONFIG_FILES="$CONFIG_FILES xcode/Makefile" ;;
"xcode/LibKML/Makefile") CONFIG_FILES="$CONFIG_FILES xcode/LibKML/Makefile" ;;
@@ -13310,7 +12488,7 @@
esac
done
-@@ -18775,7 +16646,7 @@
+@@ -18776,7 +16643,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -13319,7 +12497,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -18786,11 +16657,7 @@
+@@ -18787,11 +16654,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -13332,7 +12510,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -18798,10 +16665,16 @@
+@@ -18799,10 +16662,16 @@
if test -n "$CONFIG_FILES"; then
@@ -13352,7 +12530,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -18815,24 +16688,18 @@
+@@ -18816,24 +16685,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -13380,7 +12558,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -18854,7 +16721,7 @@
+@@ -18855,7 +16718,7 @@
t delim
:nl
h
@@ -13389,7 +12567,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -18868,7 +16735,7 @@
+@@ -18869,7 +16732,7 @@
t nl
:delim
h
@@ -13398,7 +12576,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -18921,9 +16788,7 @@
+@@ -18922,9 +16785,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -13409,7 +12587,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -18964,9 +16829,7 @@
+@@ -18965,9 +16826,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -13420,7 +12598,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -19051,9 +16914,7 @@
+@@ -19052,9 +16911,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -13431,7 +12609,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -19066,9 +16927,7 @@
+@@ -19067,9 +16924,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -13442,7 +12620,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -19096,12 +16955,10 @@
+@@ -19097,12 +16952,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -13457,7 +12635,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -19112,7 +16969,7 @@
+@@ -19113,7 +16966,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -13466,7 +12644,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -19125,9 +16982,7 @@
+@@ -19126,9 +16979,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -13477,7 +12655,7 @@
esac
;;
esac
-@@ -19155,47 +17010,7 @@
+@@ -19156,47 +17007,7 @@
q
}
s/.*/./; q'`
@@ -13526,7 +12704,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -19252,7 +17067,6 @@
+@@ -19253,7 +17064,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -13534,7 +12712,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -19262,12 +17076,11 @@
+@@ -19263,12 +17073,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -13549,7 +12727,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -19277,7 +17090,7 @@
+@@ -19278,7 +17087,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -13558,7 +12736,7 @@
esac
_ACEOF
-@@ -19306,14 +17119,12 @@
+@@ -19307,14 +17116,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -13575,7 +12753,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -19323,9 +17134,7 @@
+@@ -19324,9 +17131,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -13586,7 +12764,7 @@
;;
:H)
#
-@@ -19336,25 +17145,19 @@
+@@ -19337,25 +17142,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -13616,7 +12794,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -19392,7 +17195,7 @@
+@@ -19393,7 +17192,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -13625,7 +12803,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -19487,47 +17290,7 @@
+@@ -19488,47 +17287,7 @@
q
}
s/.*/./; q'`
@@ -13674,7 +12852,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -20341,15 +18104,12 @@
+@@ -20342,15 +18101,12 @@
done # for ac_tag
@@ -13692,7 +12870,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -20370,10 +18130,10 @@
+@@ -20371,10 +18127,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -13705,13 +12883,12 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-Index: libkml-1.1.0/examples/domviewer/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/examples/domviewer/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/examples/domviewer/Makefile.in 2009-12-10 17:29:34.000000000 +0100
+diff -urN libkml-1.2.0/examples/domviewer/Makefile.in libkml-1.2.0-new/examples/domviewer/Makefile.in
+--- libkml-1.2.0/examples/domviewer/Makefile.in 2010-01-14 01:17:29.000000000 +0100
++++ libkml-1.2.0-new/examples/domviewer/Makefile.in 2010-06-25 11:39:53.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13845,13 +13022,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/examples/engine/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/examples/engine/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/examples/engine/Makefile.in 2009-12-10 17:29:34.000000000 +0100
+diff -urN libkml-1.2.0/examples/engine/Makefile.in libkml-1.2.0-new/examples/engine/Makefile.in
+--- libkml-1.2.0/examples/engine/Makefile.in 2010-02-18 21:10:29.000000000 +0100
++++ libkml-1.2.0-new/examples/engine/Makefile.in 2010-06-25 11:39:53.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13872,7 +13048,7 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
-@@ -49,6 +51,7 @@
+@@ -50,6 +52,7 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -13880,7 +13056,7 @@
PROGRAMS = $(noinst_PROGRAMS)
am_balloonwalker_OBJECTS = balloonwalker.$(OBJEXT)
balloonwalker_OBJECTS = $(am_balloonwalker_OBJECTS)
-@@ -137,6 +140,7 @@
+@@ -145,6 +148,7 @@
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@@ -13888,7 +13064,7 @@
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -222,6 +226,7 @@
+@@ -231,6 +235,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -13896,7 +13072,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PLATFORM = @PLATFORM@
-@@ -294,7 +299,7 @@
+@@ -303,7 +308,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/src \
-I$(top_srcdir)/third_party/boost_1_34_1
@@ -13905,7 +13081,7 @@
balloonwalker_SOURCES = balloonwalker.cc
balloonwalker_LDADD = \
$(top_builddir)/src/kml/engine/libkmlengine.la \
-@@ -396,9 +401,9 @@
+@@ -412,9 +417,9 @@
exit 1;; \
esac; \
done; \
@@ -13918,7 +13094,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -416,13 +421,16 @@
+@@ -432,13 +437,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13940,7 +13116,7 @@
balloonwalker$(EXEEXT): $(balloonwalker_OBJECTS) $(balloonwalker_DEPENDENCIES)
@rm -f balloonwalker$(EXEEXT)
$(CXXLINK) $(balloonwalker_OBJECTS) $(balloonwalker_LDADD) $(LIBS)
-@@ -489,21 +497,21 @@
+@@ -509,21 +517,21 @@
.cc.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -13965,7 +13141,7 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-@@ -526,7 +534,7 @@
+@@ -546,7 +554,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -13974,7 +13150,7 @@
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -534,29 +542,34 @@
+@@ -554,29 +562,34 @@
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
@@ -14017,7 +13193,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -577,13 +590,17 @@
+@@ -597,13 +610,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -14039,7 +13215,7 @@
|| exit 1; \
fi; \
done
-@@ -611,6 +628,7 @@
+@@ -631,6 +648,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -14047,7 +13223,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -632,6 +650,8 @@
+@@ -652,6 +670,8 @@
html: html-am
@@ -14056,7 +13232,7 @@
info: info-am
info-am:
-@@ -640,18 +660,28 @@
+@@ -660,18 +680,28 @@
install-dvi: install-dvi-am
@@ -14085,7 +13261,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -689,6 +719,7 @@
+@@ -709,6 +739,7 @@
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am
@@ -14093,13 +13269,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/examples/gpx/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/examples/gpx/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/examples/gpx/Makefile.in 2009-12-10 17:29:34.000000000 +0100
+diff -urN libkml-1.2.0/examples/gpx/Makefile.in libkml-1.2.0-new/examples/gpx/Makefile.in
+--- libkml-1.2.0/examples/gpx/Makefile.in 2010-01-14 01:17:30.000000000 +0100
++++ libkml-1.2.0-new/examples/gpx/Makefile.in 2010-06-25 11:39:53.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14341,13 +13516,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/examples/gx/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/examples/gx/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/examples/gx/Makefile.in 2009-12-10 17:29:34.000000000 +0100
+diff -urN libkml-1.2.0/examples/gx/Makefile.in libkml-1.2.0-new/examples/gx/Makefile.in
+--- libkml-1.2.0/examples/gx/Makefile.in 2010-01-14 01:17:30.000000000 +0100
++++ libkml-1.2.0-new/examples/gx/Makefile.in 2010-06-25 11:39:53.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14589,13 +13763,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/examples/hellonet/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/examples/hellonet/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/examples/hellonet/Makefile.in 2009-12-10 17:29:35.000000000 +0100
+diff -urN libkml-1.2.0/examples/hellonet/Makefile.in libkml-1.2.0-new/examples/hellonet/Makefile.in
+--- libkml-1.2.0/examples/hellonet/Makefile.in 2010-02-18 21:10:31.000000000 +0100
++++ libkml-1.2.0-new/examples/hellonet/Makefile.in 2010-06-25 11:39:53.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14616,7 +13789,7 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
-@@ -49,6 +51,7 @@
+@@ -55,6 +57,7 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -14624,7 +13797,7 @@
LTLIBRARIES = $(noinst_LTLIBRARIES)
libcurlfetch_la_DEPENDENCIES =
am__libcurlfetch_la_SOURCES_DIST = curlfetch.cc
-@@ -124,6 +127,7 @@
+@@ -210,6 +213,7 @@
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@@ -14632,7 +13805,7 @@
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -207,6 +211,7 @@
+@@ -306,6 +310,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -14640,7 +13813,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PLATFORM = @PLATFORM@
-@@ -280,7 +285,7 @@
+@@ -379,7 +384,7 @@
@HAVE_CURL_TRUE@ -I$(top_srcdir)/examples/hellonet \
@HAVE_CURL_TRUE@ -I$(top_srcdir)/third_party/boost_1_34_1
@@ -14649,7 +13822,7 @@
@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
-@@ -363,9 +368,9 @@
+@@ -542,9 +547,9 @@
exit 1;; \
esac; \
done; \
@@ -14662,7 +13835,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -383,6 +388,7 @@
+@@ -562,6 +567,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14670,7 +13843,7 @@
clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-@@ -396,11 +402,13 @@
+@@ -575,11 +581,13 @@
$(CXXLINK) $(am_libcurlfetch_la_rpath) $(libcurlfetch_la_OBJECTS) $(libcurlfetch_la_LIBADD) $(LIBS)
clean-noinstPROGRAMS:
@@ -14686,10 +13859,10 @@
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
- getgmapkml$(EXEEXT): $(getgmapkml_OBJECTS) $(getgmapkml_DEPENDENCIES)
- @rm -f getgmapkml$(EXEEXT)
- $(CXXLINK) $(getgmapkml_OBJECTS) $(getgmapkml_LDADD) $(LIBS)
-@@ -444,21 +452,21 @@
+ csvurl2gmap$(EXEEXT): $(csvurl2gmap_OBJECTS) $(csvurl2gmap_DEPENDENCIES)
+ @rm -f csvurl2gmap$(EXEEXT)
+ $(CXXLINK) $(csvurl2gmap_OBJECTS) $(csvurl2gmap_LDADD) $(LIBS)
+@@ -663,21 +671,21 @@
.cc.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -14714,7 +13887,7 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-@@ -481,7 +489,7 @@
+@@ -700,7 +708,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -14723,7 +13896,7 @@
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -489,29 +497,34 @@
+@@ -708,29 +716,34 @@
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
@@ -14766,7 +13939,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -532,13 +545,17 @@
+@@ -751,13 +764,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -14788,7 +13961,7 @@
|| exit 1; \
fi; \
done
-@@ -566,6 +583,7 @@
+@@ -785,6 +802,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -14796,7 +13969,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -587,6 +605,8 @@
+@@ -806,6 +824,8 @@
html: html-am
@@ -14805,7 +13978,7 @@
info: info-am
info-am:
-@@ -595,18 +615,28 @@
+@@ -814,18 +834,28 @@
install-dvi: install-dvi-am
@@ -14834,7 +14007,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -645,6 +675,7 @@
+@@ -864,6 +894,7 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am
@@ -14842,13 +14015,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/examples/helloworld/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/examples/helloworld/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/examples/helloworld/Makefile.in 2009-12-10 17:29:35.000000000 +0100
+diff -urN libkml-1.2.0/examples/helloworld/Makefile.in libkml-1.2.0-new/examples/helloworld/Makefile.in
+--- libkml-1.2.0/examples/helloworld/Makefile.in 2010-01-14 01:17:31.000000000 +0100
++++ libkml-1.2.0-new/examples/helloworld/Makefile.in 2010-06-25 11:39:53.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15095,13 +14267,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/examples/java/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/examples/java/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/examples/java/Makefile.in 2009-12-10 17:29:35.000000000 +0100
+diff -urN libkml-1.2.0/examples/java/Makefile.in libkml-1.2.0-new/examples/java/Makefile.in
+--- libkml-1.2.0/examples/java/Makefile.in 2010-01-14 01:17:31.000000000 +0100
++++ libkml-1.2.0-new/examples/java/Makefile.in 2010-06-25 11:39:53.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15235,13 +14406,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/examples/kml/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/examples/kml/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/examples/kml/Makefile.in 2009-12-10 17:29:35.000000000 +0100
+diff -urN libkml-1.2.0/examples/kml/Makefile.in libkml-1.2.0-new/examples/kml/Makefile.in
+--- libkml-1.2.0/examples/kml/Makefile.in 2010-01-14 01:17:31.000000000 +0100
++++ libkml-1.2.0-new/examples/kml/Makefile.in 2010-06-25 11:39:53.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15375,13 +14545,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/examples/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/examples/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/examples/Makefile.in 2009-12-10 17:29:34.000000000 +0100
+diff -urN libkml-1.2.0/examples/Makefile.in libkml-1.2.0-new/examples/Makefile.in
+--- libkml-1.2.0/examples/Makefile.in 2010-01-14 01:17:29.000000000 +0100
++++ libkml-1.2.0-new/examples/Makefile.in 2010-06-25 11:39:53.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15478,6 +14647,15 @@
mostlyclean-libtool:
-rm -f *.lo
+@@ -250,7 +283,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -267,7 +300,7 @@
else \
local_target="$$target"; \
@@ -15487,6 +14665,15 @@
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
+@@ -275,7 +308,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -301,16 +334,16 @@
else \
local_target="$$target"; \
@@ -15688,13 +14875,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/examples/python/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/examples/python/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/examples/python/Makefile.in 2009-12-10 17:29:35.000000000 +0100
+diff -urN libkml-1.2.0/examples/python/Makefile.in libkml-1.2.0-new/examples/python/Makefile.in
+--- libkml-1.2.0/examples/python/Makefile.in 2010-01-14 01:17:32.000000000 +0100
++++ libkml-1.2.0-new/examples/python/Makefile.in 2010-06-25 11:39:53.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15828,13 +15014,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/examples/regionator/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/examples/regionator/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/examples/regionator/Makefile.in 2009-12-10 17:29:35.000000000 +0100
+diff -urN libkml-1.2.0/examples/regionator/Makefile.in libkml-1.2.0-new/examples/regionator/Makefile.in
+--- libkml-1.2.0/examples/regionator/Makefile.in 2010-01-14 01:17:32.000000000 +0100
++++ libkml-1.2.0-new/examples/regionator/Makefile.in 2010-06-25 11:39:53.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16076,13 +15261,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/examples/wxregionator/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/examples/wxregionator/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/examples/wxregionator/Makefile.in 2009-12-10 17:29:35.000000000 +0100
+diff -urN libkml-1.2.0/examples/wxregionator/Makefile.in libkml-1.2.0-new/examples/wxregionator/Makefile.in
+--- libkml-1.2.0/examples/wxregionator/Makefile.in 2010-01-14 01:17:32.000000000 +0100
++++ libkml-1.2.0-new/examples/wxregionator/Makefile.in 2010-06-25 11:39:54.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16216,13 +15400,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/examples/wxviewer/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/examples/wxviewer/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/examples/wxviewer/Makefile.in 2009-12-10 17:29:35.000000000 +0100
+diff -urN libkml-1.2.0/examples/wxviewer/Makefile.in libkml-1.2.0-new/examples/wxviewer/Makefile.in
+--- libkml-1.2.0/examples/wxviewer/Makefile.in 2010-01-14 01:17:32.000000000 +0100
++++ libkml-1.2.0-new/examples/wxviewer/Makefile.in 2010-06-25 11:39:54.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16356,13 +15539,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/examples/xsd/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/examples/xsd/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/examples/xsd/Makefile.in 2009-12-10 17:29:35.000000000 +0100
+diff -urN libkml-1.2.0/examples/xsd/Makefile.in libkml-1.2.0-new/examples/xsd/Makefile.in
+--- libkml-1.2.0/examples/xsd/Makefile.in 2010-01-14 01:17:32.000000000 +0100
++++ libkml-1.2.0-new/examples/xsd/Makefile.in 2010-06-25 11:39:54.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16604,339 +15786,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/INSTALL
-===================================================================
---- libkml-1.1.0.orig/INSTALL 2009-12-10 13:05:41.000000000 +0100
-+++ libkml-1.1.0/INSTALL 2009-12-10 17:29:40.000000000 +0100
-@@ -1,5 +1,8 @@
--Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
--Foundation, Inc.
-+Installation Instructions
-+*************************
-+
-+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
- This file is free documentation; the Free Software Foundation gives
- unlimited permission to copy, distribute and modify it.
-@@ -7,7 +10,10 @@
- Basic Installation
- ==================
-
-- These are generic installation instructions.
-+ Briefly, the shell commands `./configure; make; make install' should
-+configure, build, and install this package. The following
-+more-detailed instructions are generic; see the `README' file for
-+instructions specific to this package.
-
- The `configure' shell script attempts to guess correct values for
- various system-dependent variables used during compilation. It uses
-@@ -20,9 +26,9 @@
-
- It can also use an optional file (typically called `config.cache'
- and enabled with `--cache-file=config.cache' or simply `-C') that saves
--the results of its tests to speed up reconfiguring. (Caching is
-+the results of its tests to speed up reconfiguring. Caching is
- disabled by default to prevent problems with accidental use of stale
--cache files.)
-+cache files.
-
- If you need to do unusual things to compile the package, please try
- to figure out how `configure' could check whether to do them, and mail
-@@ -32,20 +38,17 @@
- may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
--`configure' by a program called `autoconf'. You only need
--`configure.ac' if you want to change it or regenerate `configure' using
--a newer version of `autoconf'.
-+`configure' by a program called `autoconf'. You need `configure.ac' if
-+you want to change it or regenerate `configure' using a newer version
-+of `autoconf'.
-
- The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
-- `./configure' to configure the package for your system. If you're
-- using `csh' on an old version of System V, you might need to type
-- `sh ./configure' instead to prevent `csh' from trying to execute
-- `configure' itself.
-+ `./configure' to configure the package for your system.
-
-- Running `configure' takes awhile. While running, it prints some
-- messages telling which features it is checking for.
-+ Running `configure' might take a while. While running, it prints
-+ some messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
-@@ -64,6 +67,9 @@
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-+ 6. Often, you can also type `make uninstall' to remove the installed
-+ files again.
-+
- Compilers and Options
- =====================
-
-@@ -75,7 +81,7 @@
- by setting variables in the command line or in the environment. Here
- is an example:
-
-- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-@@ -84,34 +90,46 @@
-
- You can compile the package for more than one kind of computer at the
- same time, by placing the object files for each architecture in their
--own directory. To do this, you must use a version of `make' that
--supports the `VPATH' variable, such as GNU `make'. `cd' to the
-+own directory. To do this, you can use GNU `make'. `cd' to the
- directory where you want the object files and executables to go and run
- the `configure' script. `configure' automatically checks for the
- source code in the directory that `configure' is in and in `..'.
-
-- If you have to use a `make' that does not support the `VPATH'
--variable, you have to compile the package for one architecture at a
--time in the source code directory. After you have installed the
--package for one architecture, use `make distclean' before reconfiguring
--for another architecture.
-+ With a non-GNU `make', it is safer to compile the package for one
-+architecture at a time in the source code directory. After you have
-+installed the package for one architecture, use `make distclean' before
-+reconfiguring for another architecture.
-+
-+ On MacOS X 10.5 and later systems, you can create libraries and
-+executables that work on multiple system types--known as "fat" or
-+"universal" binaries--by specifying multiple `-arch' options to the
-+compiler but only a single `-arch' option to the preprocessor. Like
-+this:
-+
-+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+ CPP="gcc -E" CXXCPP="g++ -E"
-+
-+ This is not guaranteed to produce working output in all cases, you
-+may have to build one architecture at a time and combine the results
-+using the `lipo' tool if you have problems.
-
- Installation Names
- ==================
-
-- By default, `make install' will install the package's files in
--`/usr/local/bin', `/usr/local/man', etc. You can specify an
--installation prefix other than `/usr/local' by giving `configure' the
--option `--prefix=PATH'.
-+ By default, `make install' installs the package's commands under
-+`/usr/local/bin', include files under `/usr/local/include', etc. You
-+can specify an installation prefix other than `/usr/local' by giving
-+`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
- architecture-specific files and architecture-independent files. If you
--give `configure' the option `--exec-prefix=PATH', the package will use
--PATH as the prefix for installing programs and libraries.
--Documentation and other data files will still use the regular prefix.
-+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-+PREFIX as the prefix for installing programs and libraries.
-+Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
--options like `--bindir=PATH' to specify different values for particular
-+options like `--bindir=DIR' to specify different values for particular
- kinds of files. Run `configure --help' for a list of the directories
- you can set and what kinds of files go in them.
-
-@@ -134,6 +152,38 @@
- you can use the `configure' options `--x-includes=DIR' and
- `--x-libraries=DIR' to specify their locations.
-
-+Particular systems
-+==================
-+
-+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-+CC is not installed, it is recommended to use the following options in
-+order to use an ANSI C compiler:
-+
-+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-+
-+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-+
-+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
-+a workaround. If GNU CC is not installed, it is therefore recommended
-+to try
-+
-+ ./configure CC="cc"
-+
-+and if that doesn't work, try
-+
-+ ./configure CC="cc -nodtk"
-+
-+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
-+directory contains several dysfunctional programs; working variants of
-+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-+in your `PATH', put it _after_ `/usr/bin'.
-+
-+ On Haiku, software installed for all users goes in `/boot/common',
-+not `/usr/local'. It is recommended to use the following options:
-+
-+ ./configure --prefix=/boot/common
-+
- Specifying the System Type
- ==========================
-
-@@ -149,14 +199,15 @@
-
- where SYSTEM can have one of these forms:
-
-- OS KERNEL-OS
-+ OS
-+ KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
- `config.sub' isn't included in this package, then this package doesn't
- need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
--use the `--target=TYPE' option to select the type of system they will
-+use the option `--target=TYPE' to select the type of system they will
- produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-@@ -186,9 +237,14 @@
-
- ./configure CC=/usr/local2/bin/gcc
-
--will cause the specified gcc to be used as the C compiler (unless it is
-+causes the specified `gcc' to be used as the C compiler (unless it is
- overridden in the site shell script).
-
-+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-+an Autoconf bug. Until the bug is fixed you can use this workaround:
-+
-+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-+
- `configure' Invocation
- ======================
-
-@@ -197,7 +253,14 @@
-
- `--help'
- `-h'
-- Print a summary of the options to `configure', and exit.
-+ Print a summary of all of the options to `configure', and exit.
-+
-+`--help=short'
-+`--help=recursive'
-+ Print a summary of the options unique to this package's
-+ `configure', and exit. The `short' variant lists options used
-+ only in the top level, while the `recursive' variant lists options
-+ also present in any nested packages.
-
- `--version'
- `-V'
-@@ -224,6 +287,16 @@
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-+`--prefix=DIR'
-+ Use DIR as the installation prefix. *Note Installation Names::
-+ for more details, including other options available for fine-tuning
-+ the installation locations.
-+
-+`--no-create'
-+`-n'
-+ Run the configure checks, but stop before creating any output
-+ files.
-+
- `configure' also accepts some other, not widely useful, options. Run
- `configure --help' for more details.
-
-Index: libkml-1.1.0/m4/libtool.m4
-===================================================================
---- libkml-1.1.0.orig/m4/libtool.m4 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/m4/libtool.m4 2009-12-10 17:29:26.000000000 +0100
-@@ -2445,7 +2445,7 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -3084,7 +3084,7 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-@@ -3705,7 +3705,7 @@
- ;;
- esac
- ;;
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- KCC*)
- # KAI C++ Compiler
-@@ -3989,7 +3989,7 @@
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
-@@ -4261,6 +4261,9 @@
- openbsd*)
- with_gnu_ld=no
- ;;
-+ linux* | k*bsd*-gnu)
-+ _LT_TAGVAR(link_all_deplibs, $1)=no
-+ ;;
- esac
-
- _LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4282,6 +4285,7 @@
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
-+ *GNU\ gold*) supports_anon_versioning=yes ;;
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -4373,7 +4377,7 @@
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- gnu* | linux* | tpf* | k*bsd*-gnu)
-+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
- case $cc_basename in
-@@ -5857,7 +5861,7 @@
- _LT_TAGVAR(inherit_rpath, $1)=yes
- ;;
-
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-Index: libkml-1.1.0/m4/ltversion.m4
-===================================================================
---- libkml-1.1.0.orig/m4/ltversion.m4 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/m4/ltversion.m4 2009-12-10 17:29:26.000000000 +0100
+diff -urN libkml-1.2.0/m4/ltversion.m4 libkml-1.2.0-new/m4/ltversion.m4
+--- libkml-1.2.0/m4/ltversion.m4 2009-07-23 22:57:17.000000000 +0200
++++ libkml-1.2.0-new/m4/ltversion.m4 2010-06-25 11:39:47.000000000 +0200
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
@@ -16958,13 +15810,12 @@
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
-Index: libkml-1.1.0/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/Makefile.in 2009-12-10 17:29:40.000000000 +0100
+diff -urN libkml-1.2.0/Makefile.in libkml-1.2.0-new/Makefile.in
+--- libkml-1.2.0/Makefile.in 2010-01-14 01:17:37.000000000 +0100
++++ libkml-1.2.0-new/Makefile.in 2010-06-25 11:39:57.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17092,6 +15943,15 @@
rm -f stamp-h1
touch $@
+@@ -285,7 +318,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -302,7 +335,7 @@
else \
local_target="$$target"; \
@@ -17101,6 +15961,15 @@
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
+@@ -310,7 +343,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -336,16 +369,16 @@
else \
local_target="$$target"; \
@@ -17190,7 +16059,7 @@
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -426,38 +464,54 @@
+@@ -426,38 +464,55 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -17248,7 +16117,8 @@
done
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ -test -n "$(am__skip_mode_fix)" \
-+ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++ || find "$(distdir)" -type d ! -perm -755 \
++ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -17257,7 +16127,7 @@
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
-@@ -470,6 +524,10 @@
+@@ -470,6 +525,10 @@
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
@@ -17268,16 +16138,29 @@
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
-@@ -498,6 +556,8 @@
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+@@ -493,15 +552,17 @@
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
-@@ -509,9 +569,11 @@
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+@@ -509,9 +570,11 @@
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
@@ -17290,7 +16173,7 @@
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
-@@ -533,13 +595,15 @@
+@@ -533,13 +596,15 @@
&& rm -rf "$$dc_destdir" \
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& rm -rf $(DIST_ARCHIVES) \
@@ -17308,7 +16191,7 @@
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
-@@ -581,6 +645,7 @@
+@@ -581,6 +646,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -17316,7 +16199,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -601,6 +666,8 @@
+@@ -601,6 +667,8 @@
html: html-recursive
@@ -17325,7 +16208,7 @@
info: info-recursive
info-am:
-@@ -609,18 +676,28 @@
+@@ -609,18 +677,28 @@
install-dvi: install-dvi-recursive
@@ -17354,7 +16237,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -643,24 +720,25 @@
+@@ -643,24 +721,25 @@
uninstall-am:
@@ -17394,13 +16277,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.1.0/msvc/examples/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/msvc/examples/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/msvc/examples/Makefile.in 2009-12-10 17:29:35.000000000 +0100
+diff -urN libkml-1.2.0/msvc/examples/Makefile.in libkml-1.2.0-new/msvc/examples/Makefile.in
+--- libkml-1.2.0/msvc/examples/Makefile.in 2010-01-14 01:17:32.000000000 +0100
++++ libkml-1.2.0-new/msvc/examples/Makefile.in 2010-06-25 11:39:54.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17534,13 +16416,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/msvc/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/msvc/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/msvc/Makefile.in 2009-12-10 17:29:35.000000000 +0100
+diff -urN libkml-1.2.0/msvc/Makefile.in libkml-1.2.0-new/msvc/Makefile.in
+--- libkml-1.2.0/msvc/Makefile.in 2010-01-14 01:17:32.000000000 +0100
++++ libkml-1.2.0-new/msvc/Makefile.in 2010-06-25 11:39:54.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17637,6 +16518,15 @@
mostlyclean-libtool:
-rm -f *.lo
+@@ -245,7 +278,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -262,7 +295,7 @@
else \
local_target="$$target"; \
@@ -17646,6 +16536,15 @@
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
+@@ -270,7 +303,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -296,16 +329,16 @@
else \
local_target="$$target"; \
@@ -17847,13 +16746,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/msvc/tests/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/msvc/tests/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/msvc/tests/Makefile.in 2009-12-10 17:29:35.000000000 +0100
+diff -urN libkml-1.2.0/msvc/tests/Makefile.in libkml-1.2.0-new/msvc/tests/Makefile.in
+--- libkml-1.2.0/msvc/tests/Makefile.in 2010-01-14 01:17:32.000000000 +0100
++++ libkml-1.2.0-new/msvc/tests/Makefile.in 2010-06-25 11:39:54.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17987,13 +16885,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/src/kml/base/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/src/kml/base/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/src/kml/base/Makefile.in 2009-12-10 17:29:36.000000000 +0100
+diff -urN libkml-1.2.0/src/kml/base/Makefile.in libkml-1.2.0-new/src/kml/base/Makefile.in
+--- libkml-1.2.0/src/kml/base/Makefile.in 2010-01-14 01:17:33.000000000 +0100
++++ libkml-1.2.0-new/src/kml/base/Makefile.in 2010-06-25 11:39:54.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18014,7 +16911,7 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
-@@ -57,19 +59,33 @@
+@@ -58,19 +60,33 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -18049,10 +16946,10 @@
- $(top_builddir)/third_party/libminizip.la \
- $(top_builddir)/third_party/liburiparser.la
+ $(top_builddir)/third_party/libminizip.la
- am_libkmlbase_la_OBJECTS = attributes.lo date_time.lo \
+ 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 \
-@@ -149,7 +165,6 @@
+@@ -160,7 +176,6 @@
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 \
@@ -18060,7 +16957,7 @@
$(top_builddir)/third_party/libgtest.la
net_cache_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-@@ -190,7 +205,6 @@
+@@ -201,7 +216,6 @@
uri_parser_test-uri_parser_test.$(OBJEXT)
uri_parser_test_OBJECTS = $(am_uri_parser_test_OBJECTS)
uri_parser_test_DEPENDENCIES = libkmlbase.la \
@@ -18068,7 +16965,7 @@
$(top_builddir)/third_party/libgtest.la
uri_parser_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-@@ -260,6 +274,7 @@
+@@ -271,6 +285,7 @@
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@@ -18076,10 +16973,10 @@
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -300,10 +315,11 @@
- $(version_test_SOURCES) $(xml_element_test_SOURCES) \
- $(xml_file_test_SOURCES) $(xml_namespaces_test_SOURCES) \
- $(xmlns_test_SOURCES) $(zip_file_test_SOURCES)
+@@ -304,10 +319,11 @@
+ $(xml_element_test_SOURCES) $(xml_file_test_SOURCES) \
+ $(xml_namespaces_test_SOURCES) $(xmlns_test_SOURCES) \
+ $(zip_file_test_SOURCES)
-libkmlbaseincludeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(libkmlbaseinclude_HEADERS)
ETAGS = etags
@@ -18089,7 +16986,7 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
-@@ -367,6 +383,7 @@
+@@ -371,6 +387,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18097,11 +16994,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PLATFORM = @PLATFORM@
-@@ -439,12 +456,11 @@
+@@ -443,12 +460,11 @@
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.1/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
@@ -18113,7 +17010,7 @@
lib_LTLIBRARIES = libkmlbase.la
libkmlbase_la_SOURCES = \
attributes.cc \
-@@ -465,8 +481,7 @@
+@@ -469,8 +485,7 @@
zip_file.cc
libkmlbase_la_LIBADD = \
@@ -18123,7 +17020,7 @@
# These header files will be installed in $(includedir)/kml/base
-@@ -540,8 +555,7 @@
+@@ -550,8 +565,7 @@
net_cache_test_SOURCES = net_cache_test.cc
net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
@@ -18133,7 +17030,7 @@
$(top_builddir)/third_party/libgtest.la
referent_test_SOURCES = referent_test.cc
-@@ -566,8 +580,7 @@
+@@ -576,8 +590,7 @@
uri_parser_test_SOURCES = uri_parser_test.cc
uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
@@ -18143,7 +17040,7 @@
$(top_builddir)/third_party/libgtest.la
util_test_SOURCES = util_test.cc
-@@ -625,9 +638,9 @@
+@@ -635,9 +648,9 @@
exit 1;; \
esac; \
done; \
@@ -18156,7 +17053,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -645,23 +658,28 @@
+@@ -655,23 +668,28 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18194,7 +17091,7 @@
done
clean-libLTLIBRARIES:
-@@ -676,11 +694,13 @@
+@@ -686,11 +704,13 @@
$(libkmlbase_la_LINK) -rpath $(libdir) $(libkmlbase_la_OBJECTS) $(libkmlbase_la_LIBADD) $(LIBS)
clean-checkPROGRAMS:
@@ -18213,7 +17110,7 @@
attributes_test$(EXEEXT): $(attributes_test_OBJECTS) $(attributes_test_DEPENDENCIES)
@rm -f attributes_test$(EXEEXT)
$(attributes_test_LINK) $(attributes_test_OBJECTS) $(attributes_test_LDADD) $(LIBS)
-@@ -790,315 +810,315 @@
+@@ -805,329 +825,329 @@
.cc.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -18271,6 +17168,22 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(color32_test_CXXFLAGS) $(CXXFLAGS) -c -o color32_test-color32_test.obj `if test -f 'color32_test.cc'; then $(CYGPATH_W) 'color32_test.cc'; else $(CYGPATH_W) '$(srcdir)/color32_test.cc'; fi`
+ csv_splitter_test-csv_splitter_test.o: csv_splitter_test.cc
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_splitter_test_CXXFLAGS) $(CXXFLAGS) -MT csv_splitter_test-csv_splitter_test.o -MD -MP -MF $(DEPDIR)/csv_splitter_test-csv_splitter_test.Tpo -c -o csv_splitter_test-csv_splitter_test.o `test -f 'csv_splitter_test.cc' || echo '$(srcdir)/'`csv_splitter_test.cc
+- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/csv_splitter_test-csv_splitter_test.Tpo $(DEPDIR)/csv_splitter_test-csv_splitter_test.Po
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/csv_splitter_test-csv_splitter_test.Tpo $(DEPDIR)/csv_splitter_test-csv_splitter_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='csv_splitter_test.cc' object='csv_splitter_test-csv_splitter_test.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_splitter_test_CXXFLAGS) $(CXXFLAGS) -c -o csv_splitter_test-csv_splitter_test.o `test -f 'csv_splitter_test.cc' || echo '$(srcdir)/'`csv_splitter_test.cc
+
+ csv_splitter_test-csv_splitter_test.obj: csv_splitter_test.cc
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_splitter_test_CXXFLAGS) $(CXXFLAGS) -MT csv_splitter_test-csv_splitter_test.obj -MD -MP -MF $(DEPDIR)/csv_splitter_test-csv_splitter_test.Tpo -c -o csv_splitter_test-csv_splitter_test.obj `if test -f 'csv_splitter_test.cc'; then $(CYGPATH_W) 'csv_splitter_test.cc'; else $(CYGPATH_W) '$(srcdir)/csv_splitter_test.cc'; fi`
+- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/csv_splitter_test-csv_splitter_test.Tpo $(DEPDIR)/csv_splitter_test-csv_splitter_test.Po
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/csv_splitter_test-csv_splitter_test.Tpo $(DEPDIR)/csv_splitter_test-csv_splitter_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='csv_splitter_test.cc' object='csv_splitter_test-csv_splitter_test.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_splitter_test_CXXFLAGS) $(CXXFLAGS) -c -o csv_splitter_test-csv_splitter_test.obj `if test -f 'csv_splitter_test.cc'; then $(CYGPATH_W) 'csv_splitter_test.cc'; else $(CYGPATH_W) '$(srcdir)/csv_splitter_test.cc'; fi`
+
date_time_test-date_time_test.o: date_time_test.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(date_time_test_CXXFLAGS) $(CXXFLAGS) -MT date_time_test-date_time_test.o -MD -MP -MF $(DEPDIR)/date_time_test-date_time_test.Tpo -c -o date_time_test-date_time_test.o `test -f 'date_time_test.cc' || echo '$(srcdir)/'`date_time_test.cc
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/date_time_test-date_time_test.Tpo $(DEPDIR)/date_time_test-date_time_test.Po
@@ -18574,7 +17487,7 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='zip_file_test.cc' object='zip_file_test-zip_file_test.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zip_file_test_CXXFLAGS) $(CXXFLAGS) -c -o zip_file_test-zip_file_test.obj `if test -f 'zip_file_test.cc'; then $(CYGPATH_W) 'zip_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/zip_file_test.cc'; fi`
-@@ -1111,20 +1131,23 @@
+@@ -1140,20 +1160,23 @@
install-libkmlbaseincludeHEADERS: $(libkmlbaseinclude_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(libkmlbaseincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmlbaseincludedir)"
@@ -18607,7 +17520,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -1138,7 +1161,7 @@
+@@ -1167,7 +1190,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -18616,7 +17529,7 @@
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -1146,29 +1169,34 @@
+@@ -1175,29 +1198,34 @@
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
@@ -18659,7 +17572,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -1177,6 +1205,7 @@
+@@ -1206,6 +1234,7 @@
@failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
@@ -18667,7 +17580,7 @@
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -1188,10 +1217,10 @@
+@@ -1217,10 +1246,10 @@
*[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
@@ -18680,7 +17593,7 @@
;; \
esac; \
elif test $$? -ne 77; then \
-@@ -1199,17 +1228,18 @@
+@@ -1228,17 +1257,18 @@
case " $(XFAIL_TESTS) " in \
*[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
@@ -18702,7 +17615,7 @@
done; \
if test "$$all" -eq 1; then \
tests="test"; \
-@@ -1251,11 +1281,15 @@
+@@ -1280,11 +1310,15 @@
dashes="$$report"; \
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
@@ -18720,7 +17633,7 @@
test "$$failed" -eq 0; \
else :; fi
-@@ -1275,13 +1309,17 @@
+@@ -1304,13 +1338,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -18742,7 +17655,7 @@
|| exit 1; \
fi; \
done
-@@ -1315,6 +1353,7 @@
+@@ -1344,6 +1382,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -18750,7 +17663,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -1336,6 +1375,8 @@
+@@ -1365,6 +1404,8 @@
html: html-am
@@ -18759,7 +17672,7 @@
info: info-am
info-am:
-@@ -1344,18 +1385,28 @@
+@@ -1373,18 +1414,28 @@
install-dvi: install-dvi-am
@@ -18788,7 +17701,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -1379,7 +1430,7 @@
+@@ -1408,7 +1459,7 @@
uninstall-am: uninstall-libLTLIBRARIES \
uninstall-libkmlbaseincludeHEADERS
@@ -18797,7 +17710,7 @@
.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
-@@ -1397,6 +1448,7 @@
+@@ -1426,6 +1477,7 @@
tags uninstall uninstall-am uninstall-libLTLIBRARIES \
uninstall-libkmlbaseincludeHEADERS
@@ -18805,13 +17718,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/src/kml/convenience/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/src/kml/convenience/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/src/kml/convenience/Makefile.in 2009-12-10 17:29:36.000000000 +0100
+diff -urN libkml-1.2.0/src/kml/convenience/Makefile.in libkml-1.2.0-new/src/kml/convenience/Makefile.in
+--- libkml-1.2.0/src/kml/convenience/Makefile.in 2010-01-14 01:17:33.000000000 +0100
++++ libkml-1.2.0-new/src/kml/convenience/Makefile.in 2010-06-25 11:39:54.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18832,7 +17744,7 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
-@@ -53,15 +55,30 @@
+@@ -55,15 +57,30 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -18865,7 +17777,7 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
libkmlconvenience_la_LIBADD =
am_libkmlconvenience_la_OBJECTS = atom_util.lo convenience.lo \
-@@ -194,6 +211,7 @@
+@@ -235,6 +252,7 @@
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@@ -18873,7 +17785,7 @@
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -217,10 +235,11 @@
+@@ -263,10 +281,11 @@
$(google_spreadsheets_test_SOURCES) \
$(gpx_trk_pt_handler_test_SOURCES) $(http_client_test_SOURCES) \
$(kmz_check_links_test_SOURCES)
@@ -18886,7 +17798,7 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
-@@ -284,6 +303,7 @@
+@@ -330,6 +349,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18894,7 +17806,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PLATFORM = @PLATFORM@
-@@ -357,8 +377,8 @@
+@@ -403,8 +423,8 @@
-I$(top_srcdir)/third_party/boost_1_34_1 \
-I$(top_srcdir)/third_party/googletest-r108/include
@@ -18902,10 +17814,10 @@
- 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
- EXTRA_DIST = \
- http_client_test_util.h
-@@ -481,9 +501,9 @@
+ # 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.
+@@ -560,9 +580,9 @@
exit 1;; \
esac; \
done; \
@@ -18918,7 +17830,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -501,23 +521,28 @@
+@@ -580,23 +600,28 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18956,7 +17868,7 @@
done
clean-libLTLIBRARIES:
-@@ -532,11 +557,13 @@
+@@ -611,11 +636,13 @@
$(CXXLINK) -rpath $(libdir) $(libkmlconvenience_la_OBJECTS) $(libkmlconvenience_la_LIBADD) $(LIBS)
clean-checkPROGRAMS:
@@ -18975,7 +17887,7 @@
atom_util_test$(EXEEXT): $(atom_util_test_OBJECTS) $(atom_util_test_DEPENDENCIES)
@rm -f atom_util_test$(EXEEXT)
$(atom_util_test_LINK) $(atom_util_test_OBJECTS) $(atom_util_test_LDADD) $(LIBS)
-@@ -595,161 +622,161 @@
+@@ -689,203 +716,203 @@
.cc.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -19049,6 +17961,22 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_file_test_CXXFLAGS) $(CXXFLAGS) -c -o csv_file_test-csv_file_test.obj `if test -f 'csv_file_test.cc'; then $(CYGPATH_W) 'csv_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/csv_file_test.cc'; fi`
+ csv_parser_test-csv_parser_test.o: csv_parser_test.cc
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_parser_test_CXXFLAGS) $(CXXFLAGS) -MT csv_parser_test-csv_parser_test.o -MD -MP -MF $(DEPDIR)/csv_parser_test-csv_parser_test.Tpo -c -o csv_parser_test-csv_parser_test.o `test -f 'csv_parser_test.cc' || echo '$(srcdir)/'`csv_parser_test.cc
+- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/csv_parser_test-csv_parser_test.Tpo $(DEPDIR)/csv_parser_test-csv_parser_test.Po
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/csv_parser_test-csv_parser_test.Tpo $(DEPDIR)/csv_parser_test-csv_parser_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='csv_parser_test.cc' object='csv_parser_test-csv_parser_test.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_parser_test_CXXFLAGS) $(CXXFLAGS) -c -o csv_parser_test-csv_parser_test.o `test -f 'csv_parser_test.cc' || echo '$(srcdir)/'`csv_parser_test.cc
+
+ csv_parser_test-csv_parser_test.obj: csv_parser_test.cc
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_parser_test_CXXFLAGS) $(CXXFLAGS) -MT csv_parser_test-csv_parser_test.obj -MD -MP -MF $(DEPDIR)/csv_parser_test-csv_parser_test.Tpo -c -o csv_parser_test-csv_parser_test.obj `if test -f 'csv_parser_test.cc'; then $(CYGPATH_W) 'csv_parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/csv_parser_test.cc'; fi`
+- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/csv_parser_test-csv_parser_test.Tpo $(DEPDIR)/csv_parser_test-csv_parser_test.Po
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/csv_parser_test-csv_parser_test.Tpo $(DEPDIR)/csv_parser_test-csv_parser_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='csv_parser_test.cc' object='csv_parser_test-csv_parser_test.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_parser_test_CXXFLAGS) $(CXXFLAGS) -c -o csv_parser_test-csv_parser_test.obj `if test -f 'csv_parser_test.cc'; then $(CYGPATH_W) 'csv_parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/csv_parser_test.cc'; fi`
+
element_counter_test-element_counter_test.o: element_counter_test.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_counter_test_CXXFLAGS) $(CXXFLAGS) -MT element_counter_test-element_counter_test.o -MD -MP -MF $(DEPDIR)/element_counter_test-element_counter_test.Tpo -c -o element_counter_test-element_counter_test.o `test -f 'element_counter_test.cc' || echo '$(srcdir)/'`element_counter_test.cc
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/element_counter_test-element_counter_test.Tpo $(DEPDIR)/element_counter_test-element_counter_test.Po
@@ -19081,6 +18009,22 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_test_CXXFLAGS) $(CXXFLAGS) -c -o feature_list_test-feature_list_test.obj `if test -f 'feature_list_test.cc'; then $(CYGPATH_W) 'feature_list_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_list_test.cc'; fi`
+ google_doc_list_test-google_doc_list_test.o: google_doc_list_test.cc
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_doc_list_test_CXXFLAGS) $(CXXFLAGS) -MT google_doc_list_test-google_doc_list_test.o -MD -MP -MF $(DEPDIR)/google_doc_list_test-google_doc_list_test.Tpo -c -o google_doc_list_test-google_doc_list_test.o `test -f 'google_doc_list_test.cc' || echo '$(srcdir)/'`google_doc_list_test.cc
+- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/google_doc_list_test-google_doc_list_test.Tpo $(DEPDIR)/google_doc_list_test-google_doc_list_test.Po
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/google_doc_list_test-google_doc_list_test.Tpo $(DEPDIR)/google_doc_list_test-google_doc_list_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google_doc_list_test.cc' object='google_doc_list_test-google_doc_list_test.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_doc_list_test_CXXFLAGS) $(CXXFLAGS) -c -o google_doc_list_test-google_doc_list_test.o `test -f 'google_doc_list_test.cc' || echo '$(srcdir)/'`google_doc_list_test.cc
+
+ google_doc_list_test-google_doc_list_test.obj: google_doc_list_test.cc
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_doc_list_test_CXXFLAGS) $(CXXFLAGS) -MT google_doc_list_test-google_doc_list_test.obj -MD -MP -MF $(DEPDIR)/google_doc_list_test-google_doc_list_test.Tpo -c -o google_doc_list_test-google_doc_list_test.obj `if test -f 'google_doc_list_test.cc'; then $(CYGPATH_W) 'google_doc_list_test.cc'; else $(CYGPATH_W) '$(srcdir)/google_doc_list_test.cc'; fi`
+- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/google_doc_list_test-google_doc_list_test.Tpo $(DEPDIR)/google_doc_list_test-google_doc_list_test.Po
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/google_doc_list_test-google_doc_list_test.Tpo $(DEPDIR)/google_doc_list_test-google_doc_list_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google_doc_list_test.cc' object='google_doc_list_test-google_doc_list_test.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_doc_list_test_CXXFLAGS) $(CXXFLAGS) -c -o google_doc_list_test-google_doc_list_test.obj `if test -f 'google_doc_list_test.cc'; then $(CYGPATH_W) 'google_doc_list_test.cc'; else $(CYGPATH_W) '$(srcdir)/google_doc_list_test.cc'; fi`
+
google_maps_data_test-google_maps_data_test.o: google_maps_data_test.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_maps_data_test_CXXFLAGS) $(CXXFLAGS) -MT google_maps_data_test-google_maps_data_test.o -MD -MP -MF $(DEPDIR)/google_maps_data_test-google_maps_data_test.Tpo -c -o google_maps_data_test-google_maps_data_test.o `test -f 'google_maps_data_test.cc' || echo '$(srcdir)/'`google_maps_data_test.cc
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/google_maps_data_test-google_maps_data_test.Tpo $(DEPDIR)/google_maps_data_test-google_maps_data_test.Po
@@ -19097,6 +18041,22 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_maps_data_test_CXXFLAGS) $(CXXFLAGS) -c -o google_maps_data_test-google_maps_data_test.obj `if test -f 'google_maps_data_test.cc'; then $(CYGPATH_W) 'google_maps_data_test.cc'; else $(CYGPATH_W) '$(srcdir)/google_maps_data_test.cc'; fi`
+ google_picasa_web_test-google_picasa_web_test.o: google_picasa_web_test.cc
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_picasa_web_test_CXXFLAGS) $(CXXFLAGS) -MT google_picasa_web_test-google_picasa_web_test.o -MD -MP -MF $(DEPDIR)/google_picasa_web_test-google_picasa_web_test.Tpo -c -o google_picasa_web_test-google_picasa_web_test.o `test -f 'google_picasa_web_test.cc' || echo '$(srcdir)/'`google_picasa_web_test.cc
+- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/google_picasa_web_test-google_picasa_web_test.Tpo $(DEPDIR)/google_picasa_web_test-google_picasa_web_test.Po
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/google_picasa_web_test-google_picasa_web_test.Tpo $(DEPDIR)/google_picasa_web_test-google_picasa_web_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google_picasa_web_test.cc' object='google_picasa_web_test-google_picasa_web_test.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_picasa_web_test_CXXFLAGS) $(CXXFLAGS) -c -o google_picasa_web_test-google_picasa_web_test.o `test -f 'google_picasa_web_test.cc' || echo '$(srcdir)/'`google_picasa_web_test.cc
+
+ google_picasa_web_test-google_picasa_web_test.obj: google_picasa_web_test.cc
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_picasa_web_test_CXXFLAGS) $(CXXFLAGS) -MT google_picasa_web_test-google_picasa_web_test.obj -MD -MP -MF $(DEPDIR)/google_picasa_web_test-google_picasa_web_test.Tpo -c -o google_picasa_web_test-google_picasa_web_test.obj `if test -f 'google_picasa_web_test.cc'; then $(CYGPATH_W) 'google_picasa_web_test.cc'; else $(CYGPATH_W) '$(srcdir)/google_picasa_web_test.cc'; fi`
+- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/google_picasa_web_test-google_picasa_web_test.Tpo $(DEPDIR)/google_picasa_web_test-google_picasa_web_test.Po
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/google_picasa_web_test-google_picasa_web_test.Tpo $(DEPDIR)/google_picasa_web_test-google_picasa_web_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google_picasa_web_test.cc' object='google_picasa_web_test-google_picasa_web_test.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_picasa_web_test_CXXFLAGS) $(CXXFLAGS) -c -o google_picasa_web_test-google_picasa_web_test.obj `if test -f 'google_picasa_web_test.cc'; then $(CYGPATH_W) 'google_picasa_web_test.cc'; else $(CYGPATH_W) '$(srcdir)/google_picasa_web_test.cc'; fi`
+
google_spreadsheets_test-google_spreadsheets_test.o: google_spreadsheets_test.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_spreadsheets_test_CXXFLAGS) $(CXXFLAGS) -MT google_spreadsheets_test-google_spreadsheets_test.o -MD -MP -MF $(DEPDIR)/google_spreadsheets_test-google_spreadsheets_test.Tpo -c -o google_spreadsheets_test-google_spreadsheets_test.o `test -f 'google_spreadsheets_test.cc' || echo '$(srcdir)/'`google_spreadsheets_test.cc
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/google_spreadsheets_test-google_spreadsheets_test.Tpo $(DEPDIR)/google_spreadsheets_test-google_spreadsheets_test.Po
@@ -19160,7 +18120,7 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='kmz_check_links_test.cc' object='kmz_check_links_test-kmz_check_links_test.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_check_links_test_CXXFLAGS) $(CXXFLAGS) -c -o kmz_check_links_test-kmz_check_links_test.obj `if test -f 'kmz_check_links_test.cc'; then $(CYGPATH_W) 'kmz_check_links_test.cc'; else $(CYGPATH_W) '$(srcdir)/kmz_check_links_test.cc'; fi`
-@@ -762,20 +789,23 @@
+@@ -898,20 +925,23 @@
install-libkmlconvenienceincludeHEADERS: $(libkmlconvenienceinclude_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(libkmlconvenienceincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmlconvenienceincludedir)"
@@ -19193,7 +18153,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -789,7 +819,7 @@
+@@ -925,7 +955,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -19202,7 +18162,7 @@
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -797,29 +827,34 @@
+@@ -933,29 +963,34 @@
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
@@ -19245,7 +18205,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -828,6 +863,7 @@
+@@ -964,6 +999,7 @@
@failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
@@ -19253,7 +18213,7 @@
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -839,10 +875,10 @@
+@@ -975,10 +1011,10 @@
*[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
@@ -19266,7 +18226,7 @@
;; \
esac; \
elif test $$? -ne 77; then \
-@@ -850,17 +886,18 @@
+@@ -986,17 +1022,18 @@
case " $(XFAIL_TESTS) " in \
*[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
@@ -19288,7 +18248,7 @@
done; \
if test "$$all" -eq 1; then \
tests="test"; \
-@@ -902,11 +939,15 @@
+@@ -1038,11 +1075,15 @@
dashes="$$report"; \
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
@@ -19306,7 +18266,7 @@
test "$$failed" -eq 0; \
else :; fi
-@@ -926,13 +967,17 @@
+@@ -1062,13 +1103,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -19328,7 +18288,7 @@
|| exit 1; \
fi; \
done
-@@ -966,6 +1011,7 @@
+@@ -1102,6 +1147,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -19336,7 +18296,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -987,6 +1033,8 @@
+@@ -1123,6 +1169,8 @@
html: html-am
@@ -19345,7 +18305,7 @@
info: info-am
info-am:
-@@ -995,18 +1043,28 @@
+@@ -1131,18 +1179,28 @@
install-dvi: install-dvi-am
@@ -19374,7 +18334,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -1030,7 +1088,7 @@
+@@ -1166,7 +1224,7 @@
uninstall-am: uninstall-libLTLIBRARIES \
uninstall-libkmlconvenienceincludeHEADERS
@@ -19383,7 +18343,7 @@
.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
-@@ -1049,6 +1107,7 @@
+@@ -1185,6 +1243,7 @@
uninstall-libLTLIBRARIES \
uninstall-libkmlconvenienceincludeHEADERS
@@ -19391,13 +18351,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/src/kml/dom/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/src/kml/dom/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/src/kml/dom/Makefile.in 2009-12-10 17:29:37.000000000 +0100
+diff -urN libkml-1.2.0/src/kml/dom/Makefile.in libkml-1.2.0-new/src/kml/dom/Makefile.in
+--- libkml-1.2.0/src/kml/dom/Makefile.in 2010-01-14 01:17:34.000000000 +0100
++++ libkml-1.2.0-new/src/kml/dom/Makefile.in 2010-06-25 11:39:55.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19418,7 +18377,7 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
-@@ -71,15 +73,30 @@
+@@ -72,15 +74,30 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -19451,7 +18410,7 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
libkmldom_la_LIBADD =
am_libkmldom_la_OBJECTS = abstractlatlonbox.lo abstractview.lo atom.lo \
-@@ -555,6 +572,7 @@
+@@ -575,6 +592,7 @@
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@@ -19459,8 +18418,8 @@
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -615,10 +633,11 @@
- $(unknown_test_SOURCES) $(vec2_test_SOURCES) \
+@@ -637,10 +655,11 @@
+ $(visitor_driver_test_SOURCES) $(visitor_test_SOURCES) \
$(xal_test_SOURCES) $(xml_serializer_test_SOURCES) \
$(xsd_test_SOURCES)
-libkmldomincludeHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -19472,7 +18431,7 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
-@@ -682,6 +701,7 @@
+@@ -704,6 +723,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19480,7 +18439,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PLATFORM = @PLATFORM@
-@@ -755,8 +775,8 @@
+@@ -777,8 +797,8 @@
-I$(top_srcdir)/third_party/boost_1_34_1 \
-I$(top_srcdir)/third_party/googletest-r108/include
@@ -19491,7 +18450,7 @@
lib_LTLIBRARIES = libkmldom.la
libkmldom_la_SOURCES = \
abstractlatlonbox.cc \
-@@ -1174,9 +1194,9 @@
+@@ -1213,9 +1233,9 @@
exit 1;; \
esac; \
done; \
@@ -19504,7 +18463,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -1194,23 +1214,28 @@
+@@ -1233,23 +1253,28 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19542,7 +18501,7 @@
done
clean-libLTLIBRARIES:
-@@ -1225,11 +1250,13 @@
+@@ -1264,11 +1289,13 @@
$(CXXLINK) -rpath $(libdir) $(libkmldom_la_OBJECTS) $(libkmldom_la_LIBADD) $(LIBS)
clean-checkPROGRAMS:
@@ -19561,7 +18520,7 @@
abstractlatlonbox_test$(EXEEXT): $(abstractlatlonbox_test_OBJECTS) $(abstractlatlonbox_test_DEPENDENCIES)
@rm -f abstractlatlonbox_test$(EXEEXT)
$(abstractlatlonbox_test_LINK) $(abstractlatlonbox_test_OBJECTS) $(abstractlatlonbox_test_LDADD) $(LIBS)
-@@ -1481,707 +1508,707 @@
+@@ -1531,735 +1558,735 @@
.cc.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -20323,6 +19282,38 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec2_test_CXXFLAGS) $(CXXFLAGS) -c -o vec2_test-vec2_test.obj `if test -f 'vec2_test.cc'; then $(CYGPATH_W) 'vec2_test.cc'; else $(CYGPATH_W) '$(srcdir)/vec2_test.cc'; fi`
+ visitor_driver_test-visitor_driver_test.o: visitor_driver_test.cc
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(visitor_driver_test_CXXFLAGS) $(CXXFLAGS) -MT visitor_driver_test-visitor_driver_test.o -MD -MP -MF $(DEPDIR)/visitor_driver_test-visitor_driver_test.Tpo -c -o visitor_driver_test-visitor_driver_test.o `test -f 'visitor_driver_test.cc' || echo '$(srcdir)/'`visitor_driver_test.cc
+- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/visitor_driver_test-visitor_driver_test.Tpo $(DEPDIR)/visitor_driver_test-visitor_driver_test.Po
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/visitor_driver_test-visitor_driver_test.Tpo $(DEPDIR)/visitor_driver_test-visitor_driver_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='visitor_driver_test.cc' object='visitor_driver_test-visitor_driver_test.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(visitor_driver_test_CXXFLAGS) $(CXXFLAGS) -c -o visitor_driver_test-visitor_driver_test.o `test -f 'visitor_driver_test.cc' || echo '$(srcdir)/'`visitor_driver_test.cc
+
+ visitor_driver_test-visitor_driver_test.obj: visitor_driver_test.cc
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(visitor_driver_test_CXXFLAGS) $(CXXFLAGS) -MT visitor_driver_test-visitor_driver_test.obj -MD -MP -MF $(DEPDIR)/visitor_driver_test-visitor_driver_test.Tpo -c -o visitor_driver_test-visitor_driver_test.obj `if test -f 'visitor_driver_test.cc'; then $(CYGPATH_W) 'visitor_driver_test.cc'; else $(CYGPATH_W) '$(srcdir)/visitor_driver_test.cc'; fi`
+- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/visitor_driver_test-visitor_driver_test.Tpo $(DEPDIR)/visitor_driver_test-visitor_driver_test.Po
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/visitor_driver_test-visitor_driver_test.Tpo $(DEPDIR)/visitor_driver_test-visitor_driver_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='visitor_driver_test.cc' object='visitor_driver_test-visitor_driver_test.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(visitor_driver_test_CXXFLAGS) $(CXXFLAGS) -c -o visitor_driver_test-visitor_driver_test.obj `if test -f 'visitor_driver_test.cc'; then $(CYGPATH_W) 'visitor_driver_test.cc'; else $(CYGPATH_W) '$(srcdir)/visitor_driver_test.cc'; fi`
+
+ visitor_test-visitor_test.o: visitor_test.cc
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(visitor_test_CXXFLAGS) $(CXXFLAGS) -MT visitor_test-visitor_test.o -MD -MP -MF $(DEPDIR)/visitor_test-visitor_test.Tpo -c -o visitor_test-visitor_test.o `test -f 'visitor_test.cc' || echo '$(srcdir)/'`visitor_test.cc
+- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/visitor_test-visitor_test.Tpo $(DEPDIR)/visitor_test-visitor_test.Po
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/visitor_test-visitor_test.Tpo $(DEPDIR)/visitor_test-visitor_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='visitor_test.cc' object='visitor_test-visitor_test.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(visitor_test_CXXFLAGS) $(CXXFLAGS) -c -o visitor_test-visitor_test.o `test -f 'visitor_test.cc' || echo '$(srcdir)/'`visitor_test.cc
+
+ visitor_test-visitor_test.obj: visitor_test.cc
+ @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(visitor_test_CXXFLAGS) $(CXXFLAGS) -MT visitor_test-visitor_test.obj -MD -MP -MF $(DEPDIR)/visitor_test-visitor_test.Tpo -c -o visitor_test-visitor_test.obj `if test -f 'visitor_test.cc'; then $(CYGPATH_W) 'visitor_test.cc'; else $(CYGPATH_W) '$(srcdir)/visitor_test.cc'; fi`
+- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/visitor_test-visitor_test.Tpo $(DEPDIR)/visitor_test-visitor_test.Po
++ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/visitor_test-visitor_test.Tpo $(DEPDIR)/visitor_test-visitor_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='visitor_test.cc' object='visitor_test-visitor_test.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(visitor_test_CXXFLAGS) $(CXXFLAGS) -c -o visitor_test-visitor_test.obj `if test -f 'visitor_test.cc'; then $(CYGPATH_W) 'visitor_test.cc'; else $(CYGPATH_W) '$(srcdir)/visitor_test.cc'; fi`
+
xal_test-xal_test.o: xal_test.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xal_test_CXXFLAGS) $(CXXFLAGS) -MT xal_test-xal_test.o -MD -MP -MF $(DEPDIR)/xal_test-xal_test.Tpo -c -o xal_test-xal_test.o `test -f 'xal_test.cc' || echo '$(srcdir)/'`xal_test.cc
- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/xal_test-xal_test.Tpo $(DEPDIR)/xal_test-xal_test.Po
@@ -20370,7 +19361,7 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='xsd_test.cc' object='xsd_test-xsd_test.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_test-xsd_test.obj `if test -f 'xsd_test.cc'; then $(CYGPATH_W) 'xsd_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_test.cc'; fi`
-@@ -2194,20 +2221,23 @@
+@@ -2272,20 +2299,23 @@
install-libkmldomincludeHEADERS: $(libkmldominclude_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(libkmldomincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmldomincludedir)"
@@ -20403,7 +19394,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -2221,7 +2251,7 @@
+@@ -2299,7 +2329,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -20412,7 +19403,7 @@
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -2229,29 +2259,34 @@
+@@ -2307,29 +2337,34 @@
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
@@ -20455,7 +19446,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -2260,6 +2295,7 @@
+@@ -2338,6 +2373,7 @@
@failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
@@ -20463,7 +19454,7 @@
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -2271,10 +2307,10 @@
+@@ -2349,10 +2385,10 @@
*[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
@@ -20476,7 +19467,7 @@
;; \
esac; \
elif test $$? -ne 77; then \
-@@ -2282,17 +2318,18 @@
+@@ -2360,17 +2396,18 @@
case " $(XFAIL_TESTS) " in \
*[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
@@ -20498,7 +19489,7 @@
done; \
if test "$$all" -eq 1; then \
tests="test"; \
-@@ -2334,11 +2371,15 @@
+@@ -2412,11 +2449,15 @@
dashes="$$report"; \
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
@@ -20516,7 +19507,7 @@
test "$$failed" -eq 0; \
else :; fi
-@@ -2358,13 +2399,17 @@
+@@ -2436,13 +2477,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -20538,7 +19529,7 @@
|| exit 1; \
fi; \
done
-@@ -2398,6 +2443,7 @@
+@@ -2476,6 +2521,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -20546,7 +19537,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -2419,6 +2465,8 @@
+@@ -2497,6 +2543,8 @@
html: html-am
@@ -20555,7 +19546,7 @@
info: info-am
info-am:
-@@ -2427,18 +2475,28 @@
+@@ -2505,18 +2553,28 @@
install-dvi: install-dvi-am
@@ -20584,7 +19575,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -2462,7 +2520,7 @@
+@@ -2540,7 +2598,7 @@
uninstall-am: uninstall-libLTLIBRARIES \
uninstall-libkmldomincludeHEADERS
@@ -20593,7 +19584,7 @@
.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
-@@ -2480,6 +2538,7 @@
+@@ -2558,6 +2616,7 @@
tags uninstall uninstall-am uninstall-libLTLIBRARIES \
uninstall-libkmldomincludeHEADERS
@@ -20601,13 +19592,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/src/kml/engine/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/src/kml/engine/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/src/kml/engine/Makefile.in 2009-12-10 17:29:37.000000000 +0100
+diff -urN libkml-1.2.0/src/kml/engine/Makefile.in libkml-1.2.0-new/src/kml/engine/Makefile.in
+--- libkml-1.2.0/src/kml/engine/Makefile.in 2010-01-14 01:17:34.000000000 +0100
++++ libkml-1.2.0-new/src/kml/engine/Makefile.in 2010-06-25 11:39:55.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21559,13 +20549,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/src/kml/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/src/kml/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/src/kml/Makefile.in 2009-12-10 17:29:36.000000000 +0100
+diff -urN libkml-1.2.0/src/kml/Makefile.in libkml-1.2.0-new/src/kml/Makefile.in
+--- libkml-1.2.0/src/kml/Makefile.in 2010-01-14 01:17:33.000000000 +0100
++++ libkml-1.2.0-new/src/kml/Makefile.in 2010-06-25 11:39:54.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21717,6 +20706,15 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
+@@ -268,7 +318,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -285,7 +335,7 @@
else \
local_target="$$target"; \
@@ -21726,6 +20724,15 @@
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
+@@ -293,7 +343,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -319,16 +369,16 @@
else \
local_target="$$target"; \
@@ -21927,13 +20934,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/src/kml/regionator/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/src/kml/regionator/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/src/kml/regionator/Makefile.in 2009-12-10 17:29:37.000000000 +0100
+diff -urN libkml-1.2.0/src/kml/regionator/Makefile.in libkml-1.2.0-new/src/kml/regionator/Makefile.in
+--- libkml-1.2.0/src/kml/regionator/Makefile.in 2010-02-18 21:09:52.000000000 +0100
++++ libkml-1.2.0-new/src/kml/regionator/Makefile.in 2010-06-25 11:39:55.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22027,7 +21033,7 @@
lib_LTLIBRARIES = libkmlregionator.la
libkmlregionator_la_SOURCES = \
feature_list_region_handler.cc \
-@@ -347,9 +367,9 @@
+@@ -348,9 +368,9 @@
exit 1;; \
esac; \
done; \
@@ -22040,7 +21046,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -367,23 +387,28 @@
+@@ -368,23 +388,28 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22078,7 +21084,7 @@
done
clean-libLTLIBRARIES:
-@@ -398,11 +423,13 @@
+@@ -399,11 +424,13 @@
$(CXXLINK) -rpath $(libdir) $(libkmlregionator_la_OBJECTS) $(libkmlregionator_la_LIBADD) $(LIBS)
clean-checkPROGRAMS:
@@ -22097,7 +21103,7 @@
feature_list_region_handler_test$(EXEEXT): $(feature_list_region_handler_test_OBJECTS) $(feature_list_region_handler_test_DEPENDENCIES)
@rm -f feature_list_region_handler_test$(EXEEXT)
$(feature_list_region_handler_test_LINK) $(feature_list_region_handler_test_OBJECTS) $(feature_list_region_handler_test_LDADD) $(LIBS)
-@@ -432,77 +459,77 @@
+@@ -433,77 +460,77 @@
.cc.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -22186,7 +21192,7 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='regionator_util_test.cc' object='regionator_util_test-regionator_util_test.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_util_test_CXXFLAGS) $(CXXFLAGS) -c -o regionator_util_test-regionator_util_test.obj `if test -f 'regionator_util_test.cc'; then $(CYGPATH_W) 'regionator_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/regionator_util_test.cc'; fi`
-@@ -515,20 +542,23 @@
+@@ -516,20 +543,23 @@
install-libkmlregionatorincludeHEADERS: $(libkmlregionatorinclude_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(libkmlregionatorincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmlregionatorincludedir)"
@@ -22219,7 +21225,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -542,7 +572,7 @@
+@@ -543,7 +573,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -22228,7 +21234,7 @@
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -550,29 +580,34 @@
+@@ -551,29 +581,34 @@
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
@@ -22271,7 +21277,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -581,6 +616,7 @@
+@@ -582,6 +617,7 @@
@failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
@@ -22279,7 +21285,7 @@
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -592,10 +628,10 @@
+@@ -593,10 +629,10 @@
*[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
@@ -22292,7 +21298,7 @@
;; \
esac; \
elif test $$? -ne 77; then \
-@@ -603,17 +639,18 @@
+@@ -604,17 +640,18 @@
case " $(XFAIL_TESTS) " in \
*[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
@@ -22314,7 +21320,7 @@
done; \
if test "$$all" -eq 1; then \
tests="test"; \
-@@ -655,11 +692,15 @@
+@@ -656,11 +693,15 @@
dashes="$$report"; \
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
@@ -22332,7 +21338,7 @@
test "$$failed" -eq 0; \
else :; fi
-@@ -679,13 +720,17 @@
+@@ -680,13 +721,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -22354,7 +21360,7 @@
|| exit 1; \
fi; \
done
-@@ -719,6 +764,7 @@
+@@ -720,6 +765,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -22362,7 +21368,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -740,6 +786,8 @@
+@@ -741,6 +787,8 @@
html: html-am
@@ -22371,7 +21377,7 @@
info: info-am
info-am:
-@@ -748,18 +796,28 @@
+@@ -749,18 +797,28 @@
install-dvi: install-dvi-am
@@ -22400,7 +21406,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -783,7 +841,7 @@
+@@ -784,7 +842,7 @@
uninstall-am: uninstall-libLTLIBRARIES \
uninstall-libkmlregionatorincludeHEADERS
@@ -22409,7 +21415,7 @@
.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
-@@ -801,6 +859,7 @@
+@@ -802,6 +860,7 @@
tags uninstall uninstall-am uninstall-libLTLIBRARIES \
uninstall-libkmlregionatorincludeHEADERS
@@ -22417,13 +21423,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/src/kml/xsd/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/src/kml/xsd/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/src/kml/xsd/Makefile.in 2009-12-10 17:29:37.000000000 +0100
+diff -urN libkml-1.2.0/src/kml/xsd/Makefile.in libkml-1.2.0-new/src/kml/xsd/Makefile.in
+--- libkml-1.2.0/src/kml/xsd/Makefile.in 2010-01-14 01:17:35.000000000 +0100
++++ libkml-1.2.0-new/src/kml/xsd/Makefile.in 2010-06-25 11:39:55.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22987,13 +21992,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/src/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/src/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/src/Makefile.in 2009-12-10 17:29:36.000000000 +0100
+diff -urN libkml-1.2.0/src/Makefile.in libkml-1.2.0-new/src/Makefile.in
+--- libkml-1.2.0/src/Makefile.in 2010-01-14 01:17:32.000000000 +0100
++++ libkml-1.2.0-new/src/Makefile.in 2010-06-25 11:39:54.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23090,6 +22094,15 @@
mostlyclean-libtool:
-rm -f *.lo
+@@ -242,7 +275,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -259,7 +292,7 @@
else \
local_target="$$target"; \
@@ -23099,6 +22112,15 @@
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
+@@ -267,7 +300,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -293,16 +326,16 @@
else \
local_target="$$target"; \
@@ -23300,13 +22322,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/src/swig/java/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/src/swig/java/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/src/swig/java/Makefile.in 2009-12-10 17:29:38.000000000 +0100
+diff -urN libkml-1.2.0/src/swig/java/Makefile.in libkml-1.2.0-new/src/swig/java/Makefile.in
+--- libkml-1.2.0/src/swig/java/Makefile.in 2010-01-14 01:17:35.000000000 +0100
++++ libkml-1.2.0-new/src/swig/java/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23440,13 +22461,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/src/swig/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/src/swig/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/src/swig/Makefile.in 2009-12-10 17:29:38.000000000 +0100
+diff -urN libkml-1.2.0/src/swig/Makefile.in libkml-1.2.0-new/src/swig/Makefile.in
+--- libkml-1.2.0/src/swig/Makefile.in 2010-01-14 01:17:35.000000000 +0100
++++ libkml-1.2.0-new/src/swig/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23565,7 +22585,7 @@
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.1/include
+- -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 \
@@ -23771,6 +22791,15 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
+@@ -529,7 +584,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -546,7 +601,7 @@
else \
local_target="$$target"; \
@@ -23780,6 +22809,15 @@
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
+@@ -554,7 +609,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -580,16 +635,16 @@
else \
local_target="$$target"; \
@@ -23981,13 +23019,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/src/swig/python/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/src/swig/python/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/src/swig/python/Makefile.in 2009-12-10 17:29:38.000000000 +0100
+diff -urN libkml-1.2.0/src/swig/python/Makefile.in libkml-1.2.0-new/src/swig/python/Makefile.in
+--- libkml-1.2.0/src/swig/python/Makefile.in 2010-01-14 01:17:35.000000000 +0100
++++ libkml-1.2.0-new/src/swig/python/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24121,13 +23158,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/atom/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/atom/Makefile.in 2009-12-10 13:05:41.000000000 +0100
-+++ libkml-1.1.0/testdata/atom/Makefile.in 2009-12-10 17:29:38.000000000 +0100
+diff -urN libkml-1.2.0/testdata/atom/Makefile.in libkml-1.2.0-new/testdata/atom/Makefile.in
+--- libkml-1.2.0/testdata/atom/Makefile.in 2010-01-14 01:17:35.000000000 +0100
++++ libkml-1.2.0-new/testdata/atom/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24164,7 +23200,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PLATFORM = @PLATFORM@
-@@ -193,9 +197,9 @@
+@@ -198,9 +202,9 @@
exit 1;; \
esac; \
done; \
@@ -24177,7 +23213,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -213,6 +217,7 @@
+@@ -218,6 +222,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24185,7 +23221,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -242,13 +247,17 @@
+@@ -247,13 +252,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -24207,7 +23243,7 @@
|| exit 1; \
fi; \
done
-@@ -276,6 +285,7 @@
+@@ -281,6 +290,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -24215,7 +23251,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -294,6 +304,8 @@
+@@ -299,6 +309,8 @@
html: html-am
@@ -24224,7 +23260,7 @@
info: info-am
info-am:
-@@ -302,18 +314,28 @@
+@@ -307,18 +319,28 @@
install-dvi: install-dvi-am
@@ -24253,7 +23289,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -347,6 +369,7 @@
+@@ -352,6 +374,7 @@
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
@@ -24261,13 +23297,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/balloon/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/balloon/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/testdata/balloon/Makefile.in 2009-12-10 17:29:38.000000000 +0100
+diff -urN libkml-1.2.0/testdata/balloon/Makefile.in libkml-1.2.0-new/testdata/balloon/Makefile.in
+--- libkml-1.2.0/testdata/balloon/Makefile.in 2010-01-14 01:17:35.000000000 +0100
++++ libkml-1.2.0-new/testdata/balloon/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24401,13 +23436,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/csv/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/csv/Makefile.in 2009-12-10 13:05:41.000000000 +0100
-+++ libkml-1.1.0/testdata/csv/Makefile.in 2009-12-10 17:29:38.000000000 +0100
+diff -urN libkml-1.2.0/testdata/csv/Makefile.in libkml-1.2.0-new/testdata/csv/Makefile.in
+--- libkml-1.2.0/testdata/csv/Makefile.in 2010-02-19 00:37:43.000000000 +0100
++++ libkml-1.2.0-new/testdata/csv/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24444,7 +23478,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PLATFORM = @PLATFORM@
-@@ -193,9 +197,9 @@
+@@ -199,9 +203,9 @@
exit 1;; \
esac; \
done; \
@@ -24457,7 +23491,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -213,6 +217,7 @@
+@@ -219,6 +223,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24465,7 +23499,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -242,13 +247,17 @@
+@@ -248,13 +253,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -24487,7 +23521,7 @@
|| exit 1; \
fi; \
done
-@@ -276,6 +285,7 @@
+@@ -282,6 +291,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -24495,7 +23529,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -294,6 +304,8 @@
+@@ -300,6 +310,8 @@
html: html-am
@@ -24504,7 +23538,7 @@
info: info-am
info-am:
-@@ -302,18 +314,28 @@
+@@ -308,18 +320,28 @@
install-dvi: install-dvi-am
@@ -24533,7 +23567,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -347,6 +369,7 @@
+@@ -353,6 +375,7 @@
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
@@ -24541,13 +23575,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/deprecated/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/deprecated/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/testdata/deprecated/Makefile.in 2009-12-10 17:29:38.000000000 +0100
+diff -urN libkml-1.2.0/testdata/deprecated/Makefile.in libkml-1.2.0-new/testdata/deprecated/Makefile.in
+--- libkml-1.2.0/testdata/deprecated/Makefile.in 2010-01-14 01:17:35.000000000 +0100
++++ libkml-1.2.0-new/testdata/deprecated/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24681,13 +23714,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/gmaps/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/gmaps/Makefile.in 2009-12-10 13:05:41.000000000 +0100
-+++ libkml-1.1.0/testdata/gmaps/Makefile.in 2009-12-10 17:29:38.000000000 +0100
+diff -urN libkml-1.2.0/testdata/gdata/Makefile.in libkml-1.2.0-new/testdata/gdata/Makefile.in
+--- libkml-1.2.0/testdata/gdata/Makefile.in 2010-01-14 01:17:35.000000000 +0100
++++ libkml-1.2.0-new/testdata/gdata/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24724,6 +23756,145 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PLATFORM = @PLATFORM@
+@@ -197,9 +201,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testdata/gdata/Makefile'; \
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu testdata/gdata/Makefile
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testdata/gdata/Makefile'; \
++ $(am__cd) $(top_srcdir) && \
++ $(AUTOMAKE) --gnu testdata/gdata/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+@@ -217,6 +221,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(am__aclocal_m4_deps):
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -246,13 +251,17 @@
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test -d "$(distdir)/$$file"; then \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+- test -f $(distdir)/$$file \
+- || cp -p $$d/$$file $(distdir)/$$file \
++ test -f "$(distdir)/$$file" \
++ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+@@ -280,6 +289,7 @@
+
+ distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -298,6 +308,8 @@
+
+ html: html-am
+
++html-am:
++
+ info: info-am
+
+ info-am:
+@@ -306,18 +318,28 @@
+
+ install-dvi: install-dvi-am
+
++install-dvi-am:
++
+ install-exec-am:
+
+ install-html: install-html-am
+
++install-html-am:
++
+ install-info: install-info-am
+
++install-info-am:
++
+ install-man:
+
+ install-pdf: install-pdf-am
+
++install-pdf-am:
++
+ install-ps: install-ps-am
+
++install-ps-am:
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -351,6 +373,7 @@
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -urN libkml-1.2.0/testdata/gmaps/Makefile.in libkml-1.2.0-new/testdata/gmaps/Makefile.in
+--- libkml-1.2.0/testdata/gmaps/Makefile.in 2010-01-14 01:17:36.000000000 +0100
++++ libkml-1.2.0-new/testdata/gmaps/Makefile.in 2010-06-25 11:39:56.000000000 +0200
+@@ -1,8 +1,9 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,8 +16,9 @@
+ @SET_MAKE@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -43,6 +45,7 @@
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
++CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -108,6 +111,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PLATFORM = @PLATFORM@
@@ -192,9 +196,9 @@
exit 1;; \
esac; \
@@ -24821,13 +23992,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/gpx/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/gpx/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/testdata/gpx/Makefile.in 2009-12-10 17:29:38.000000000 +0100
+diff -urN libkml-1.2.0/testdata/gpx/Makefile.in libkml-1.2.0-new/testdata/gpx/Makefile.in
+--- libkml-1.2.0/testdata/gpx/Makefile.in 2010-01-14 01:17:36.000000000 +0100
++++ libkml-1.2.0-new/testdata/gpx/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24961,13 +24131,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/gx/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/gx/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/testdata/gx/Makefile.in 2009-12-10 17:29:38.000000000 +0100
+diff -urN libkml-1.2.0/testdata/gx/Makefile.in libkml-1.2.0-new/testdata/gx/Makefile.in
+--- libkml-1.2.0/testdata/gx/Makefile.in 2010-01-14 01:17:36.000000000 +0100
++++ libkml-1.2.0-new/testdata/gx/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25101,13 +24270,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/kml/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/kml/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/testdata/kml/Makefile.in 2009-12-10 17:29:38.000000000 +0100
+diff -urN libkml-1.2.0/testdata/kml/Makefile.in libkml-1.2.0-new/testdata/kml/Makefile.in
+--- libkml-1.2.0/testdata/kml/Makefile.in 2010-02-18 21:10:25.000000000 +0100
++++ libkml-1.2.0-new/testdata/kml/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25144,7 +24312,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PLATFORM = @PLATFORM@
-@@ -198,9 +202,9 @@
+@@ -213,9 +217,9 @@
exit 1;; \
esac; \
done; \
@@ -25157,7 +24325,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -218,6 +222,7 @@
+@@ -233,6 +237,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25165,7 +24333,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -247,13 +252,17 @@
+@@ -262,13 +267,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -25187,7 +24355,7 @@
|| exit 1; \
fi; \
done
-@@ -281,6 +290,7 @@
+@@ -296,6 +305,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -25195,7 +24363,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -299,6 +309,8 @@
+@@ -314,6 +324,8 @@
html: html-am
@@ -25204,7 +24372,7 @@
info: info-am
info-am:
-@@ -307,18 +319,28 @@
+@@ -322,18 +334,28 @@
install-dvi: install-dvi-am
@@ -25233,7 +24401,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -352,6 +374,7 @@
+@@ -367,6 +389,7 @@
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
@@ -25241,13 +24409,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/kmz/files/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/kmz/files/Makefile.in 2009-12-10 13:05:41.000000000 +0100
-+++ libkml-1.1.0/testdata/kmz/files/Makefile.in 2009-12-10 17:29:39.000000000 +0100
+diff -urN libkml-1.2.0/testdata/kmz/files/Makefile.in libkml-1.2.0-new/testdata/kmz/files/Makefile.in
+--- libkml-1.2.0/testdata/kmz/files/Makefile.in 2010-01-14 01:17:36.000000000 +0100
++++ libkml-1.2.0-new/testdata/kmz/files/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25381,13 +24548,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/kmz/kmzfiles/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/kmz/kmzfiles/Makefile.in 2009-12-10 13:05:41.000000000 +0100
-+++ libkml-1.1.0/testdata/kmz/kmzfiles/Makefile.in 2009-12-10 17:29:39.000000000 +0100
+diff -urN libkml-1.2.0/testdata/kmz/kmzfiles/Makefile.in libkml-1.2.0-new/testdata/kmz/kmzfiles/Makefile.in
+--- libkml-1.2.0/testdata/kmz/kmzfiles/Makefile.in 2010-01-14 01:17:36.000000000 +0100
++++ libkml-1.2.0-new/testdata/kmz/kmzfiles/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25521,13 +24687,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/kmz/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/kmz/Makefile.in 2009-12-10 13:05:41.000000000 +0100
-+++ libkml-1.1.0/testdata/kmz/Makefile.in 2009-12-10 17:29:38.000000000 +0100
+diff -urN libkml-1.2.0/testdata/kmz/Makefile.in libkml-1.2.0-new/testdata/kmz/Makefile.in
+--- libkml-1.2.0/testdata/kmz/Makefile.in 2010-01-14 01:17:36.000000000 +0100
++++ libkml-1.2.0-new/testdata/kmz/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25624,6 +24789,15 @@
mostlyclean-libtool:
-rm -f *.lo
+@@ -259,7 +292,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -276,7 +309,7 @@
else \
local_target="$$target"; \
@@ -25633,6 +24807,15 @@
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
+@@ -284,7 +317,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -310,16 +343,16 @@
else \
local_target="$$target"; \
@@ -25834,13 +25017,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/kmz/rumsey/imagery/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/kmz/rumsey/imagery/Makefile.in 2009-12-10 13:05:41.000000000 +0100
-+++ libkml-1.1.0/testdata/kmz/rumsey/imagery/Makefile.in 2009-12-10 17:29:39.000000000 +0100
+diff -urN libkml-1.2.0/testdata/kmz/rumsey/imagery/Makefile.in libkml-1.2.0-new/testdata/kmz/rumsey/imagery/Makefile.in
+--- libkml-1.2.0/testdata/kmz/rumsey/imagery/Makefile.in 2010-01-14 01:17:36.000000000 +0100
++++ libkml-1.2.0-new/testdata/kmz/rumsey/imagery/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25974,13 +25156,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/kmz/rumsey/kml/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/kmz/rumsey/kml/Makefile.in 2009-12-10 13:05:41.000000000 +0100
-+++ libkml-1.1.0/testdata/kmz/rumsey/kml/Makefile.in 2009-12-10 17:29:39.000000000 +0100
+diff -urN libkml-1.2.0/testdata/kmz/rumsey/kml/Makefile.in libkml-1.2.0-new/testdata/kmz/rumsey/kml/Makefile.in
+--- libkml-1.2.0/testdata/kmz/rumsey/kml/Makefile.in 2010-01-14 01:17:36.000000000 +0100
++++ libkml-1.2.0-new/testdata/kmz/rumsey/kml/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26114,13 +25295,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/kmz/rumsey/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/kmz/rumsey/Makefile.in 2009-12-10 13:05:41.000000000 +0100
-+++ libkml-1.1.0/testdata/kmz/rumsey/Makefile.in 2009-12-10 17:29:39.000000000 +0100
+diff -urN libkml-1.2.0/testdata/kmz/rumsey/Makefile.in libkml-1.2.0-new/testdata/kmz/rumsey/Makefile.in
+--- libkml-1.2.0/testdata/kmz/rumsey/Makefile.in 2010-01-14 01:17:36.000000000 +0100
++++ libkml-1.2.0-new/testdata/kmz/rumsey/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26217,6 +25397,15 @@
mostlyclean-libtool:
-rm -f *.lo
+@@ -236,7 +269,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -253,7 +286,7 @@
else \
local_target="$$target"; \
@@ -26226,6 +25415,15 @@
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
+@@ -261,7 +294,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -287,16 +320,16 @@
else \
local_target="$$target"; \
@@ -26427,13 +25625,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/links/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/links/Makefile.in 2009-12-10 13:05:41.000000000 +0100
-+++ libkml-1.1.0/testdata/links/Makefile.in 2009-12-10 17:29:39.000000000 +0100
+diff -urN libkml-1.2.0/testdata/links/Makefile.in libkml-1.2.0-new/testdata/links/Makefile.in
+--- libkml-1.2.0/testdata/links/Makefile.in 2010-01-14 01:17:36.000000000 +0100
++++ libkml-1.2.0-new/testdata/links/Makefile.in 2010-06-25 11:39:57.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26567,13 +25764,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/testdata/Makefile.in 2009-12-10 17:29:38.000000000 +0100
+diff -urN libkml-1.2.0/testdata/Makefile.in libkml-1.2.0-new/testdata/Makefile.in
+--- libkml-1.2.0/testdata/Makefile.in 2010-01-14 01:17:35.000000000 +0100
++++ libkml-1.2.0-new/testdata/Makefile.in 2010-06-25 11:39:56.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26670,6 +25866,15 @@
mostlyclean-libtool:
-rm -f *.lo
+@@ -239,7 +272,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -256,7 +289,7 @@
else \
local_target="$$target"; \
@@ -26679,6 +25884,15 @@
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
+@@ -264,7 +297,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -290,16 +323,16 @@
else \
local_target="$$target"; \
@@ -26880,13 +26094,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/style/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/style/Makefile.in 2009-12-10 13:05:41.000000000 +0100
-+++ libkml-1.1.0/testdata/style/Makefile.in 2009-12-10 17:29:39.000000000 +0100
+diff -urN libkml-1.2.0/testdata/style/Makefile.in libkml-1.2.0-new/testdata/style/Makefile.in
+--- libkml-1.2.0/testdata/style/Makefile.in 2010-01-14 01:17:36.000000000 +0100
++++ libkml-1.2.0-new/testdata/style/Makefile.in 2010-06-25 11:39:57.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26983,6 +26196,15 @@
mostlyclean-libtool:
-rm -f *.lo
+@@ -269,7 +302,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -286,7 +319,7 @@
else \
local_target="$$target"; \
@@ -26992,6 +26214,15 @@
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
+@@ -294,7 +327,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -320,16 +353,16 @@
else \
local_target="$$target"; \
@@ -27193,13 +26424,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/style/weather/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/style/weather/Makefile.in 2009-12-10 13:05:41.000000000 +0100
-+++ libkml-1.1.0/testdata/style/weather/Makefile.in 2009-12-10 17:29:39.000000000 +0100
+diff -urN libkml-1.2.0/testdata/style/weather/Makefile.in libkml-1.2.0-new/testdata/style/weather/Makefile.in
+--- libkml-1.2.0/testdata/style/weather/Makefile.in 2010-01-14 01:17:37.000000000 +0100
++++ libkml-1.2.0-new/testdata/style/weather/Makefile.in 2010-06-25 11:39:57.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27333,13 +26563,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/update/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/update/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/testdata/update/Makefile.in 2009-12-10 17:29:39.000000000 +0100
+diff -urN libkml-1.2.0/testdata/update/Makefile.in libkml-1.2.0-new/testdata/update/Makefile.in
+--- libkml-1.2.0/testdata/update/Makefile.in 2010-01-14 01:17:37.000000000 +0100
++++ libkml-1.2.0-new/testdata/update/Makefile.in 2010-06-25 11:39:57.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27473,13 +26702,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/xal/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/xal/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/testdata/xal/Makefile.in 2009-12-10 17:29:39.000000000 +0100
+diff -urN libkml-1.2.0/testdata/xal/Makefile.in libkml-1.2.0-new/testdata/xal/Makefile.in
+--- libkml-1.2.0/testdata/xal/Makefile.in 2010-01-14 01:17:37.000000000 +0100
++++ libkml-1.2.0-new/testdata/xal/Makefile.in 2010-06-25 11:39:57.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27613,13 +26841,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/testdata/xsd/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/testdata/xsd/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/testdata/xsd/Makefile.in 2009-12-10 17:29:39.000000000 +0100
+diff -urN libkml-1.2.0/testdata/xsd/Makefile.in libkml-1.2.0-new/testdata/xsd/Makefile.in
+--- libkml-1.2.0/testdata/xsd/Makefile.in 2010-01-14 01:17:37.000000000 +0100
++++ libkml-1.2.0-new/testdata/xsd/Makefile.in 2010-06-25 11:39:57.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27753,13 +26980,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/third_party/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/third_party/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/third_party/Makefile.in 2009-12-10 17:29:40.000000000 +0100
+diff -urN libkml-1.2.0/third_party/Makefile.in libkml-1.2.0-new/third_party/Makefile.in
+--- libkml-1.2.0/third_party/Makefile.in 2010-02-18 21:09:44.000000000 +0100
++++ libkml-1.2.0-new/third_party/Makefile.in 2010-06-25 11:39:57.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27780,17 +27006,7 @@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
-@@ -40,8 +42,7 @@
- $(libboostconfigplatforminclude_HEADERS) \
- $(libboostconfigstdlibinclude_HEADERS) \
- $(libboostdetailinclude_HEADERS) $(libboostinclude_HEADERS) \
-- $(liburiparserinclude_HEADERS) $(srcdir)/Makefile.am \
-- $(srcdir)/Makefile.in
-+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-@@ -52,12 +53,28 @@
+@@ -51,12 +53,28 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -27820,18 +27036,15 @@
am__installdirs = "$(DESTDIR)$(libdir)" \
"$(DESTDIR)$(libboostconfigcompilerincludedir)" \
"$(DESTDIR)$(libboostconfigincludedir)" \
-@@ -65,9 +82,7 @@
- "$(DESTDIR)$(libboostconfigplatformincludedir)" \
+@@ -65,7 +83,6 @@
"$(DESTDIR)$(libboostconfigstdlibincludedir)" \
"$(DESTDIR)$(libboostdetailincludedir)" \
-- "$(DESTDIR)$(libboostincludedir)" \
-- "$(DESTDIR)$(liburiparserincludedir)"
+ "$(DESTDIR)$(libboostincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-+ "$(DESTDIR)$(libboostincludedir)"
LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
libgtest_la_LIBADD =
am_libgtest_la_OBJECTS = gtest.lo gtest-death-test.lo \
-@@ -80,18 +95,10 @@
+@@ -78,18 +95,10 @@
libminizip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libminizip_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -27851,7 +27064,7 @@
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -110,25 +117,14 @@
+@@ -108,17 +117,8 @@
CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
@@ -27866,21 +27079,12 @@
-libboostconfigstdlibincludeHEADERS_INSTALL = $(INSTALL_HEADER)
-libboostdetailincludeHEADERS_INSTALL = $(INSTALL_HEADER)
-libboostincludeHEADERS_INSTALL = $(INSTALL_HEADER)
--liburiparserincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES)
+DIST_SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES)
HEADERS = $(libboostconfigcompilerinclude_HEADERS) \
$(libboostconfiginclude_HEADERS) \
$(libboostconfigno_tr1include_HEADERS) \
- $(libboostconfigplatforminclude_HEADERS) \
- $(libboostconfigstdlibinclude_HEADERS) \
-- $(libboostdetailinclude_HEADERS) $(libboostinclude_HEADERS) \
-- $(liburiparserinclude_HEADERS)
-+ $(libboostdetailinclude_HEADERS) $(libboostinclude_HEADERS)
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -194,6 +190,7 @@
+@@ -190,6 +190,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -27888,59 +27092,48 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PLATFORM = @PLATFORM@
-@@ -264,11 +261,10 @@
- top_builddir = @top_builddir@
+@@ -261,11 +262,10 @@
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-0.7.1/include \
+- -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
++lib_LTLIBRARIES = libminizip.la
noinst_LTLIBRARIES = libgtest.la
libminizip_la_SOURCES = \
zlib-1.2.3/contrib/minizip/unzip.c \
-@@ -277,38 +273,6 @@
+@@ -274,27 +274,6 @@
zlib-1.2.3/contrib/minizip/zip.c
libminizip_la_LDFLAGS = -lz
-liburiparser_la_SOURCES = \
-- uriparser-0.7.1/lib/UriCommon.c \
-- uriparser-0.7.1/lib/UriCommon.h \
-- uriparser-0.7.1/lib/UriCompare.c \
-- uriparser-0.7.1/lib/UriEscape.c \
-- uriparser-0.7.1/lib/UriFile.c \
-- uriparser-0.7.1/lib/UriIp4.c \
-- uriparser-0.7.1/lib/UriIp4Base.c \
-- uriparser-0.7.1/lib/UriIp4Base.h \
-- uriparser-0.7.1/lib/UriNormalize.c \
-- uriparser-0.7.1/lib/UriNormalizeBase.c \
-- uriparser-0.7.1/lib/UriNormalizeBase.h \
-- uriparser-0.7.1/lib/UriParse.c \
-- uriparser-0.7.1/lib/UriParseBase.c \
-- uriparser-0.7.1/lib/UriParseBase.h \
-- uriparser-0.7.1/lib/UriQuery.c \
-- uriparser-0.7.1/lib/UriRecompose.c \
-- uriparser-0.7.1/lib/UriResolve.c \
-- uriparser-0.7.1/lib/UriShorten.c
+- $(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
-
--uriparser = uriparser-0.7.1
--uriparserinc = $(includedir)/kml/third_party/$(uriparser)/include
--liburiparserincludedir = $(uriparserinc)
--liburiparserinclude_HEADERS = \
-- $(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
--
-liburiparser_la_LDFLAGS = -version-info 1:5:0
boost_root = boost_1_34_1
boost = $(boost_root)/boost
boostinc = $(includedir)/kml/third_party/$(boost)
-@@ -466,9 +430,9 @@
+@@ -458,9 +437,9 @@
exit 1;; \
esac; \
done; \
@@ -27953,7 +27146,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -486,23 +450,28 @@
+@@ -478,23 +457,28 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27991,7 +27184,7 @@
done
clean-libLTLIBRARIES:
-@@ -526,8 +495,6 @@
+@@ -518,8 +502,6 @@
$(CXXLINK) $(libgtest_la_OBJECTS) $(libgtest_la_LIBADD) $(LIBS)
libminizip.la: $(libminizip_la_OBJECTS) $(libminizip_la_DEPENDENCIES)
$(libminizip_la_LINK) -rpath $(libdir) $(libminizip_la_OBJECTS) $(libminizip_la_LIBADD) $(LIBS)
@@ -28000,7 +27193,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -535,20 +502,6 @@
+@@ -527,20 +509,6 @@
distclean-compile:
-rm -f *.tab.c
@@ -28021,7 +27214,7 @@
@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@
-@@ -562,213 +515,115 @@
+@@ -554,213 +522,115 @@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -28086,103 +27279,103 @@
@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 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-0.7.1/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-0.7.1/lib/UriCommon.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriCommon.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@ mv -f $(DEPDIR)/UriCommon.Tpo $(DEPDIR)/UriCommon.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uriparser-0.7.1/lib/UriCommon.c' object='UriCommon.lo' libtool=yes @AMDEPBACKSLASH@
+- 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-0.7.1/lib/UriCommon.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriCommon.c
+- 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-0.7.1/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-0.7.1/lib/UriCompare.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriCompare.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@ mv -f $(DEPDIR)/UriCompare.Tpo $(DEPDIR)/UriCompare.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uriparser-0.7.1/lib/UriCompare.c' object='UriCompare.lo' libtool=yes @AMDEPBACKSLASH@
+- 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-0.7.1/lib/UriCompare.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriCompare.c
+- 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-0.7.1/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-0.7.1/lib/UriEscape.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriEscape.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@ mv -f $(DEPDIR)/UriEscape.Tpo $(DEPDIR)/UriEscape.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uriparser-0.7.1/lib/UriEscape.c' object='UriEscape.lo' libtool=yes @AMDEPBACKSLASH@
+- 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-0.7.1/lib/UriEscape.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriEscape.c
+- 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-0.7.1/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-0.7.1/lib/UriFile.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriFile.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@ mv -f $(DEPDIR)/UriFile.Tpo $(DEPDIR)/UriFile.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uriparser-0.7.1/lib/UriFile.c' object='UriFile.lo' libtool=yes @AMDEPBACKSLASH@
+- 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-0.7.1/lib/UriFile.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriFile.c
+- 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-0.7.1/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-0.7.1/lib/UriIp4.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriIp4.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@ mv -f $(DEPDIR)/UriIp4.Tpo $(DEPDIR)/UriIp4.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uriparser-0.7.1/lib/UriIp4.c' object='UriIp4.lo' libtool=yes @AMDEPBACKSLASH@
+- 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-0.7.1/lib/UriIp4.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriIp4.c
+- 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-0.7.1/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-0.7.1/lib/UriIp4Base.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriIp4Base.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@ mv -f $(DEPDIR)/UriIp4Base.Tpo $(DEPDIR)/UriIp4Base.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uriparser-0.7.1/lib/UriIp4Base.c' object='UriIp4Base.lo' libtool=yes @AMDEPBACKSLASH@
+- 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-0.7.1/lib/UriIp4Base.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriIp4Base.c
+- 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-0.7.1/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-0.7.1/lib/UriNormalize.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriNormalize.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@ mv -f $(DEPDIR)/UriNormalize.Tpo $(DEPDIR)/UriNormalize.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uriparser-0.7.1/lib/UriNormalize.c' object='UriNormalize.lo' libtool=yes @AMDEPBACKSLASH@
+- 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-0.7.1/lib/UriNormalize.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriNormalize.c
+- 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-0.7.1/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-0.7.1/lib/UriNormalizeBase.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriNormalizeBase.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@ mv -f $(DEPDIR)/UriNormalizeBase.Tpo $(DEPDIR)/UriNormalizeBase.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uriparser-0.7.1/lib/UriNormalizeBase.c' object='UriNormalizeBase.lo' libtool=yes @AMDEPBACKSLASH@
+- 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-0.7.1/lib/UriNormalizeBase.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriNormalizeBase.c
+- 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-0.7.1/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-0.7.1/lib/UriParse.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriParse.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@ mv -f $(DEPDIR)/UriParse.Tpo $(DEPDIR)/UriParse.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uriparser-0.7.1/lib/UriParse.c' object='UriParse.lo' libtool=yes @AMDEPBACKSLASH@
+- 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-0.7.1/lib/UriParse.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriParse.c
+- 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-0.7.1/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-0.7.1/lib/UriParseBase.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriParseBase.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@ mv -f $(DEPDIR)/UriParseBase.Tpo $(DEPDIR)/UriParseBase.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uriparser-0.7.1/lib/UriParseBase.c' object='UriParseBase.lo' libtool=yes @AMDEPBACKSLASH@
+- 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-0.7.1/lib/UriParseBase.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriParseBase.c
+- 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-0.7.1/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-0.7.1/lib/UriQuery.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriQuery.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@ mv -f $(DEPDIR)/UriQuery.Tpo $(DEPDIR)/UriQuery.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uriparser-0.7.1/lib/UriQuery.c' object='UriQuery.lo' libtool=yes @AMDEPBACKSLASH@
+- 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-0.7.1/lib/UriQuery.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriQuery.c
+- 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-0.7.1/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-0.7.1/lib/UriRecompose.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriRecompose.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@ mv -f $(DEPDIR)/UriRecompose.Tpo $(DEPDIR)/UriRecompose.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uriparser-0.7.1/lib/UriRecompose.c' object='UriRecompose.lo' libtool=yes @AMDEPBACKSLASH@
+- 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-0.7.1/lib/UriRecompose.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriRecompose.c
+- 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-0.7.1/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-0.7.1/lib/UriResolve.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriResolve.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@ mv -f $(DEPDIR)/UriResolve.Tpo $(DEPDIR)/UriResolve.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uriparser-0.7.1/lib/UriResolve.c' object='UriResolve.lo' libtool=yes @AMDEPBACKSLASH@
+- 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-0.7.1/lib/UriResolve.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriResolve.c
+- 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-0.7.1/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-0.7.1/lib/UriShorten.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriShorten.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@ mv -f $(DEPDIR)/UriShorten.Tpo $(DEPDIR)/UriShorten.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uriparser-0.7.1/lib/UriShorten.c' object='UriShorten.lo' libtool=yes @AMDEPBACKSLASH@
+- 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-0.7.1/lib/UriShorten.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriShorten.c
+- 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
+ 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 zip.lo `test -f 'zlib-1.2.3/contrib/minizip/zip.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/zip.c
.cc.o:
@@ -28271,7 +27464,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -778,139 +633,143 @@
+@@ -770,122 +640,143 @@
install-libboostconfigcompilerincludeHEADERS: $(libboostconfigcompilerinclude_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(libboostconfigcompilerincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libboostconfigcompilerincludedir)"
@@ -28470,23 +27663,6 @@
- echo " rm -f '$(DESTDIR)$(libboostincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(libboostincludedir)/$$f"; \
- done
--install-liburiparserincludeHEADERS: $(liburiparserinclude_HEADERS)
-- @$(NORMAL_INSTALL)
-- test -z "$(liburiparserincludedir)" || $(MKDIR_P) "$(DESTDIR)$(liburiparserincludedir)"
-- @list='$(liburiparserinclude_HEADERS)'; for p in $$list; do \
-- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(liburiparserincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(liburiparserincludedir)/$$f'"; \
-- $(liburiparserincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(liburiparserincludedir)/$$f"; \
-- done
--
--uninstall-liburiparserincludeHEADERS:
-- @$(NORMAL_UNINSTALL)
-- @list='$(liburiparserinclude_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(liburiparserincludedir)/$$f'"; \
-- rm -f "$(DESTDIR)$(liburiparserincludedir)/$$f"; \
-- done
+ @list='$(libboostinclude_HEADERS)'; test -n "$(libboostincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
@@ -28495,7 +27671,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -924,7 +783,7 @@
+@@ -899,7 +790,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -28504,7 +27680,7 @@
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -932,29 +791,34 @@
+@@ -907,29 +798,34 @@
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
@@ -28547,7 +27723,7 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -975,13 +839,17 @@
+@@ -950,13 +846,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -28569,16 +27745,7 @@
|| exit 1; \
fi; \
done
-@@ -989,7 +857,7 @@
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- installdirs:
-- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libboostconfigcompilerincludedir)" "$(DESTDIR)$(libboostconfigincludedir)" "$(DESTDIR)$(libboostconfigno_tr1includedir)" "$(DESTDIR)$(libboostconfigplatformincludedir)" "$(DESTDIR)$(libboostconfigstdlibincludedir)" "$(DESTDIR)$(libboostdetailincludedir)" "$(DESTDIR)$(libboostincludedir)" "$(DESTDIR)$(liburiparserincludedir)"; do \
-+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libboostconfigcompilerincludedir)" "$(DESTDIR)$(libboostconfigincludedir)" "$(DESTDIR)$(libboostconfigno_tr1includedir)" "$(DESTDIR)$(libboostconfigplatformincludedir)" "$(DESTDIR)$(libboostconfigstdlibincludedir)" "$(DESTDIR)$(libboostdetailincludedir)" "$(DESTDIR)$(libboostincludedir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
-@@ -1012,6 +880,7 @@
+@@ -987,6 +887,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -28586,7 +27753,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -1033,6 +902,8 @@
+@@ -1008,6 +909,8 @@
html: html-am
@@ -28595,13 +27762,7 @@
info: info-am
info-am:
-@@ -1043,23 +914,32 @@
- install-libboostconfigplatformincludeHEADERS \
- install-libboostconfigstdlibincludeHEADERS \
- install-libboostdetailincludeHEADERS \
-- install-libboostincludeHEADERS \
-- install-liburiparserincludeHEADERS
-+ install-libboostincludeHEADERS
+@@ -1022,18 +925,28 @@
install-dvi: install-dvi-am
@@ -28630,44 +27791,20 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -1087,8 +967,7 @@
- uninstall-libboostconfigplatformincludeHEADERS \
- uninstall-libboostconfigstdlibincludeHEADERS \
+@@ -1093,6 +1006,7 @@
uninstall-libboostdetailincludeHEADERS \
-- uninstall-libboostincludeHEADERS \
-- uninstall-liburiparserincludeHEADERS
-+ uninstall-libboostincludeHEADERS
+ uninstall-libboostincludeHEADERS
- .MAKE: install-am install-strip
-
-@@ -1106,8 +985,7 @@
- install-libboostconfigplatformincludeHEADERS \
- install-libboostconfigstdlibincludeHEADERS \
- install-libboostdetailincludeHEADERS \
-- install-libboostincludeHEADERS \
-- install-liburiparserincludeHEADERS install-man install-pdf \
-+ install-libboostincludeHEADERS install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
-@@ -1119,8 +997,8 @@
- uninstall-libboostconfigplatformincludeHEADERS \
- uninstall-libboostconfigstdlibincludeHEADERS \
- uninstall-libboostdetailincludeHEADERS \
-- uninstall-libboostincludeHEADERS \
-- uninstall-liburiparserincludeHEADERS
-+ uninstall-libboostincludeHEADERS
+
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.1.0/xcode/LibKML/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/xcode/LibKML/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/xcode/LibKML/Makefile.in 2009-12-10 17:29:40.000000000 +0100
+ .NOEXPORT:
+diff -urN libkml-1.2.0/xcode/LibKML/Makefile.in libkml-1.2.0-new/xcode/LibKML/Makefile.in
+--- libkml-1.2.0/xcode/LibKML/Makefile.in 2010-01-14 01:17:37.000000000 +0100
++++ libkml-1.2.0-new/xcode/LibKML/Makefile.in 2010-06-25 11:39:57.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -28801,13 +27938,12 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-Index: libkml-1.1.0/xcode/Makefile.in
-===================================================================
---- libkml-1.1.0.orig/xcode/Makefile.in 2009-12-10 13:05:40.000000000 +0100
-+++ libkml-1.1.0/xcode/Makefile.in 2009-12-10 17:29:40.000000000 +0100
+diff -urN libkml-1.2.0/xcode/Makefile.in libkml-1.2.0-new/xcode/Makefile.in
+--- libkml-1.2.0/xcode/Makefile.in 2010-01-14 01:17:37.000000000 +0100
++++ libkml-1.2.0-new/xcode/Makefile.in 2010-06-25 11:39:57.000000000 +0200
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -28904,6 +28040,15 @@
mostlyclean-libtool:
-rm -f *.lo
+@@ -236,7 +269,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -253,7 +286,7 @@
else \
local_target="$$target"; \
@@ -28913,6 +28058,15 @@
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
+@@ -261,7 +294,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
@@ -287,16 +320,16 @@
else \
local_target="$$target"; \
More information about the Pkg-grass-devel
mailing list