Commit c728398668dd7a9c6136b00a38efd9495c8324b3 - readosm

Merge tag 'upstream/1.0.0b+dfsg1' Upstream version 1.0.0b+dfsg1 # gpg: Signature made mer 14 nov 2012 16:59:17 CET using DSA key ID 1392B174 # gpg: Good signature from "David Paleino <d.paleino@gmail.com>" # gpg: aka "[jpeg image of size 6708]" # gpg: aka "Hanska <aksnah@gmail.com>" # gpg: aka "David Paleino <david.paleino@poste.it>" # gpg: aka "David Paleino <dapal@debian.org>" David Paleino 11 years ago

10 changed file(s) with 316 addition(s) and 160 deletion(s). Raw diff Collapse all Expand all

+81

-33

Makefile.in less more

0		# Makefile.in generated by automake 1.11.1 from Makefile.am.
	0	# Makefile.in generated by automake 1.11.6 from Makefile.am.
1	1	# @configure_input@
2	2
3	3	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4		# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
5		# Inc.
	4	# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
	5	# Foundation, Inc.
6	6	# This Makefile.in is free software; the Free Software Foundation
7	7	# gives unlimited permission to copy and/or distribute it,
8	8	# with or without modifications, as long as this notice is preserved.

15	15	@SET_MAKE@
16	16
17	17	VPATH = @srcdir@
	18	am__make_dryrun = \
	19	{ \
	20	am__dry=no; \
	21	case $$MAKEFLAGS in \
	22	\\[\ \ ]) \
	23	echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
	24	\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
	25	*) \
	26	for am__flg in $$MAKEFLAGS; do \
	27	case $$am__flg in \
	28	=\|--*) ;; \
	29	n) am__dry=yes; break;; \
	30	esac; \
	31	done;; \
	32	esac; \
	33	test $$am__dry = yes; \
	34	}
18	35	pkgdatadir = $(datadir)/@PACKAGE@
19	36	pkgincludedir = $(includedir)/@PACKAGE@
20	37	pkglibdir = $(libdir)/@PACKAGE@

61	78	install-pdf-recursive install-ps-recursive install-recursive \
62	79	installcheck-recursive installdirs-recursive pdf-recursive \
63	80	ps-recursive uninstall-recursive
	81	am__can_run_installinfo = \
	82	case $$AM_UPDATE_INFO_DIR in \
	83	n\|no\|NO) false;; \
	84	*) (install-info --version) >/dev/null 2>&1;; \
	85	esac
64	86	am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`;
65	87	am__vpath_adj = case $$p in \
66	88	$(srcdir)/*) f=`echo "$$p" \| sed "s\|^$$srcdirstrip/\|\|"`;; \

82	104	am__base_list = \
83	105	sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' \| \
84	106	sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
	107	am__uninstall_files_from_dir = { \
	108	test -z "$$files" \
	109	\|\| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
	110	\|\| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
	111	$(am__cd) "$$dir" && rm -f $$files; }; \
	112	}
85	113	am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
86	114	DATA = $(pkgconfig_DATA)
87	115	RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \

96	124	distdir = $(PACKAGE)-$(VERSION)
97	125	top_distdir = $(distdir)
98	126	am__remove_distdir = \
99		{ test ! -d "$(distdir)" \
100		\|\| { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
101		&& rm -fr "$(distdir)"; }; }
	127	if test -d "$(distdir)"; then \
	128	find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
	129	&& rm -rf "$(distdir)" \
	130	\|\| { sleep 5 && rm -rf "$(distdir)"; }; \
	131	else :; fi
102	132	am__relativize = \
103	133	dir0=`pwd`; \
104	134	sed_first='s,^$[^/]$/.$$,\1,'; \

127	157	DIST_ARCHIVES = $(distdir).tar.gz $(distdir).zip
128	158	GZIP_ENV = --best
129	159	distuninstallcheck_listfiles = find . -type f -print
	160	am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
	161	\| sed 's\|^\./\|$(prefix)/\|' \| grep -v '$(infodir)/dir$$'
130	162	distcleancheck_listfiles = find . -type f -print
131	163	ACLOCAL = @ACLOCAL@
132	164	AMTAR = @AMTAR@

259	291	$(MAKE) $(AM_MAKEFLAGS) all-recursive
260	292
261	293	.SUFFIXES:
262		am--refresh:
	294	am--refresh: Makefile
263	295	@:
264	296	$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
265	297	@for dep in $?; do \

295	327	$(am__aclocal_m4_deps):
296	328
297	329	config.h: stamp-h1
298		@if test ! -f $@; then \
299		rm -f stamp-h1; \
300		$(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
301		else :; fi
	330	@if test ! -f $@; then rm -f stamp-h1; else :; fi
	331	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
302	332
303	333	stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
304	334	@rm -f stamp-h1

325	355	-rm -f libtool config.lt
326	356	install-pkgconfigDATA: $(pkgconfig_DATA)
327	357	@$(NORMAL_INSTALL)
328		test -z "$(pkgconfigdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
329	358	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" \|\| list=; \
	359	if test -n "$$list"; then \
	360	echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
	361	$(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" \|\| exit 1; \
	362	fi; \
330	363	for p in $$list; do \
331	364	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
332	365	echo "$$d$$p"; \

340	373	@$(NORMAL_UNINSTALL)
341	374	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" \|\| list=; \
342	375	files=`for p in $$list; do echo $$p; done \| sed -e 's\|^.*/\|\|'`; \
343		test -n "$$files" \|\| exit 0; \
344		echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
345		cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
	376	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
346	377
347	378	# This directory's subdirectories are mostly independent; you can cd
348	379	# into them and run `make' without going through this Makefile.

