Commit ab90ad3a952a4b2b02cd18482b2581883be0d8ff - readosm

Update upstream source from tag 'upstream/1.1.0a+dfsg' Update to upstream version '1.1.0a+dfsg' with Debian dir 9eb086d76ebaa8384248d17e54d3a1048f06817b Bas Couwenberg 3 years ago

16 changed file(s) with 481 addition(s) and 264 deletion(s). Raw diff Collapse all Expand all

-1

Makefile.am less more

1	1
2	2	SUBDIRS = headers src tests examples
3	3
4		EXTRA_DIST = makefile.vc nmake.opt mainpage.doxy
	4	EXTRA_DIST = makefile.vc nmake.opt makefile64.vc nmake64.opt \
	5	mainpage.doxy config-msvc.h
5	6
6	7	AUTOMAKE_OPTIONS = dist-zip foreign
7	8

+12

-7

Makefile.in less more

0		# Makefile.in generated by automake 1.15 from Makefile.am.
	0	# Makefile.in generated by automake 1.16.1 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994-2014 Free Software Foundation, Inc.
	3	# Copyright (C) 1994-2018 Free Software Foundation, Inc.
4	4
5	5	# This Makefile.in is free software; the Free Software Foundation
6	6	# gives unlimited permission to copy and/or distribute it,

166	166	$(RECURSIVE_CLEAN_TARGETS) \
167	167	$(am__extra_recursive_targets)
168	168	AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
169		cscope distdir dist dist-all distcheck
	169	cscope distdir distdir-am dist dist-all distcheck
170	170	am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
171	171	$(LISP)config.h.in
172	172	# Read a list of newline-separated strings from the standard input,

358	358	top_srcdir = @top_srcdir@
359	359	ACLOCAL_AMFLAGS = -I m4
360	360	SUBDIRS = headers src tests examples
361		EXTRA_DIST = makefile.vc nmake.opt mainpage.doxy
	361	EXTRA_DIST = makefile.vc nmake.opt makefile64.vc nmake64.opt \
	362	mainpage.doxy config-msvc.h
	363
362	364	AUTOMAKE_OPTIONS = dist-zip foreign
363	365	pkgconfigdir = $(libdir)/pkgconfig
364	366	pkgconfig_DATA = readosm.pc

388	390	echo ' $(SHELL) ./config.status'; \
389	391	$(SHELL) ./config.status;; \
390	392	*) \
391		echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
392		cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
	393	echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
	394	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
393	395	esac;
394	396
395	397	$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

556	558	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
557	559	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
558	560
559		distdir: $(DISTFILES)
	561	distdir: $(BUILT_SOURCES)
	562	$(MAKE) $(AM_MAKEFLAGS) distdir-am
	563
	564	distdir-am: $(DISTFILES)
560	565	$(am__remove_distdir)
561	566	test -d "$(distdir)" \|\| mkdir "$(distdir)"
562	567	@srcdirstrip=`echo "$(srcdir)" \| sed 's/[].[^$$\\*]/\\\\&/g'`; \

+93

-110

aclocal.m4 less more

0		# generated automatically by aclocal 1.15 -- Autoconf --
1
2		# Copyright (C) 1996-2014 Free Software Foundation, Inc.
	0	# generated automatically by aclocal 1.16.1 -- Autoconf --
	1
	2	# Copyright (C) 1996-2018 Free Software Foundation, Inc.
3	3
4	4	# This file is free software; the Free Software Foundation
5	5	# gives unlimited permission to copy and/or distribute it,

19	19	If you have problems, you may need to regenerate the build system entirely.
20	20	To do so, use the procedure documented by the package, typically 'autoreconf'.])])
21	21
22		# Copyright (C) 2002-2014 Free Software Foundation, Inc.
	22	# Copyright (C) 2002-2018 Free Software Foundation, Inc.
23	23	#
24	24	# This file is free software; the Free Software Foundation
25	25	# gives unlimited permission to copy and/or distribute it,