513	544	done
514	545	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
515	546	if test "$$subdir" = .; then :; else \
516		test -d "$(distdir)/$$subdir" \
517		\|\| $(MKDIR_P) "$(distdir)/$$subdir" \
518		\|\| exit 1; \
519		fi; \
520		done
521		@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
522		if test "$$subdir" = .; then :; else \
	547	$(am__make_dryrun) \
	548	\|\| test -d "$(distdir)/$$subdir" \
	549	\|\| $(MKDIR_P) "$(distdir)/$$subdir" \
	550	\|\| exit 1; \
523	551	dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
524	552	$(am__relativize); \
525	553	new_distdir=$$reldir; \

551	579	$(am__remove_distdir)
552	580
553	581	dist-bzip2: distdir
554		tardir=$(distdir) && $(am__tar) \| bzip2 -9 -c >$(distdir).tar.bz2
	582	tardir=$(distdir) && $(am__tar) \| BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
	583	$(am__remove_distdir)
	584
	585	dist-lzip: distdir
	586	tardir=$(distdir) && $(am__tar) \| lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
555	587	$(am__remove_distdir)
556	588
557	589	dist-lzma: distdir

559	591	$(am__remove_distdir)
560	592
561	593	dist-xz: distdir
562		tardir=$(distdir) && $(am__tar) \| xz -c >$(distdir).tar.xz
	594	tardir=$(distdir) && $(am__tar) \| XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
563	595	$(am__remove_distdir)
564	596
565	597	dist-tarZ: distdir

591	623	bzip2 -dc $(distdir).tar.bz2 \| $(am__untar) ;;\
592	624	.tar.lzma) \
593	625	lzma -dc $(distdir).tar.lzma \| $(am__untar) ;;\
	626	.tar.lz) \
	627	lzip -dc $(distdir).tar.lz \| $(am__untar) ;;\
594	628	.tar.xz) \
595	629	xz -dc $(distdir).tar.xz \| $(am__untar) ;;\
596	630	.tar.Z) \

600	634	.zip) \
601	635	unzip $(distdir).zip ;;\
602	636	esac
603		chmod -R a-w $(distdir); chmod a+w $(distdir)
	637	chmod -R a-w $(distdir); chmod u+w $(distdir)
604	638	mkdir $(distdir)/_build
605	639	mkdir $(distdir)/_inst
606	640	chmod a-w $(distdir)

610	644	&& am__cwd=`pwd` \
611	645	&& $(am__cd) $(distdir)/_build \
612	646	&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
	647	$(AM_DISTCHECK_CONFIGURE_FLAGS) \
613	648	$(DISTCHECK_CONFIGURE_FLAGS) \
614	649	&& $(MAKE) $(AM_MAKEFLAGS) \
615	650	&& $(MAKE) $(AM_MAKEFLAGS) dvi \

638	673	list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) \| \
639	674	sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
640	675	distuninstallcheck:
641		@$(am__cd) '$(distuninstallcheck_dir)' \
642		&& test `$(distuninstallcheck_listfiles) \| wc -l` -le 1 \
	676	@test -n '$(distuninstallcheck_dir)' \|\| { \
	677	echo 'ERROR: trying to run $@ with an empty' \
	678	'$$(distuninstallcheck_dir)' >&2; \
	679	exit 1; \
	680	}; \
	681	$(am__cd) '$(distuninstallcheck_dir)' \|\| { \
	682	echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
	683	exit 1; \
	684	}; \
	685	test `$(am__distuninstallcheck_listfiles) \| wc -l` -eq 0 \
643	686	\|\| { echo "ERROR: files left after uninstall:" ; \
644	687	if test -n "$(DESTDIR)"; then \
645	688	echo " (check DESTDIR support)"; \

673	716
674	717	installcheck: installcheck-recursive
675	718	install-strip:
676		$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
677		install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
678		`test -z '$(STRIP)' \|\| \
679		echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
	719	if test -z '$(STRIP)'; then \
	720	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
	721	install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
	722	install; \
	723	else \
	724	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
	725	install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
	726	"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
	727	fi
680	728	mostlyclean-generic:
681	729	-test -z "$(MOSTLYCLEANFILES)" \|\| rm -f $(MOSTLYCLEANFILES)
682	730

765	813	.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
766	814	all all-am am--refresh check check-am clean clean-generic \
767	815	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
768		dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
769		distcheck distclean distclean-generic distclean-hdr \
	816	dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
	817	dist-zip distcheck distclean distclean-generic distclean-hdr \
770	818	distclean-libtool distclean-tags distcleancheck distdir \
771	819	distuninstallcheck dvi dvi-am html html-am info info-am \
772	820	install install-am install-data install-data-am install-dvi \

-1

README less more

0	0	ReadOSM is a simple library intended for extracting the contents from
1	1	Open Street Map files: both input formats (.osm XML based and .osm.pbf
2		based on Google's Protocol Buffer serialization) are indifferenctly
	2	based on Google's Protocol Buffer serialization) are indifferently
3	3	supported.
4	4
5	5

+82

-62

aclocal.m4 less more

0		# generated automatically by aclocal 1.11.1 -- Autoconf --
	0	# generated automatically by aclocal 1.11.6 -- Autoconf --
1	1
2	2	# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
3		# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
	3	# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
	4	# Inc.
4	5	# This file is free software; the Free Software Foundation
5	6	# gives unlimited permission to copy and/or distribute it,
6	7	# with or without modifications, as long as this notice is preserved.

18	19	If you have problems, you may need to regenerate the build system entirely.
19	20	To do so, use the procedure documented by the package, typically `autoreconf'.])])
20	21
21		# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
22		#
23		# This file is free software; the Free Software Foundation
24		# gives unlimited permission to copy and/or distribute it,
25		# with or without modifications, as long as this notice is preserved.
	22	# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
	23	# Foundation, Inc.
	24	#
	25	# This file is free software; the Free Software Foundation
	26	# gives unlimited permission to copy and/or distribute it,
	27	# with or without modifications, as long as this notice is preserved.
	28
	29	# serial 1
26	30
27	31	# AM_AUTOMAKE_VERSION(VERSION)
28	32	# ----------------------------

33	37	[am__api_version='1.11'
34	38	dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
35	39	dnl require some minimum version. Point them to the right macro.
36		m4_if([$1], [1.11.1], [],
	40	m4_if([$1], [1.11.6], [],
37	41	[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
38	42	])
39	43

49	53	# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
50	54	# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
51	55	AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
52		[AM_AUTOMAKE_VERSION([1.11.1])dnl
	56	[AM_AUTOMAKE_VERSION([1.11.6])dnl
53	57	m4_ifndef([AC_AUTOCONF_VERSION],
54	58	[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
55	59	_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
56	60
57	61	# AM_AUX_DIR_EXPAND -- Autoconf --
58	62
59		# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
60		#
61		# This file is free software; the Free Software Foundation
62		# gives unlimited permission to copy and/or distribute it,
63		# with or without modifications, as long as this notice is preserved.
	63	# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
	64	#
	65	# This file is free software; the Free Software Foundation
	66	# gives unlimited permission to copy and/or distribute it,
	67	# with or without modifications, as long as this notice is preserved.
	68
	69	# serial 1
64	70
65	71	# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
66	72	# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to

143	149	Usually this means the macro was only invoked conditionally.]])
144	150	fi])])
145	151
146		# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
147		# Free Software Foundation, Inc.
148		#
149		# This file is free software; the Free Software Foundation
150		# gives unlimited permission to copy and/or distribute it,
151		# with or without modifications, as long as this notice is preserved.
152
153		# serial 10
	152	# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
	153	# 2010, 2011 Free Software Foundation, Inc.
	154	#
	155	# This file is free software; the Free Software Foundation
	156	# gives unlimited permission to copy and/or distribute it,
	157	# with or without modifications, as long as this notice is preserved.
	158
	159	# serial 12
154	160
155	161	# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
156	162	# written in clear, in which case automake, when reading aclocal.m4,

190	196	# instance it was reported that on HP-UX the gcc test will end up
191	197	# making a dummy file named `D' -- because `-MD' means `put the output
192	198	# in D'.
	199	rm -rf conftest.dir
193	200	mkdir conftest.dir
194	201	# Copy depcomp to subdir because otherwise we won't find it if we're
195	202	# using a relative directory.

254	261	break
255	262	fi
256	263	;;
257		msvisualcpp \| msvcmsys)
	264	msvc7 \| msvc7msys \| msvisualcpp \| msvcmsys)
258	265	# This compiler won't grok `-c -o', but also, the minuso test has
259	266	# not run yet. These depmodes are late enough in the game, and
260	267	# so weak that their functioning should not be impacted.

319	326	if test "x$enable_dependency_tracking" != xno; then
320	327	am_depcomp="$ac_aux_dir/depcomp"
321	328	AMDEPBACKSLASH='\'
	329	am__nodep='_no'
322	330	fi
323	331	AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
324	332	AC_SUBST([AMDEPBACKSLASH])dnl
325	333	_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
	334	AC_SUBST([am__nodep])dnl
	335	_AM_SUBST_NOTMAKE([am__nodep])dnl
326	336	])
327	337
328	338	# Generate code to set up dependency tracking. -- Autoconf --

556	566	done
557	567	echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
558	568
559		# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
560		#
561		# This file is free software; the Free Software Foundation
562		# gives unlimited permission to copy and/or distribute it,
563		# with or without modifications, as long as this notice is preserved.
	569	# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
	570	# Inc.
	571	#
	572	# This file is free software; the Free Software Foundation
	573	# gives unlimited permission to copy and/or distribute it,
	574	# with or without modifications, as long as this notice is preserved.
	575
	576	# serial 1