31	31	# generated from the m4 files accompanying Automake X.Y.
32	32	# (This private macro should not be called outside this file.)
33	33	AC_DEFUN([AM_AUTOMAKE_VERSION],
34		[am__api_version='1.15'
	34	[am__api_version='1.16'
35	35	dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
36	36	dnl require some minimum version. Point them to the right macro.
37		m4_if([$1], [1.15], [],
	37	m4_if([$1], [1.16.1], [],
38	38	[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
39	39	])
40	40

50	50	# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
51	51	# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
52	52	AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
53		[AM_AUTOMAKE_VERSION([1.15])dnl
	53	[AM_AUTOMAKE_VERSION([1.16.1])dnl
54	54	m4_ifndef([AC_AUTOCONF_VERSION],
55	55	[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
56	56	_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
57	57
58	58	# AM_AUX_DIR_EXPAND -- Autoconf --
59	59
60		# Copyright (C) 2001-2014 Free Software Foundation, Inc.
	60	# Copyright (C) 2001-2018 Free Software Foundation, Inc.
61	61	#
62	62	# This file is free software; the Free Software Foundation
63	63	# gives unlimited permission to copy and/or distribute it,

109	109
110	110	# AM_CONDITIONAL -- Autoconf --
111	111
112		# Copyright (C) 1997-2014 Free Software Foundation, Inc.
	112	# Copyright (C) 1997-2018 Free Software Foundation, Inc.
113	113	#
114	114	# This file is free software; the Free Software Foundation
115	115	# gives unlimited permission to copy and/or distribute it,

140	140	Usually this means the macro was only invoked conditionally.]])
141	141	fi])])
142	142
143		# Copyright (C) 1999-2014 Free Software Foundation, Inc.
	143	# Copyright (C) 1999-2018 Free Software Foundation, Inc.
144	144	#
145	145	# This file is free software; the Free Software Foundation
146	146	# gives unlimited permission to copy and/or distribute it,

331	331
332	332	# Generate code to set up dependency tracking. -- Autoconf --
333	333
334		# Copyright (C) 1999-2014 Free Software Foundation, Inc.
335		#
336		# This file is free software; the Free Software Foundation
337		# gives unlimited permission to copy and/or distribute it,
338		# with or without modifications, as long as this notice is preserved.
339
	334	# Copyright (C) 1999-2018 Free Software Foundation, Inc.
	335	#
	336	# This file is free software; the Free Software Foundation
	337	# gives unlimited permission to copy and/or distribute it,
	338	# with or without modifications, as long as this notice is preserved.
340	339
341	340	# _AM_OUTPUT_DEPENDENCY_COMMANDS
342	341	# ------------------------------

345	344	# Older Autoconf quotes --file arguments for eval, but not when files
346	345	# are listed without --file. Let's play safe and only enable the eval
347	346	# if we detect the quoting.
348		case $CONFIG_FILES in
349		\') eval set x "$CONFIG_FILES" ;;
350		*) set x $CONFIG_FILES ;;
351		esac
	347	# TODO: see whether this extra hack can be removed once we start
	348	# requiring Autoconf 2.70 or later.
	349	AS_CASE([$CONFIG_FILES],
	350	[\'], [eval set x "$CONFIG_FILES"],
	351	[*], [set x $CONFIG_FILES])
352	352	shift
353		for mf
	353	# Used to flag and report bootstrapping failures.
	354	am_rc=0
	355	for am_mf
354	356	do
355	357	# Strip MF so we end up with the name of the file.
356		mf=`echo "$mf" \| sed -e 's/:.*$//'`
357		# Check whether this is an Automake generated Makefile or not.
358		# We used to match only the files named 'Makefile.in', but
359		# some people rename them; so instead we look at the file content.
360		# Grep'ing the first line is not enough: some people post-process
361		# each Makefile.in and add a new line on top of each file to say so.
362		# Grep'ing the whole file is not good either: AIX grep has a line
	358	am_mf=`AS_ECHO(["$am_mf"]) \| sed -e 's/:.*$//'`
	359	# Check whether this is an Automake generated Makefile which includes
	360	# dependency-tracking related rules and includes.
	361	# Grep'ing the whole file directly is not great: AIX grep has a line
363	362	# limit of 2048, but all sed's we know have understand at least 4000.
364		if sed -n 's,^#.generated by automake.,X,p' "$mf" \| grep X >/dev/null 2>&1; then
365		dirpart=`AS_DIRNAME("$mf")`
366		else
367		continue
368		fi
369		# Extract the definition of DEPDIR, am__include, and am__quote
370		# from the Makefile without running 'make'.
371		DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
372		test -z "$DEPDIR" && continue
373		am__include=`sed -n 's/^am__include = //p' < "$mf"`
374		test -z "$am__include" && continue
375		am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
376		# Find all dependency output files, they are included files with
377		# $(DEPDIR) in their names. We invoke sed twice because it is the
378		# simplest approach to changing $(DEPDIR) to its actual value in the
379		# expansion.
380		for file in `sed -n "
381		s/^$am__include $am__quote$.(DEPDIR).$$am__quote"'$/\1/p' <"$mf" \| \
382		sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
383		# Make sure the directory exists.
384		test -f "$dirpart/$file" && continue
385		fdir=`AS_DIRNAME(["$file"])`
386		AS_MKDIR_P([$dirpart/$fdir])
387		# echo "creating $dirpart/$file"
388		echo '# dummy' > "$dirpart/$file"
389		done
	363	sed -n 's,^am--depfiles:.*,X,p' "$am_mf" \| grep X >/dev/null 2>&1 \
	364	\|\| continue
	365	am_dirpart=`AS_DIRNAME(["$am_mf"])`
	366	am_filepart=`AS_BASENAME(["$am_mf"])`
	367	AM_RUN_LOG([cd "$am_dirpart" \
	368	&& sed -e '/# am--include-marker/d' "$am_filepart" \
	369	\| $MAKE -f - am--depfiles]) \|\| am_rc=$?
390	370	done
	371	if test $am_rc -ne 0; then
	372	AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
	373	for automatic dependency tracking. Try re-running configure with the
	374	'--disable-dependency-tracking' option to at least be able to build
	375	the package (albeit without support for automatic dependency tracking).])
	376	fi
	377	AS_UNSET([am_dirpart])
	378	AS_UNSET([am_filepart])
	379	AS_UNSET([am_mf])
	380	AS_UNSET([am_rc])
	381	rm -f conftest-deps.mk
391	382	}
392	383	])# _AM_OUTPUT_DEPENDENCY_COMMANDS
393	384

396	387	# -----------------------------
397	388	# This macro should only be invoked once -- use via AC_REQUIRE.
398	389	#
399		# This code is only required when automatic dependency tracking
400		# is enabled. FIXME. This creates each '.P' file that we will
401		# need in order to bootstrap the dependency handling code.
	390	# This code is only required when automatic dependency tracking is enabled.
	391	# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
	392	# order to bootstrap the dependency handling code.
402	393	AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
403	394	[AC_CONFIG_COMMANDS([depfiles],
404	395	[test x"$AMDEP_TRUE" != x"" \|\| _AM_OUTPUT_DEPENDENCY_COMMANDS],
405		[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
406		])
	396	[AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
407	397
408	398	# Do all the work for Automake. -- Autoconf --
409	399
410		# Copyright (C) 1996-2014 Free Software Foundation, Inc.
	400	# Copyright (C) 1996-2018 Free Software Foundation, Inc.
411	401	#
412	402	# This file is free software; the Free Software Foundation
413	403	# gives unlimited permission to copy and/or distribute it,

494	484	AC_REQUIRE([AC_PROG_MKDIR_P])dnl
495	485	# For better backward compatibility. To be removed once Automake 1.9.x
496	486	# dies out for good. For more background, see:
497		# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
498		# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
	487	# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
	488	# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
499	489	AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
500	490	# We need awk for the "check" target (and possibly the TAP driver). The
501	491	# system "awk" is bad on some platforms.

562	552	Aborting the configuration process, to ensure you take notice of the issue.
563	553
564	554	You can download and install GNU coreutils to get an 'rm' implementation
565		that behaves properly: <http://www.gnu.org/software/coreutils/>.
	555	that behaves properly: <https://www.gnu.org/software/coreutils/>.
566	556
567	557	If you want to complete the configuration process using your problematic
568	558	'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM

604	594	done
605	595	echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
606	596
607		# Copyright (C) 2001-2014 Free Software Foundation, Inc.
	597	# Copyright (C) 2001-2018 Free Software Foundation, Inc.
608	598	#
609	599	# This file is free software; the Free Software Foundation
610	600	# gives unlimited permission to copy and/or distribute it,

625	615	fi
626	616	AC_SUBST([install_sh])])
627	617
628		# Copyright (C) 2003-2014 Free Software Foundation, Inc.
	618	# Copyright (C) 2003-2018 Free Software Foundation, Inc.
629	619	#
630	620	# This file is free software; the Free Software Foundation
631	621	# gives unlimited permission to copy and/or distribute it,

647	637	# Add --enable-maintainer-mode option to configure. -- Autoconf --
648	638	# From Jim Meyering
649	639
650		# Copyright (C) 1996-2014 Free Software Foundation, Inc.
	640	# Copyright (C) 1996-2018 Free Software Foundation, Inc.
651	641	#
652	642	# This file is free software; the Free Software Foundation
653	643	# gives unlimited permission to copy and/or distribute it,

682	672
683	673	# Check to see how 'make' treats includes. -- Autoconf --
684	674
685		# Copyright (C) 2001-2014 Free Software Foundation, Inc.
	675	# Copyright (C) 2001-2018 Free Software Foundation, Inc.
686	676	#
687	677	# This file is free software; the Free Software Foundation
688	678	# gives unlimited permission to copy and/or distribute it,

690	680
691	681	# AM_MAKE_INCLUDE()
692	682	# -----------------
693		# Check to see how make treats includes.
	683	# Check whether make has an 'include' directive that can support all
	684	# the idioms we need for our automatic dependency tracking code.
694	685	AC_DEFUN([AM_MAKE_INCLUDE],
695		[am_make=${MAKE-make}
696		cat > confinc << 'END'
	686	[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
	687	cat > confinc.mk << 'END'
697	688	am__doit:
698		@echo this is the am__doit target
	689	@echo this is the am__doit target >confinc.out
699	690	.PHONY: am__doit
700	691	END
701		# If we don't find an include directive, just comment out the code.
702		AC_MSG_CHECKING([for style of include used by $am_make])
703	692	am__include="#"
704	693	am__quote=
705		_am_result=none
706		# First try GNU make style include.
707		echo "include confinc" > confmf
708		# Ignore all kinds of additional output from 'make'.
709		case `$am_make -s -f confmf 2> /dev/null` in #(
710		the\ am__doit\ target)
711		am__include=include
712		am__quote=
713		_am_result=GNU
714		;;
715		esac
716		# Now try BSD make style include.
717		if test "$am__include" = "#"; then
718		echo '.include "confinc"' > confmf
719		case `$am_make -s -f confmf 2> /dev/null` in #(
720		the\ am__doit\ target)
721		am__include=.include
722		am__quote="\""
723		_am_result=BSD
724		;;
725		esac
726		fi
727		AC_SUBST([am__include])
728		AC_SUBST([am__quote])
729		AC_MSG_RESULT([$_am_result])
730		rm -f confinc confmf
731		])
	694	# BSD make does it like this.
	695	echo '.include "confinc.mk" # ignored' > confmf.BSD
	696	# Other make implementations (GNU, Solaris 10, AIX) do it like this.
	697	echo 'include confinc.mk # ignored' > confmf.GNU
	698	_am_result=no
	699	for s in GNU BSD; do
	700	AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
	701	AS_CASE([$?:`cat confinc.out 2>/dev/null`],
	702	['0:this is the am__doit target'],
	703	[AS_CASE([$s],
	704	[BSD], [am__include='.include' am__quote='"'],
	705	[am__include='include' am__quote=''])])
	706	if test "$am__include" != "#"; then
	707	_am_result="yes ($s style)"
	708	break
	709	fi
	710	done
	711	rm -f confinc.* confmf.*
	712	AC_MSG_RESULT([${_am_result}])
	713	AC_SUBST([am__include])])
	714	AC_SUBST([am__quote])])
732	715
733	716	# Fake the existence of programs that GNU maintainers use. -- Autoconf --
734	717
735		# Copyright (C) 1997-2014 Free Software Foundation, Inc.
	718	# Copyright (C) 1997-2018 Free Software Foundation, Inc.
736	719	#
737	720	# This file is free software; the Free Software Foundation
738	721	# gives unlimited permission to copy and/or distribute it,

773	756	# Obsolete and "removed" macros, that must however still report explicit
774	757	# error messages when used, to smooth transition.
775	758	#
776		# Copyright (C) 1996-2014 Free Software Foundation, Inc.
	759	# Copyright (C) 1996-2018 Free Software Foundation, Inc.
777	760	#
778	761	# This file is free software; the Free Software Foundation
779	762	# gives unlimited permission to copy and/or distribute it,

800	783
801	784	# Helper functions for option handling. -- Autoconf --
802	785
803		# Copyright (C) 2001-2014 Free Software Foundation, Inc.
	786	# Copyright (C) 2001-2018 Free Software Foundation, Inc.
804	787	#
805	788	# This file is free software; the Free Software Foundation
806	789	# gives unlimited permission to copy and/or distribute it,

829	812	AC_DEFUN([_AM_IF_OPTION],
830	813	[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
831	814
832		# Copyright (C) 1999-2014 Free Software Foundation, Inc.
	815	# Copyright (C) 1999-2018 Free Software Foundation, Inc.
833	816	#
834	817	# This file is free software; the Free Software Foundation
835	818	# gives unlimited permission to copy and/or distribute it,

876	859	# For backward compatibility.
877	860	AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
878	861
879		# Copyright (C) 2001-2014 Free Software Foundation, Inc.
	862	# Copyright (C) 2001-2018 Free Software Foundation, Inc.
880	863	#
881	864	# This file is free software; the Free Software Foundation
882	865	# gives unlimited permission to copy and/or distribute it,

895	878
896	879	# Check to make sure that the build environment is sane. -- Autoconf --
897	880
898		# Copyright (C) 1996-2014 Free Software Foundation, Inc.
	881	# Copyright (C) 1996-2018 Free Software Foundation, Inc.
899	882	#
900	883	# This file is free software; the Free Software Foundation
901	884	# gives unlimited permission to copy and/or distribute it,

976	959	rm -f conftest.file
977	960	])
978	961
979		# Copyright (C) 2009-2014 Free Software Foundation, Inc.
	962	# Copyright (C) 2009-2018 Free Software Foundation, Inc.
980	963	#
981	964	# This file is free software; the Free Software Foundation
982	965	# gives unlimited permission to copy and/or distribute it,

1036	1019	_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1037	1020	])
1038	1021
1039		# Copyright (C) 2001-2014 Free Software Foundation, Inc.
	1022	# Copyright (C) 2001-2018 Free Software Foundation, Inc.
1040	1023	#
1041	1024	# This file is free software; the Free Software Foundation
1042	1025	# gives unlimited permission to copy and/or distribute it,

1064	1047	INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1065	1048	AC_SUBST([INSTALL_STRIP_PROGRAM])])
1066	1049
1067		# Copyright (C) 2006-2014 Free Software Foundation, Inc.
	1050	# Copyright (C) 2006-2018 Free Software Foundation, Inc.
1068	1051	#
1069	1052	# This file is free software; the Free Software Foundation
1070	1053	# gives unlimited permission to copy and/or distribute it,

1083	1066
1084	1067	# Check how to create a tarball. -- Autoconf --
1085	1068
1086		# Copyright (C) 2004-2014 Free Software Foundation, Inc.
	1069	# Copyright (C) 2004-2018 Free Software Foundation, Inc.
1087	1070	#
1088	1071	# This file is free software; the Free Software Foundation
1089	1072	# gives unlimited permission to copy and/or distribute it,

+129

-0

config-msvc.h less more

	0	/* config.h. Generated from config.h.in by configure. */
	1	/* config.h.in. Generated from configure.ac by autoheader. */
	2	/*
	3	/ Sandro: manually adjusted so to support the MSVC compiler
	4	/ using the OsGeo4W libraries
	5	/* Define to 1 if you have the <dlfcn.h> header file. */
	6	#define HAVE_DLFCN_H 1
	7
	8	/* Define to 1 if you have the <expat.h> header file. */
	9	#define HAVE_EXPAT_H 1
	10
	11	/* Define to 1 if you have the <inttypes.h> header file. */
	12	#define HAVE_INTTYPES_H 1
	13
	14	/* Define to 1 if you have the `expat' library (-lexpat). */
	15	#define HAVE_LIBEXPAT 1
	16
	17	/* Define to 1 if you have the `z' library (-lz). */
	18	#define HAVE_LIBZ 1
	19
	20	/* Define to 1 if `lstat' has the bug that it succeeds when given the
	21	zero-length file name argument. */
	22	/* #undef HAVE_LSTAT_EMPTY_STRING_BUG */
	23
	24	/* Define to 1 if you have the <memory.h> header file. */
	25	#define HAVE_MEMORY_H 1
	26
	27	/* Define to 1 if you have the `sqrt' function. */
	28	/* #undef HAVE_SQRT */
	29
	30	/* Define to 1 if `stat' has the bug that it succeeds when given the
	31	zero-length file name argument. */
	32	/* #undef HAVE_STAT_EMPTY_STRING_BUG */
	33
	34	/* Define to 1 if you have the <stdint.h> header file. */
	35	#define HAVE_STDINT_H 1
	36
	37	/* Define to 1 if you have the <stdio.h> header file. */
	38	#define HAVE_STDIO_H 1
	39
	40	/* Define to 1 if you have the <stdlib.h> header file. */
	41	#define HAVE_STDLIB_H 1
	42
	43	/* Define to 1 if you have the `strcasecmp' function. */
	44	#define HAVE_STRCASECMP 1
	45
	46	/* Define to 1 if you have the `strerror' function. */
	47	#define HAVE_STRERROR 1
	48
	49	/* Define to 1 if you have the `strftime' function. */
	50	#define HAVE_STRFTIME 1
	51
	52	/* Define to 1 if you have the <strings.h> header file. */
	53	#define HAVE_STRINGS_H 1
	54
	55	/* Define to 1 if you have the <string.h> header file. */
	56	#define HAVE_STRING_H 1
	57
	58	/* Define to 1 if you have the `strncasecmp' function. */
	59	#define HAVE_STRNCASECMP 1
	60
	61	/* Define to 1 if you have the `strstr' function. */
	62	#define HAVE_STRSTR 1
	63
	64	/* Define to 1 if you have the <sys/stat.h> header file. */
	65	#define HAVE_SYS_STAT_H 1
	66
	67	/* Define to 1 if you have the <sys/types.h> header file. */
	68	#define HAVE_SYS_TYPES_H 1
	69
	70	/* Define to 1 if you have the <unistd.h> header file. */
	71	#define HAVE_UNISTD_H 1
	72
	73	/* Define to 1 if you have the <zlib.h> header file. */
	74	#define HAVE_ZLIB_H 1
	75
	76	/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
	77	slash. */
	78	#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
	79
	80	/* Define to the sub-directory in which libtool stores uninstalled libraries.
	81	*/
	82	#define LT_OBJDIR ".libs/"
	83
	84	/* Name of package */
	85	#define PACKAGE "readosm"
	86
	87	/* Define to the address where bug reports for this package should be sent. */
	88	#define PACKAGE_BUGREPORT "a.furieri@lqt.it"
	89
	90	/* Define to the full name of this package. */
	91	#define PACKAGE_NAME "readosm"
	92
	93	/* Define to the full name and version of this package. */
	94	#define PACKAGE_STRING "readosm 1.1.0"
	95
	96	/* Define to the one symbol short name of this package. */
	97	#define PACKAGE_TARNAME "readosm"
	98
	99	/* Define to the home page for this package. */
	100	#define PACKAGE_URL ""
	101
	102	/* Define to the version of this package. */
	103	#define PACKAGE_VERSION "1.1.0"
	104
	105	/* Define to 1 if you have the ANSI C header files. */
	106	#define STDC_HEADERS 1
	107
	108	/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
	109	#define TIME_WITH_SYS_TIME 1
	110
	111	/* Define to 1 if your <sys/time.h> declares `struct tm'. */
	112	/* #undef TM_IN_SYS_TIME */
	113
	114	/* Version number of package */
	115	#define VERSION "1.1.0"
	116
	117	/* Define to empty if `const' does not conform to ANSI C. */
	118	/* #undef const */
	119
	120	/* Define to `long int' if <sys/types.h> does not define. */
	121	/* #undef off_t */
	122
	123	/* Define to `unsigned int' if <sys/types.h> does not define. */
	124	/* #undef size_t */
	125
	126	/* Define to empty if the keyword `volatile' does not work. Warning: valid
	127	code using `volatile' can become incorrect without. Disable with care. */
	128	/* #undef volatile */

+106

-105

configure less more

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

589	589	# Identity of this package.
590	590	PACKAGE_NAME='readosm'
591	591	PACKAGE_TARNAME='readosm'
592		PACKAGE_VERSION='1.1.0'
593		PACKAGE_STRING='readosm 1.1.0'
	592	PACKAGE_VERSION='1.1.0a'
	593	PACKAGE_STRING='readosm 1.1.0a'
594	594	PACKAGE_BUGREPORT='a.furieri@lqt.it'
595	595	PACKAGE_URL=''
596	596

679	679	AMDEPBACKSLASH
680	680	AMDEP_FALSE
681	681	AMDEP_TRUE
682		am__quote
683	682	am__include
684	683	DEPDIR
685	684	OBJEXT

756	755	PACKAGE_TARNAME
757	756	PACKAGE_NAME
758	757	PATH_SEPARATOR
759		SHELL'
	758	SHELL
	759	am__quote'
760	760	ac_subst_files=''
761	761	ac_user_opts='
762	762	enable_option_checking

1325	1325	# Omit some internal or obsolete options to make the list less imposing.
1326	1326	# This message is too long to be a string in the A/UX 3.1 sh.
1327	1327	cat <<_ACEOF
1328		\`configure' configures readosm 1.1.0 to adapt to many kinds of systems.
	1328	\`configure' configures readosm 1.1.0a to adapt to many kinds of systems.
1329	1329
1330	1330	Usage: $0 [OPTION]... [VAR=VALUE]...
1331	1331

1395	1395
1396	1396	if test -n "$ac_init_help"; then
1397	1397	case $ac_init_help in
1398		short \| recursive ) echo "Configuration of readosm 1.1.0:";;
	1398	short \| recursive ) echo "Configuration of readosm 1.1.0a:";;
1399	1399	esac
1400	1400	cat <<\_ACEOF
1401	1401

1507	1507	test -n "$ac_init_help" && exit $ac_status
1508	1508	if $ac_init_version; then
1509	1509	cat <<\_ACEOF
1510		readosm configure 1.1.0
	1510	readosm configure 1.1.0a
1511	1511	generated by GNU Autoconf 2.69
1512	1512
1513	1513	Copyright (C) 2012 Free Software Foundation, Inc.

2051	2051	This file contains any messages produced by compilers while
2052	2052	running configure, to aid debugging if configure makes a mistake.
2053	2053
2054		It was created by readosm $as_me 1.1.0, which was
	2054	It was created by readosm $as_me 1.1.0a, which was
2055	2055	generated by GNU Autoconf 2.69. Invocation command line was
2056	2056
2057	2057	$ $0 $@

2436	2436
2437	2437
2438	2438
2439		am__api_version='1.15'
	2439	am__api_version='1.16'
2440	2440
2441	2441	# Find a good install program. We prefer a C program (faster),
2442	2442	# so one script is as good as another. But avoid the broken or

2922	2922
2923	2923	# Define the identity of the package.
2924	2924	PACKAGE='readosm'
2925		VERSION='1.1.0'
	2925	VERSION='1.1.0a'
2926	2926
2927	2927
2928	2928	cat >>confdefs.h <<_ACEOF

2952	2952
2953	2953	# For better backward compatibility. To be removed once Automake 1.9.x
2954	2954	# dies out for good. For more background, see:
2955		# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
2956		# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
	2955	# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
	2956	# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
2957	2957	mkdir_p='$(MKDIR_P)'
2958	2958
2959	2959	# We need awk for the "check" target (and possibly the TAP driver). The

3004	3004	Aborting the configuration process, to ensure you take notice of the issue.
3005	3005
3006	3006	You can download and install GNU coreutils to get an 'rm' implementation
3007		that behaves properly: <http://www.gnu.org/software/coreutils/>.
	3007	that behaves properly: <https://www.gnu.org/software/coreutils/>.
3008	3008
3009	3009	If you want to complete the configuration process using your problematic
3010	3010	'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM

3047	3047
3048	3048	ac_config_commands="$ac_config_commands depfiles"
3049	3049
3050
3051		am_make=${MAKE-make}
3052		cat > confinc << 'END'
	3050	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
	3051	$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
	3052	cat > confinc.mk << 'END'
3053	3053	am__doit:
3054		@echo this is the am__doit target
	3054	@echo this is the am__doit target >confinc.out
3055	3055	.PHONY: am__doit
3056	3056	END
3057		# If we don't find an include directive, just comment out the code.
3058		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
3059		$as_echo_n "checking for style of include used by $am_make... " >&6; }
3060	3057	am__include="#"
3061	3058	am__quote=
3062		_am_result=none
3063		# First try GNU make style include.
3064		echo "include confinc" > confmf
3065		# Ignore all kinds of additional output from 'make'.
3066		case `$am_make -s -f confmf 2> /dev/null` in #(
3067		the\ am__doit\ target)
3068		am__include=include
3069		am__quote=
3070		_am_result=GNU
3071		;;
	3059	# BSD make does it like this.
	3060	echo '.include "confinc.mk" # ignored' > confmf.BSD
	3061	# Other make implementations (GNU, Solaris 10, AIX) do it like this.
	3062	echo 'include confinc.mk # ignored' > confmf.GNU
	3063	_am_result=no
	3064	for s in GNU BSD; do
	3065	{ echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
	3066	(${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
	3067	ac_status=$?
	3068	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	3069	(exit $ac_status); }
	3070	case $?:`cat confinc.out 2>/dev/null` in #(
	3071	'0:this is the am__doit target') :
	3072	case $s in #(
	3073	BSD) :
	3074	am__include='.include' am__quote='"' ;; #(
	3075	*) :
	3076	am__include='include' am__quote='' ;;
	3077	esac ;; #(
	3078	*) :
	3079	;;
3072	3080	esac
3073		# Now try BSD make style include.
3074		if test "$am__include" = "#"; then
3075		echo '.include "confinc"' > confmf
3076		case `$am_make -s -f confmf 2> /dev/null` in #(
3077		the\ am__doit\ target)
3078		am__include=.include
3079		am__quote="\""
3080		_am_result=BSD
3081		;;
3082		esac
3083		fi
3084
3085
3086		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
3087		$as_echo "$_am_result" >&6; }
3088		rm -f confinc confmf
	3081	if test "$am__include" != "#"; then
	3082	_am_result="yes ($s style)"
	3083	break
	3084	fi
	3085	done
	3086	rm -f confinc.* confmf.*
	3087	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
	3088	$as_echo "${_am_result}" >&6; }
3089	3089
3090	3090	# Check whether --enable-dependency-tracking was given.
3091	3091	if test "${enable_dependency_tracking+set}" = set; then :

17675	17675	# report actual input values of CONFIG_FILES etc. instead of their
17676	17676	# values after options handling.
17677	17677	ac_log="
17678		This file was extended by readosm $as_me 1.1.0, which was
	17678	This file was extended by readosm $as_me 1.1.0a, which was
17679	17679	generated by GNU Autoconf 2.69. Invocation command line was
17680	17680
17681	17681	CONFIG_FILES = $CONFIG_FILES

17741	17741	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
17742	17742	ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
17743	17743	ac_cs_version="\\
17744		readosm config.status 1.1.0
	17744	readosm config.status 1.1.0a
17745	17745	configured by $0, generated by GNU Autoconf 2.69,
17746	17746	with options \\"\$ac_cs_config\\"
17747	17747

17860	17860	#
17861	17861	# INIT-COMMANDS
17862	17862	#
17863		AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
	17863	AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
17864	17864
17865	17865
17866	17866	# The HP-UX ksh and POSIX shell print the target directory to stdout

18858	18858	# Older Autoconf quotes --file arguments for eval, but not when files
18859	18859	# are listed without --file. Let's play safe and only enable the eval
18860	18860	# if we detect the quoting.
18861		case $CONFIG_FILES in
18862		\') eval set x "$CONFIG_FILES" ;;
18863		*) set x $CONFIG_FILES ;;
18864		esac
	18861	# TODO: see whether this extra hack can be removed once we start
	18862	# requiring Autoconf 2.70 or later.
	18863	case $CONFIG_FILES in #(
	18864	\') :
	18865	eval set x "$CONFIG_FILES" ;; #(
	18866	*) :
	18867	set x $CONFIG_FILES ;; #(
	18868	*) :
	18869	;;
	18870	esac
18865	18871	shift
18866		for mf
	18872	# Used to flag and report bootstrapping failures.
	18873	am_rc=0
	18874	for am_mf
18867	18875	do
18868	18876	# Strip MF so we end up with the name of the file.
18869		mf=`echo "$mf" \| sed -e 's/:.*$//'`
18870		# Check whether this is an Automake generated Makefile or not.
18871		# We used to match only the files named 'Makefile.in', but
18872		# some people rename them; so instead we look at the file content.
18873		# Grep'ing the first line is not enough: some people post-process
18874		# each Makefile.in and add a new line on top of each file to say so.
18875		# Grep'ing the whole file is not good either: AIX grep has a line
	18877	am_mf=`$as_echo "$am_mf" \| sed -e 's/:.*$//'`
	18878	# Check whether this is an Automake generated Makefile which includes
	18879	# dependency-tracking related rules and includes.
	18880	# Grep'ing the whole file directly is not great: AIX grep has a line
18876	18881	# limit of 2048, but all sed's we know have understand at least 4000.
18877		if sed -n 's,^#.generated by automake.,X,p' "$mf" \| grep X >/dev/null 2>&1; then
18878		dirpart=`$as_dirname -- "$mf" \|\|
18879		$as_expr X"$mf" : 'X$.[^/]$//[^/][^/]/$' \\| \
18880		X"$mf" : 'X$//$[^/]' \\| \
18881		X"$mf" : 'X$//$$' \\| \
18882		X"$mf" : 'X$/$' \\| . 2>/dev/null \|\|
18883		$as_echo X"$mf" \|
	18882	sed -n 's,^am--depfiles:.*,X,p' "$am_mf" \| grep X >/dev/null 2>&1 \
	18883	\|\| continue
	18884	am_dirpart=`$as_dirname -- "$am_mf" \|\|
	18885	$as_expr X"$am_mf" : 'X$.[^/]$//[^/][^/]/$' \\| \
	18886	X"$am_mf" : 'X$//$[^/]' \\| \
	18887	X"$am_mf" : 'X$//$$' \\| \
	18888	X"$am_mf" : 'X$/$' \\| . 2>/dev/null \|\|
	18889	$as_echo X"$am_mf" \|
18884	18890	sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
18885	18891	s//\1/
18886	18892	q

18898	18904	q
18899	18905	}
18900	18906	s/.*/./; q'`
18901		else
18902		continue
18903		fi
18904		# Extract the definition of DEPDIR, am__include, and am__quote
18905		# from the Makefile without running 'make'.
18906		DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
18907		test -z "$DEPDIR" && continue
18908		am__include=`sed -n 's/^am__include = //p' < "$mf"`
18909		test -z "$am__include" && continue
18910		am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
18911		# Find all dependency output files, they are included files with
18912		# $(DEPDIR) in their names. We invoke sed twice because it is the
18913		# simplest approach to changing $(DEPDIR) to its actual value in the
18914		# expansion.
18915		for file in `sed -n "
18916		s/^$am__include $am__quote$.(DEPDIR).$$am__quote"'$/\1/p' <"$mf" \| \
18917		sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
18918		# Make sure the directory exists.
18919		test -f "$dirpart/$file" && continue
18920		fdir=`$as_dirname -- "$file" \|\|
18921		$as_expr X"$file" : 'X$.[^/]$//[^/][^/]/$' \\| \
18922		X"$file" : 'X$//$[^/]' \\| \
18923		X"$file" : 'X$//$$' \\| \
18924		X"$file" : 'X$/$' \\| . 2>/dev/null \|\|
18925		$as_echo X"$file" \|
18926		sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
	18907	am_filepart=`$as_basename -- "$am_mf" \|\|
	18908	$as_expr X/"$am_mf" : './$[^/][^/]$/*$' \\| \
	18909	X"$am_mf" : 'X$//$$' \\| \
	18910	X"$am_mf" : 'X$/$' \\| . 2>/dev/null \|\|
	18911	$as_echo X/"$am_mf" \|
	18912	sed '/^.\/$[^/][^/]$\/*$/{
18927	18913	s//\1/
18928	18914	q
18929	18915	}
18930		/^X$\/\/$[^/].*/{
	18916	/^X\/$\/\/$$/{
18931	18917	s//\1/
18932	18918	q
18933	18919	}
18934		/^X$\/\/$$/{
18935		s//\1/
18936		q
18937		}
18938		/^X$\/$.*/{
	18920	/^X\/$\/$.*/{
18939	18921	s//\1/
18940	18922	q
18941	18923	}
18942	18924	s/.*/./; q'`
18943		as_dir=$dirpart/$fdir; as_fn_mkdir_p
18944		# echo "creating $dirpart/$file"
18945		echo '# dummy' > "$dirpart/$file"
18946		done
	18925	{ echo "$as_me:$LINENO: cd "$am_dirpart" \
	18926	&& sed -e '/# am--include-marker/d' "$am_filepart" \
	18927	\| $MAKE -f - am--depfiles" >&5
	18928	(cd "$am_dirpart" \
	18929	&& sed -e '/# am--include-marker/d' "$am_filepart" \
	18930	\| $MAKE -f - am--depfiles) >&5 2>&5
	18931	ac_status=$?
	18932	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	18933	(exit $ac_status); } \|\| am_rc=$?
18947	18934	done
	18935	if test $am_rc -ne 0; then
	18936	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
	18937	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
	18938	as_fn_error $? "Something went wrong bootstrapping makefile fragments
	18939	for automatic dependency tracking. Try re-running configure with the
	18940	'--disable-dependency-tracking' option to at least be able to build
	18941	the package (albeit without support for automatic dependency tracking).
	18942	See \`config.log' for more details" "$LINENO" 5; }
	18943	fi
	18944	{ am_dirpart=; unset am_dirpart;}
	18945	{ am_filepart=; unset am_filepart;}
	18946	{ am_mf=; unset am_mf;}
	18947	{ am_rc=; unset am_rc;}
	18948	rm -f conftest-deps.mk
18948	18949	}
18949	18950	;;
18950	18951	"libtool":C)

-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.1.0, a.furieri@lqt.it)
	4	AC_INIT(readosm, 1.1.0a, a.furieri@lqt.it)
5	5	AC_LANG(C)
6	6	AC_CONFIG_AUX_DIR([.])
7	7	AC_CONFIG_MACRO_DIR([m4])

+29

-14

examples/Makefile.in less more

0		# Makefile.in generated by automake 1.15 from Makefile.am.
	0	# Makefile.in generated by automake 1.16.1 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994-2014 Free Software Foundation, Inc.
	3	# Copyright (C) 1994-2018 Free Software Foundation, Inc.
4	4
5	5	# This Makefile.in is free software; the Free Software Foundation
6	6	# gives unlimited permission to copy and/or distribute it,

130	130	am__v_at_1 =
131	131	DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
132	132	depcomp = $(SHELL) $(top_srcdir)/depcomp
133		am__depfiles_maybe = depfiles
	133	am__maybe_remake_depfiles = depfiles
	134	am__depfiles_remade = ./$(DEPDIR)/test_osm1.Po \
	135	./$(DEPDIR)/test_osm2.Po ./$(DEPDIR)/test_osm3.Po
134	136	am__mv = mv -f
135	137	COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
136	138	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

324	326	config.status) \
325	327	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
326	328	*) \
327		echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
328		cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
	329	echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
	330	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
329	331	esac;
330	332
331	333	$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

364	366	distclean-compile:
365	367	-rm -f *.tab.c
366	368
367		@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_osm1.Po@am__quote@
368		@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_osm2.Po@am__quote@
369		@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_osm3.Po@am__quote@
	369	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_osm1.Po@am__quote@ # am--include-marker
	370	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_osm2.Po@am__quote@ # am--include-marker
	371	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_osm3.Po@am__quote@ # am--include-marker
	372
	373	$(am__depfiles_remade):
	374	@$(MKDIR_P) $(@D)
	375	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
	376
	377	am--depfiles: $(am__depfiles_remade)
370	378
371	379	.c.o:
372	380	@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

447	455	distclean-tags:
448	456	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
449	457
450		distdir: $(DISTFILES)
	458	distdir: $(BUILT_SOURCES)
	459	$(MAKE) $(AM_MAKEFLAGS) distdir-am
	460
	461	distdir-am: $(DISTFILES)
451	462	@srcdirstrip=`echo "$(srcdir)" \| sed 's/[].[^$$\\*]/\\\\&/g'`; \
452	463	topsrcdirstrip=`echo "$(top_srcdir)" \| sed 's/[].[^$$\\*]/\\\\&/g'`; \
453	464	list='$(DISTFILES)'; \

518	529	mostlyclean-am
519	530
520	531	distclean: distclean-am
521		-rm -rf ./$(DEPDIR)
	532	-rm -f ./$(DEPDIR)/test_osm1.Po
	533	-rm -f ./$(DEPDIR)/test_osm2.Po
	534	-rm -f ./$(DEPDIR)/test_osm3.Po
522	535	-rm -f Makefile
523	536	distclean-am: clean-am distclean-compile distclean-generic \
524	537	distclean-tags

564	577	installcheck-am:
565	578
566	579	maintainer-clean: maintainer-clean-am
567		-rm -rf ./$(DEPDIR)
	580	-rm -f ./$(DEPDIR)/test_osm1.Po
	581	-rm -f ./$(DEPDIR)/test_osm2.Po
	582	-rm -f ./$(DEPDIR)/test_osm3.Po
568	583	-rm -f Makefile
569	584	maintainer-clean-am: distclean-am maintainer-clean-generic
570	585

585	600
586	601	.MAKE: install-am install-strip
587	602
588		.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
589		clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
590		ctags-am distclean distclean-compile distclean-generic \
	603	.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
	604	clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \
	605	ctags ctags-am distclean distclean-compile distclean-generic \
591	606	distclean-libtool distclean-tags distdir dvi dvi-am html \
592	607	html-am info info-am install install-am install-data \
593	608	install-data-am install-dvi install-dvi-am install-exec \

-5

headers/Makefile.in less more

0		# Makefile.in generated by automake 1.15 from Makefile.am.
	0	# Makefile.in generated by automake 1.16.1 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994-2014 Free Software Foundation, Inc.
	3	# Copyright (C) 1994-2018 Free Software Foundation, Inc.
4	4
5	5	# This Makefile.in is free software; the Free Software Foundation
6	6	# gives unlimited permission to copy and/or distribute it,

313	313	config.status) \
314	314	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
315	315	*) \
316		echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
317		cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
	316	echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
	317	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
318	318	esac;
319	319
320	320	$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

405	405	distclean-tags:
406	406	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
407	407
408		distdir: $(DISTFILES)
	408	distdir: $(BUILT_SOURCES)
	409	$(MAKE) $(AM_MAKEFLAGS) distdir-am
	410
	411	distdir-am: $(DISTFILES)
409	412	@srcdirstrip=`echo "$(srcdir)" \| sed 's/[].[^$$\\*]/\\\\&/g'`; \
410	413	topsrcdirstrip=`echo "$(top_srcdir)" \| sed 's/[].[^$$\\*]/\\\\&/g'`; \
411	414	list='$(DISTFILES)'; \

-1

makefile.vc less more

7	7	src\protobuf.obj src\osm_objects.obj
8	8	READOSM_DLL = readosm$(VERSION).dll
9	9
10		CFLAGS = /nologo -IC:\OSGeo4W\include -Iheaders $(OPTFLAGS)
	10	CFLAGS = /nologo -I. -Iheaders -IC:\OSGeo4W\include $(OPTFLAGS)
11	11
12	12	default: all
13	13

+49

-0

makefile64.vc less more

	0	# $Id: makefile.vc 2012/05/05 Sandro Furieri $
	1	#
	2	# NMAKE Makefile to build libreadosm on Windows
	3	#
	4	!INCLUDE nmake64.opt
	5
	6	LIBOBJ = src\readosm.obj src\osmxml.obj \
	7	src\protobuf.obj src\osm_objects.obj
	8	READOSM_DLL = readosm$(VERSION).dll
	9
	10	CFLAGS = /nologo -I. -Iheaders -IC:\OSGeo4W\include $(OPTFLAGS)
	11
	12	default: all
	13
	14	all: readosm.lib readosm_i.lib
	15
	16	readosm.lib: $(LIBOBJ)
	17	if exist readosm.lib del readosm.lib
	18	lib /out:readosm.lib $(LIBOBJ)
	19
	20	$(READOSM_DLL): readosm_i.lib
	21
	22	readosm_i.lib: $(LIBOBJ)
	23	link /debug /dll /out:$(READOSM_DLL) \
	24	/implib:readosm_i.lib $(LIBOBJ) \
	25	C:\OSGeo4w64\lib\expat.lib C:\OSGeo4w64\lib\zlib.lib
	26	if exist $(READOSM_DLL).manifest mt -manifest \
	27	$(READOSM_DLL).manifest -outputresource:$(READOSM_DLL);2
	28
	29	.c.obj:
	30	$(CC) $(CFLAGS) /c $*.c /Fo$@
	31
	32	clean:
	33	del *.dll
	34	del *.exp
	35	del *.manifest
	36	del *.lib
	37	del *.obj
	38	del *.pdb
	39
	40	install: all
	41	-mkdir $(INSTDIR)
	42	-mkdir $(INSTDIR)\bin
	43	-mkdir $(INSTDIR)\lib
	44	-mkdir $(INSTDIR)\include
	45	copy *.dll $(INSTDIR)\bin
	46	copy *.lib $(INSTDIR)\lib
	47	copy headers\readosm.h $(INSTDIR)\include
	48

+13

-0

nmake64.opt less more

	0	# Directory tree where ReadOSM will be installed.
	1	INSTDIR=C:\OSGeo4W64
	2
	3	# Uncomment the first for an optimized build, or the second for debug.
	4	OPTFLAGS= /nologo /Ox /fp:precise /W3 /MD /D_CRT_SECURE_NO_WARNINGS \
	5	/DDLL_EXPORT
	6	#OPTFLAGS= /nologo /Zi /MD /Fdreadosm.pdb /DDLL_EXPORT
	7
	8	# Set the version number for the DLL. Normally we leave this blank since
	9	# we want software that is dynamically loading the DLL to have no problem
	10	# with version numbers.
	11	VERSION=
	12

+34

-15

src/Makefile.in less more

0		# Makefile.in generated by automake 1.15 from Makefile.am.
	0	# Makefile.in generated by automake 1.16.1 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994-2014 Free Software Foundation, Inc.
	3	# Copyright (C) 1994-2018 Free Software Foundation, Inc.
4	4
5	5	# This Makefile.in is free software; the Free Software Foundation
6	6	# gives unlimited permission to copy and/or distribute it,

155	155	am__v_at_1 =
156	156	DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
157	157	depcomp = $(SHELL) $(top_srcdir)/depcomp
158		am__depfiles_maybe = depfiles
	158	am__maybe_remake_depfiles = depfiles
	159	am__depfiles_remade = ./$(DEPDIR)/libreadosm_la-osm_objects.Plo \
	160	./$(DEPDIR)/libreadosm_la-osmxml.Plo \
	161	./$(DEPDIR)/libreadosm_la-protobuf.Plo \
	162	./$(DEPDIR)/libreadosm_la-readosm.Plo
159	163	am__mv = mv -f
160	164	COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
161	165	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

351	355	config.status) \
352	356	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
353	357	*) \
354		echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
355		cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
	358	echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
	359	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
356	360	esac;
357	361
358	362	$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

408	412	distclean-compile:
409	413	-rm -f *.tab.c
410	414
411		@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libreadosm_la-osm_objects.Plo@am__quote@
412		@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libreadosm_la-osmxml.Plo@am__quote@
413		@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libreadosm_la-protobuf.Plo@am__quote@
414		@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libreadosm_la-readosm.Plo@am__quote@
	415	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libreadosm_la-osm_objects.Plo@am__quote@ # am--include-marker
	416	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libreadosm_la-osmxml.Plo@am__quote@ # am--include-marker
	417	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libreadosm_la-protobuf.Plo@am__quote@ # am--include-marker
	418	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libreadosm_la-readosm.Plo@am__quote@ # am--include-marker
	419
	420	$(am__depfiles_remade):
	421	@$(MKDIR_P) $(@D)
	422	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
	423
	424	am--depfiles: $(am__depfiles_remade)
415	425
416	426	.c.o:
417	427	@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

520	530	distclean-tags:
521	531	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
522	532
523		distdir: $(DISTFILES)
	533	distdir: $(BUILT_SOURCES)
	534	$(MAKE) $(AM_MAKEFLAGS) distdir-am
	535
	536	distdir-am: $(DISTFILES)
524	537	@srcdirstrip=`echo "$(srcdir)" \| sed 's/[].[^$$\\*]/\\\\&/g'`; \
525	538	topsrcdirstrip=`echo "$(top_srcdir)" \| sed 's/[].[^$$\\*]/\\\\&/g'`; \
526	539	list='$(DISTFILES)'; \

594	607	mostlyclean-am
595	608
596	609	distclean: distclean-am
597		-rm -rf ./$(DEPDIR)
	610	-rm -f ./$(DEPDIR)/libreadosm_la-osm_objects.Plo
	611	-rm -f ./$(DEPDIR)/libreadosm_la-osmxml.Plo
	612	-rm -f ./$(DEPDIR)/libreadosm_la-protobuf.Plo
	613	-rm -f ./$(DEPDIR)/libreadosm_la-readosm.Plo
598	614	-rm -f Makefile
599	615	distclean-am: clean-am distclean-compile distclean-generic \
600	616	distclean-tags

640	656	installcheck-am:
641	657
642	658	maintainer-clean: maintainer-clean-am
643		-rm -rf ./$(DEPDIR)
	659	-rm -f ./$(DEPDIR)/libreadosm_la-osm_objects.Plo
	660	-rm -f ./$(DEPDIR)/libreadosm_la-osmxml.Plo
	661	-rm -f ./$(DEPDIR)/libreadosm_la-protobuf.Plo
	662	-rm -f ./$(DEPDIR)/libreadosm_la-readosm.Plo
644	663	-rm -f Makefile
645	664	maintainer-clean-am: distclean-am maintainer-clean-generic
646	665

661	680
662	681	.MAKE: install-am install-strip
663	682
664		.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
665		clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
666		ctags-am distclean distclean-compile distclean-generic \
	683	.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
	684	clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \
	685	ctags ctags-am distclean distclean-compile distclean-generic \
667	686	distclean-libtool distclean-tags distdir dvi dvi-am html \
668	687	html-am info info-am install install-am install-data \
669	688	install-data-am install-dvi install-dvi-am install-exec \

-1

src/osm_objects.c less more

48	48	#include <string.h>
49	49
50	50	#if defined(_WIN32) && !defined(__MINGW32__)
51		/* MSVC: avoiding to include at all config.h */
	51	#include "config-msvc.h"
52	52	#else
53	53	#include "config.h"
54	54	#endif

-1

src/osmxml.c less more

50	50	#include <expat.h>
51	51
52	52	#if defined(_WIN32) && !defined(__MINGW32__)
53		/* MSVC: avoiding to include at all config.h */
	53	#include "config-msvc.h"
54	54	#else
55	55	#include "config.h"
56	56	#endif

-1

src/protobuf.c less more

52	52	#include <zlib.h>
53	53
54	54	#if defined(_WIN32) && !defined(__MINGW32__)
55		/* MSVC: avoiding to include at all config.h */
	55	#include "config-msvc.h"
56	56	#else
57	57	#include "config.h"
58	58	#endif

-2

src/readosm.c less more

48	48	#include <string.h>
49	49
50	50	#if defined(_WIN32) && !defined(__MINGW32__)
51		/* MSVC: avoiding to include at all config.h */
52		#define VERSION 1.1.0
	51	#include "config-msvc.h"
53	52	#else
54	53	#include "config.h"
55	54	#endif