564	577
565	578	# AM_PROG_INSTALL_SH
566	579	# ------------------

601	614	# Add --enable-maintainer-mode option to configure. -- Autoconf --
602	615	# From Jim Meyering
603	616
604		# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
605		# Free Software Foundation, Inc.
	617	# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
	618	# 2011 Free Software Foundation, Inc.
606	619	#
607	620	# This file is free software; the Free Software Foundation
608	621	# gives unlimited permission to copy and/or distribute it,

622	635	[disable], [m4_define([am_maintainer_other], [enable])],
623	636	[m4_define([am_maintainer_other], [enable])
624	637	m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
625		AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
	638	AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
626	639	dnl maintainer-mode's default is 'disable' unless 'enable' is passed
627	640	AC_ARG_ENABLE([maintainer-mode],
628	641	[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful

733	746	fi
734	747	])
735	748
736		# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
737		#
738		# This file is free software; the Free Software Foundation
739		# gives unlimited permission to copy and/or distribute it,
740		# with or without modifications, as long as this notice is preserved.
	749	# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
	750	# Inc.
	751	#
	752	# This file is free software; the Free Software Foundation
	753	# gives unlimited permission to copy and/or distribute it,
	754	# with or without modifications, as long as this notice is preserved.
	755
	756	# serial 1
741	757
742	758	# AM_PROG_MKDIR_P
743	759	# ---------------

761	777
762	778	# Helper functions for option handling. -- Autoconf --
763	779
764		# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
765		#
766		# This file is free software; the Free Software Foundation
767		# gives unlimited permission to copy and/or distribute it,
768		# with or without modifications, as long as this notice is preserved.
769
770		# serial 4
	780	# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
	781	# Foundation, Inc.
	782	#
	783	# This file is free software; the Free Software Foundation
	784	# gives unlimited permission to copy and/or distribute it,
	785	# with or without modifications, as long as this notice is preserved.
	786
	787	# serial 5
771	788
772	789	# _AM_MANGLE_OPTION(NAME)
773	790	# -----------------------

775	792	[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
776	793
777	794	# _AM_SET_OPTION(NAME)
778		# ------------------------------
	795	# --------------------
779	796	# Set option NAME. Presently that only means defining a flag for this option.
780	797	AC_DEFUN([_AM_SET_OPTION],
781	798	[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
782	799
783	800	# _AM_SET_OPTIONS(OPTIONS)
784		# ----------------------------------
	801	# ------------------------
785	802	# OPTIONS is a space-separated list of Automake options.
786	803	AC_DEFUN([_AM_SET_OPTIONS],
787	804	[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])

857	874	fi
858	875	AC_MSG_RESULT(yes)])
859	876
860		# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
861		#
862		# This file is free software; the Free Software Foundation
863		# gives unlimited permission to copy and/or distribute it,
864		# with or without modifications, as long as this notice is preserved.
	877	# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
	878	#
	879	# This file is free software; the Free Software Foundation
	880	# gives unlimited permission to copy and/or distribute it,
	881	# with or without modifications, as long as this notice is preserved.
	882
	883	# serial 1
865	884
866	885	# AM_PROG_INSTALL_STRIP
867	886	# ---------------------

885	904	INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
886	905	AC_SUBST([INSTALL_STRIP_PROGRAM])])
887	906
888		# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
889		#
890		# This file is free software; the Free Software Foundation
891		# gives unlimited permission to copy and/or distribute it,
892		# with or without modifications, as long as this notice is preserved.
893
894		# serial 2
	907	# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
	908	#
	909	# This file is free software; the Free Software Foundation
	910	# gives unlimited permission to copy and/or distribute it,
	911	# with or without modifications, as long as this notice is preserved.
	912
	913	# serial 3
895	914
896	915	# _AM_SUBST_NOTMAKE(VARIABLE)
897	916	# ---------------------------

900	919	AC_DEFUN([_AM_SUBST_NOTMAKE])
901	920
902	921	# AM_SUBST_NOTMAKE(VARIABLE)
903		# ---------------------------
	922	# --------------------------
904	923	# Public sister of _AM_SUBST_NOTMAKE.
905	924	AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
906	925
907	926	# Check how to create a tarball. -- Autoconf --
908	927
909		# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
	928	# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
910	929	#
911	930	# This file is free software; the Free Software Foundation
912	931	# gives unlimited permission to copy and/or distribute it,

928	947	# a tarball read from stdin.
929	948	# $(am__untar) < result.tar
930	949	AC_DEFUN([_AM_PROG_TAR],
931		[# Always define AMTAR for backward compatibility.
932		AM_MISSING_PROG([AMTAR], [tar])
	950	[# Always define AMTAR for backward compatibility. Yes, it's still used
	951	# in the wild :-( We should find a proper way to deprecate it ...
	952	AC_SUBST([AMTAR], ['$${TAR-tar}'])
933	953	m4_if([$1], [v7],
934		[am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
	954	[am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
935	955	[m4_case([$1], [ustar],, [pax],,
936	956	[m4_fatal([Unknown tar format])])
937	957	AC_MSG_CHECKING([how to create a $1 tar archive])

+23

-18

configure less more

0	0	#! /bin/sh
1	1	# Guess values for system-dependent variables and create Makefiles.
2		# Generated by GNU Autoconf 2.68 for readosm 1.0.0a.
	2	# Generated by GNU Autoconf 2.68 for readosm 1.0.0b.
3	3	#
4	4	# Report bugs to <a.furieri@lqt.it>.
5	5	#

569	569	# Identity of this package.
570	570	PACKAGE_NAME='readosm'
571	571	PACKAGE_TARNAME='readosm'
572		PACKAGE_VERSION='1.0.0a'
573		PACKAGE_STRING='readosm 1.0.0a'
	572	PACKAGE_VERSION='1.0.0b'
	573	PACKAGE_STRING='readosm 1.0.0b'
574	574	PACKAGE_BUGREPORT='a.furieri@lqt.it'
575	575	PACKAGE_URL=''
576	576

655	655	am__fastdepCC_FALSE
656	656	am__fastdepCC_TRUE
657	657	CCDEPMODE
	658	am__nodep
658	659	AMDEPBACKSLASH
659	660	AMDEP_FALSE
660	661	AMDEP_TRUE

1301	1302	# Omit some internal or obsolete options to make the list less imposing.
1302	1303	# This message is too long to be a string in the A/UX 3.1 sh.
1303	1304	cat <<_ACEOF
1304		\`configure' configures readosm 1.0.0a to adapt to many kinds of systems.
	1305	\`configure' configures readosm 1.0.0b to adapt to many kinds of systems.
1305	1306
1306	1307	Usage: $0 [OPTION]... [VAR=VALUE]...
1307	1308

1371	1372
1372	1373	if test -n "$ac_init_help"; then
1373	1374	case $ac_init_help in
1374		short \| recursive ) echo "Configuration of readosm 1.0.0a:";;
	1375	short \| recursive ) echo "Configuration of readosm 1.0.0b:";;
1375	1376	esac
1376	1377	cat <<\_ACEOF
1377	1378

1478	1479	test -n "$ac_init_help" && exit $ac_status
1479	1480	if $ac_init_version; then
1480	1481	cat <<\_ACEOF
1481		readosm configure 1.0.0a
	1482	readosm configure 1.0.0b
1482	1483	generated by GNU Autoconf 2.68
1483	1484
1484	1485	Copyright (C) 2010 Free Software Foundation, Inc.

2022	2023	This file contains any messages produced by compilers while
2023	2024	running configure, to aid debugging if configure makes a mistake.
2024	2025
2025		It was created by readosm $as_me 1.0.0a, which was
	2026	It was created by readosm $as_me 1.0.0b, which was
2026	2027	generated by GNU Autoconf 2.68. Invocation command line was
2027	2028
2028	2029	$ $0 $@

2845	2846
2846	2847	# Define the identity of the package.
2847	2848	PACKAGE='readosm'
2848		VERSION='1.0.0a'
	2849	VERSION='1.0.0b'
2849	2850
2850	2851
2851	2852	cat >>confdefs.h <<_ACEOF

2875	2876
2876	2877	# We need awk for the "check" target. The system "awk" is bad on
2877	2878	# some platforms.
2878		# Always define AMTAR for backward compatibility.
2879
2880		AMTAR=${AMTAR-"${am_missing_run}tar"}
2881
2882		am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
	2879	# Always define AMTAR for backward compatibility. Yes, it's still used
	2880	# in the wild :-( We should find a proper way to deprecate it ...
	2881	AMTAR='$${TAR-tar}'
	2882
	2883	am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
2883	2884
2884	2885
2885	2886

2965	2966	if test "x$enable_dependency_tracking" != xno; then
2966	2967	am_depcomp="$ac_aux_dir/depcomp"
2967	2968	AMDEPBACKSLASH='\'
	2969	am__nodep='_no'
2968	2970	fi
2969	2971	if test "x$enable_dependency_tracking" != xno; then
2970	2972	AMDEP_TRUE=

3778	3780	# instance it was reported that on HP-UX the gcc test will end up
3779	3781	# making a dummy file named `D' -- because `-MD' means `put the output
3780	3782	# in D'.
	3783	rm -rf conftest.dir
3781	3784	mkdir conftest.dir
3782	3785	# Copy depcomp to subdir because otherwise we won't find it if we're
3783	3786	# using a relative directory.

3837	3840	break
3838	3841	fi
3839	3842	;;
3840		msvisualcpp \| msvcmsys)
	3843	msvc7 \| msvc7msys \| msvisualcpp \| msvcmsys)
3841	3844	# This compiler won't grok `-c -o', but also, the minuso test has
3842	3845	# not run yet. These depmodes are late enough in the game, and
3843	3846	# so weak that their functioning should not be impacted.

4605	4608	# instance it was reported that on HP-UX the gcc test will end up
4606	4609	# making a dummy file named `D' -- because `-MD' means `put the output
4607	4610	# in D'.
	4611	rm -rf conftest.dir
4608	4612	mkdir conftest.dir
4609	4613	# Copy depcomp to subdir because otherwise we won't find it if we're
4610	4614	# using a relative directory.

4664	4668	break
4665	4669	fi
4666	4670	;;
4667		msvisualcpp \| msvcmsys)
	4671	msvc7 \| msvc7msys \| msvisualcpp \| msvcmsys)
4668	4672	# This compiler won't grok `-c -o', but also, the minuso test has
4669	4673	# not run yet. These depmodes are late enough in the game, and
4670	4674	# so weak that their functioning should not be impacted.

5272	5276	# instance it was reported that on HP-UX the gcc test will end up
5273	5277	# making a dummy file named `D' -- because `-MD' means `put the output
5274	5278	# in D'.
	5279	rm -rf conftest.dir
5275	5280	mkdir conftest.dir
5276	5281	# Copy depcomp to subdir because otherwise we won't find it if we're
5277	5282	# using a relative directory.

5331	5336	break
5332	5337	fi
5333	5338	;;
5334		msvisualcpp \| msvcmsys)
	5339	msvc7 \| msvc7msys \| msvisualcpp \| msvcmsys)
5335	5340	# This compiler won't grok `-c -o', but also, the minuso test has
5336	5341	# not run yet. These depmodes are late enough in the game, and
5337	5342	# so weak that their functioning should not be impacted.

17429	17434	# report actual input values of CONFIG_FILES etc. instead of their
17430	17435	# values after options handling.
17431	17436	ac_log="
17432		This file was extended by readosm $as_me 1.0.0a, which was
	17437	This file was extended by readosm $as_me 1.0.0b, which was
17433	17438	generated by GNU Autoconf 2.68. Invocation command line was
17434	17439
17435	17440	CONFIG_FILES = $CONFIG_FILES

17495	17500	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
17496	17501	ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
17497	17502	ac_cs_version="\\
17498		readosm config.status 1.0.0a
	17503	readosm config.status 1.0.0b
17499	17504	configured by $0, generated by GNU Autoconf 2.68,
17500	17505	with options \\"\$ac_cs_config\\"
17501	17506

-1

configure.ac less more

1	1	# Process this file with autoconf to produce a configure script.
2	2
3	3	AC_PREREQ(2.61)
4		AC_INIT(readosm, 1.0.0a, a.furieri@lqt.it)
	4	AC_INIT(readosm, 1.0.0b, a.furieri@lqt.it)
5	5	AC_LANG(C)
6	6	AC_CONFIG_AUX_DIR([.])
7	7	AC_CONFIG_MACRO_DIR([m4])

+37

-10

examples/Makefile.in less more

0		# Makefile.in generated by automake 1.11.1 from Makefile.am.
	0	# Makefile.in generated by automake 1.11.6 from Makefile.am.
1	1	# @configure_input@
2	2
3	3	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4		# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
5		# Inc.
	4	# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
	5	# Foundation, Inc.
6	6	# This Makefile.in is free software; the Free Software Foundation
7	7	# gives unlimited permission to copy and/or distribute it,
8	8	# with or without modifications, as long as this notice is preserved.

15	15	@SET_MAKE@
16	16
17	17	VPATH = @srcdir@
	18	am__make_dryrun = \
	19	{ \
	20	am__dry=no; \
	21	case $$MAKEFLAGS in \
	22	\\[\ \ ]) \
	23	echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
	24	\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
	25	*) \
	26	for am__flg in $$MAKEFLAGS; do \
	27	case $$am__flg in \
	28	=\|--*) ;; \
	29	n) am__dry=yes; break;; \
	30	esac; \
	31	done;; \
	32	esac; \
	33	test $$am__dry = yes; \
	34	}
18	35	pkgdatadir = $(datadir)/@PACKAGE@
19	36	pkgincludedir = $(includedir)/@PACKAGE@
20	37	pkglibdir = $(libdir)/@PACKAGE@

73	90	$(LDFLAGS) -o $@
74	91	SOURCES = test_osm1.c test_osm2.c test_osm3.c
75	92	DIST_SOURCES = test_osm1.c test_osm2.c test_osm3.c
	93	am__can_run_installinfo = \
	94	case $$AM_UPDATE_INFO_DIR in \
	95	n\|no\|NO) false;; \
	96	*) (install-info --version) >/dev/null 2>&1;; \
	97	esac
76	98	ETAGS = etags
77	99	CTAGS = ctags
78	100	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

243	265	list=`for p in $$list; do echo "$$p"; done \| sed 's/$(EXEEXT)$$//'`; \
244	266	echo " rm -f" $$list; \
245	267	rm -f $$list
246		test_osm1$(EXEEXT): $(test_osm1_OBJECTS) $(test_osm1_DEPENDENCIES)
	268	test_osm1$(EXEEXT): $(test_osm1_OBJECTS) $(test_osm1_DEPENDENCIES) $(EXTRA_test_osm1_DEPENDENCIES)
247	269	@rm -f test_osm1$(EXEEXT)
248	270	$(LINK) $(test_osm1_OBJECTS) $(test_osm1_LDADD) $(LIBS)
249		test_osm2$(EXEEXT): $(test_osm2_OBJECTS) $(test_osm2_DEPENDENCIES)
	271	test_osm2$(EXEEXT): $(test_osm2_OBJECTS) $(test_osm2_DEPENDENCIES) $(EXTRA_test_osm2_DEPENDENCIES)
250	272	@rm -f test_osm2$(EXEEXT)
251	273	$(LINK) $(test_osm2_OBJECTS) $(test_osm2_LDADD) $(LIBS)
252		test_osm3$(EXEEXT): $(test_osm3_OBJECTS) $(test_osm3_DEPENDENCIES)
	274	test_osm3$(EXEEXT): $(test_osm3_OBJECTS) $(test_osm3_DEPENDENCIES) $(EXTRA_test_osm3_DEPENDENCIES)
253	275	@rm -f test_osm3$(EXEEXT)
254	276	$(LINK) $(test_osm3_OBJECTS) $(test_osm3_LDADD) $(LIBS)
255	277

386	408
387	409	installcheck: installcheck-am
388	410	install-strip:
389		$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
390		install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
391		`test -z '$(STRIP)' \|\| \
392		echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
	411	if test -z '$(STRIP)'; then \
	412	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
	413	install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
	414	install; \
	415	else \
	416	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
	417	install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
	418	"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
	419	fi
393	420	mostlyclean-generic:
394	421	-test -z "$(MOSTLYCLEANFILES)" \|\| rm -f $(MOSTLYCLEANFILES)
395	422

+45

-11

headers/Makefile.in less more

0		# Makefile.in generated by automake 1.11.1 from Makefile.am.
	0	# Makefile.in generated by automake 1.11.6 from Makefile.am.
1	1	# @configure_input@
2	2
3	3	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4		# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
5		# Inc.
	4	# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
	5	# Foundation, Inc.
6	6	# This Makefile.in is free software; the Free Software Foundation
7	7	# gives unlimited permission to copy and/or distribute it,
8	8	# with or without modifications, as long as this notice is preserved.

15	15	@SET_MAKE@
16	16
17	17	VPATH = @srcdir@
	18	am__make_dryrun = \
	19	{ \
	20	am__dry=no; \
	21	case $$MAKEFLAGS in \
	22	\\[\ \ ]) \
	23	echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
	24	\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
	25	*) \
	26	for am__flg in $$MAKEFLAGS; do \
	27	case $$am__flg in \
	28	=\|--*) ;; \
	29	n) am__dry=yes; break;; \
	30	esac; \
	31	done;; \
	32	esac; \
	33	test $$am__dry = yes; \
	34	}
18	35	pkgdatadir = $(datadir)/@PACKAGE@
19	36	pkgincludedir = $(includedir)/@PACKAGE@
20	37	pkglibdir = $(libdir)/@PACKAGE@

49	66	CONFIG_CLEAN_VPATH_FILES =
50	67	SOURCES =
51	68	DIST_SOURCES =
	69	am__can_run_installinfo = \
	70	case $$AM_UPDATE_INFO_DIR in \
	71	n\|no\|NO) false;; \
	72	*) (install-info --version) >/dev/null 2>&1;; \
	73	esac
52	74	am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`;
53	75	am__vpath_adj = case $$p in \
54	76	$(srcdir)/*) f=`echo "$$p" \| sed "s\|^$$srcdirstrip/\|\|"`;; \

70	92	am__base_list = \
71	93	sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' \| \
72	94	sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
	95	am__uninstall_files_from_dir = { \
	96	test -z "$$files" \
	97	\|\| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
	98	\|\| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
	99	$(am__cd) "$$dir" && rm -f $$files; }; \
	100	}
73	101	am__installdirs = "$(DESTDIR)$(includedir)"
74	102	HEADERS = $(include_HEADERS) $(noinst_HEADERS)
75	103	ETAGS = etags

238	266	-rm -rf .libs _libs
239	267	install-includeHEADERS: $(include_HEADERS)
240	268	@$(NORMAL_INSTALL)
241		test -z "$(includedir)" \|\| $(MKDIR_P) "$(DESTDIR)$(includedir)"
242	269	@list='$(include_HEADERS)'; test -n "$(includedir)" \|\| list=; \
	270	if test -n "$$list"; then \
	271	echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
	272	$(MKDIR_P) "$(DESTDIR)$(includedir)" \|\| exit 1; \
	273	fi; \
243	274	for p in $$list; do \
244	275	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
245	276	echo "$$d$$p"; \

253	284	@$(NORMAL_UNINSTALL)
254	285	@list='$(include_HEADERS)'; test -n "$(includedir)" \|\| list=; \
255	286	files=`for p in $$list; do echo $$p; done \| sed -e 's\|^.*/\|\|'`; \
256		test -n "$$files" \|\| exit 0; \
257		echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
258		cd "$(DESTDIR)$(includedir)" && rm -f $$files
	287	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
259	288
260	289	ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
261	290	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

356	385
357	386	installcheck: installcheck-am
358	387	install-strip:
359		$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
360		install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
361		`test -z '$(STRIP)' \|\| \
362		echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
	388	if test -z '$(STRIP)'; then \
	389	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
	390	install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
	391	install; \
	392	else \
	393	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
	394	install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
	395	"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
	396	fi
363	397	mostlyclean-generic:
364	398
365	399	clean-generic:

-2

mainpage.doxy less more

65	65
66	66	Open Street Map aka \b OSM [http://www.openstreetmap.org/] is a very popular
67	67	community project aimed to produced a map of the world; this map is absolutely
68		free and is released under the CC-BY-SA license terms
69		[http://creativecommons.org/licenses/by-sa/2.0/].
	68	free and is released under the ODbL license terms
	69	[http://opendatacommons.org/licenses/odbl/].
70	70
71	71	Selected portions [by Country / Region] of the OSM map are available on the
72	72	following download sites:

+43

-9

src/Makefile.in less more

0		# Makefile.in generated by automake 1.11.1 from Makefile.am.
	0	# Makefile.in generated by automake 1.11.6 from Makefile.am.
1	1	# @configure_input@
2	2
3	3	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4		# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
5		# Inc.
	4	# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
	5	# Foundation, Inc.
6	6	# This Makefile.in is free software; the Free Software Foundation
7	7	# gives unlimited permission to copy and/or distribute it,
8	8	# with or without modifications, as long as this notice is preserved.

15	15	@SET_MAKE@
16	16
17	17	VPATH = @srcdir@
	18	am__make_dryrun = \
	19	{ \
	20	am__dry=no; \
	21	case $$MAKEFLAGS in \
	22	\\[\ \ ]) \
	23	echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
	24	\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
	25	*) \
	26	for am__flg in $$MAKEFLAGS; do \
	27	case $$am__flg in \
	28	=\|--*) ;; \
	29	n) am__dry=yes; break;; \
	30	esac; \
	31	done;; \
	32	esac; \
	33	test $$am__dry = yes; \
	34	}
18	35	pkgdatadir = $(datadir)/@PACKAGE@
19	36	pkgincludedir = $(includedir)/@PACKAGE@
20	37	pkglibdir = $(libdir)/@PACKAGE@

67	84	am__base_list = \
68	85	sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' \| \
69	86	sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
	87	am__uninstall_files_from_dir = { \
	88	test -z "$$files" \
	89	\|\| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
	90	\|\| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
	91	$(am__cd) "$$dir" && rm -f $$files; }; \
	92	}
70	93	am__installdirs = "$(DESTDIR)$(libdir)"
71	94	LTLIBRARIES = $(lib_LTLIBRARIES)
72	95	libreadosm_la_LIBADD =

92	115	$(LDFLAGS) -o $@
93	116	SOURCES = $(libreadosm_la_SOURCES)
94	117	DIST_SOURCES = $(libreadosm_la_SOURCES)
	118	am__can_run_installinfo = \
	119	case $$AM_UPDATE_INFO_DIR in \
	120	n\|no\|NO) false;; \
	121	*) (install-info --version) >/dev/null 2>&1;; \
	122	esac
95	123	ETAGS = etags
96	124	CTAGS = ctags
97	125	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

257	285	$(am__aclocal_m4_deps):
258	286	install-libLTLIBRARIES: $(lib_LTLIBRARIES)
259	287	@$(NORMAL_INSTALL)
260		test -z "$(libdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(libdir)"
261	288	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" \|\| list=; \
262	289	list2=; for p in $$list; do \
263	290	if test -f $$p; then \

265	292	else :; fi; \
266	293	done; \
267	294	test -z "$$list2" \|\| { \
	295	echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
	296	$(MKDIR_P) "$(DESTDIR)$(libdir)" \|\| exit 1; \
268	297	echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
269	298	$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
270	299	}

286	315	echo "rm -f \"$${dir}/so_locations\""; \
287	316	rm -f "$${dir}/so_locations"; \
288	317	done
289		libreadosm.la: $(libreadosm_la_OBJECTS) $(libreadosm_la_DEPENDENCIES)
	318	libreadosm.la: $(libreadosm_la_OBJECTS) $(libreadosm_la_DEPENDENCIES) $(EXTRA_libreadosm_la_DEPENDENCIES)
290	319	$(libreadosm_la_LINK) -rpath $(libdir) $(libreadosm_la_OBJECTS) $(libreadosm_la_LIBADD) $(LIBS)
291	320
292	321	mostlyclean-compile:

454	483
455	484	installcheck: installcheck-am
456	485	install-strip:
457		$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
458		install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
459		`test -z '$(STRIP)' \|\| \
460		echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
	486	if test -z '$(STRIP)'; then \
	487	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
	488	install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
	489	install; \
	490	else \
	491	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
	492	install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
	493	"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
	494	fi
461	495	mostlyclean-generic:
462	496	-test -z "$(MOSTLYCLEANFILES)" \|\| rm -f $(MOSTLYCLEANFILES)
463	497

-13

src/osm_objects.c less more

470	470	relation->last_member = mbr_blk;
471	471	}
472	472
473		/* initializing the Tag */
474		switch (type)
475		{
476		case 0:
477		member->member_type = READOSM_MEMBER_NODE;
478		break;
479		case 1:
480		member->member_type = READOSM_MEMBER_WAY;
481		break;
482		case 2:
483		member->member_type = READOSM_MEMBER_RELATION;
484		break;
485		};
	473	member->member_type = type;
486	474	member->id = id;
487	475	len = strlen (role);
488	476	member->role = malloc (len + 1);