Merge tag 'upstream/1.0.0e'
Upstream version 1.0.0e
Bas Couwenberg
8 years ago
12 | 12 | lcov --directory src --capture --initial --output-file readosm_cov.info |
13 | 13 | |
14 | 14 | coverage:: |
15 | lcov --directory src --output-file readosm_cov.info --capture | |
16 | genhtml -o covresults readosm_cov.info | |
15 | lcov --rc lcov_branch_coverage=1 --directory src --output-file readosm_cov.info --capture | |
16 | genhtml --rc lcov_branch_coverage=1 -o covresults readosm_cov.info | |
17 | 17 | |
18 | 18 | MOSTLYCLEANFILES = readosm_cov.info |
0 | # Makefile.in generated by automake 1.14.1 from Makefile.am. | |
0 | # Makefile.in generated by automake 1.15 from Makefile.am. | |
1 | 1 | # @configure_input@ |
2 | 2 | |
3 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | |
3 | # Copyright (C) 1994-2014 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, |
14 | 14 | @SET_MAKE@ |
15 | 15 | |
16 | 16 | VPATH = @srcdir@ |
17 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | |
17 | am__is_gnu_make = { \ | |
18 | if test -z '$(MAKELEVEL)'; then \ | |
19 | false; \ | |
20 | elif test -n '$(MAKE_HOST)'; then \ | |
21 | true; \ | |
22 | elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ | |
23 | true; \ | |
24 | else \ | |
25 | false; \ | |
26 | fi; \ | |
27 | } | |
18 | 28 | am__make_running_with_option = \ |
19 | 29 | case $${target_option-} in \ |
20 | 30 | ?) ;; \ |
78 | 88 | build_triplet = @build@ |
79 | 89 | host_triplet = @host@ |
80 | 90 | subdir = . |
81 | DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ | |
82 | $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ | |
83 | $(top_srcdir)/configure $(am__configure_deps) \ | |
84 | $(srcdir)/config.h.in $(srcdir)/Doxyfile.in \ | |
85 | $(srcdir)/readosm.pc.in COPYING compile config.guess \ | |
86 | config.sub depcomp install-sh missing ltmain.sh | |
87 | 91 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
88 | 92 | am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ |
89 | 93 | $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
91 | 95 | $(top_srcdir)/configure.ac |
92 | 96 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
93 | 97 | $(ACLOCAL_M4) |
98 | DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ | |
99 | $(am__configure_deps) $(am__DIST_COMMON) | |
94 | 100 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
95 | 101 | configure.lineno config.status.lineno |
96 | 102 | mkinstalldirs = $(install_sh) -d |
183 | 189 | CTAGS = ctags |
184 | 190 | CSCOPE = cscope |
185 | 191 | DIST_SUBDIRS = $(SUBDIRS) |
192 | am__DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.in \ | |
193 | $(srcdir)/config.h.in $(srcdir)/readosm.pc.in AUTHORS COPYING \ | |
194 | ChangeLog INSTALL NEWS README compile config.guess config.sub \ | |
195 | depcomp install-sh ltmain.sh missing | |
186 | 196 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
187 | 197 | distdir = $(PACKAGE)-$(VERSION) |
188 | 198 | top_distdir = $(distdir) |
372 | 382 | echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ |
373 | 383 | $(am__cd) $(top_srcdir) && \ |
374 | 384 | $(AUTOMAKE) --gnu Makefile |
375 | .PRECIOUS: Makefile | |
376 | 385 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
377 | 386 | @case '$?' in \ |
378 | 387 | *config.status*) \ |
628 | 637 | $(am__post_remove_distdir) |
629 | 638 | |
630 | 639 | dist-tarZ: distdir |
631 | @echo WARNING: "Support for shar distribution archives is" \ | |
632 | "deprecated." >&2 | |
640 | @echo WARNING: "Support for distribution archives compressed with" \ | |
641 | "legacy program 'compress' is deprecated." >&2 | |
633 | 642 | @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
634 | 643 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
635 | 644 | $(am__post_remove_distdir) |
636 | 645 | |
637 | 646 | dist-shar: distdir |
638 | @echo WARNING: "Support for distribution archives compressed with" \ | |
639 | "legacy program 'compress' is deprecated." >&2 | |
647 | @echo WARNING: "Support for shar distribution archives is" \ | |
648 | "deprecated." >&2 | |
640 | 649 | @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
641 | 650 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
642 | 651 | $(am__post_remove_distdir) |
671 | 680 | esac |
672 | 681 | chmod -R a-w $(distdir) |
673 | 682 | chmod u+w $(distdir) |
674 | mkdir $(distdir)/_build $(distdir)/_inst | |
683 | mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst | |
675 | 684 | chmod a-w $(distdir) |
676 | 685 | test -d $(distdir)/_build || exit 0; \ |
677 | 686 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
678 | 687 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
679 | 688 | && am__cwd=`pwd` \ |
680 | && $(am__cd) $(distdir)/_build \ | |
681 | && ../configure \ | |
689 | && $(am__cd) $(distdir)/_build/sub \ | |
690 | && ../../configure \ | |
682 | 691 | $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
683 | 692 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
684 | --srcdir=.. --prefix="$$dc_install_base" \ | |
693 | --srcdir=../.. --prefix="$$dc_install_base" \ | |
685 | 694 | && $(MAKE) $(AM_MAKEFLAGS) \ |
686 | 695 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
687 | 696 | && $(MAKE) $(AM_MAKEFLAGS) check \ |
862 | 871 | mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ |
863 | 872 | uninstall-am uninstall-pkgconfigDATA |
864 | 873 | |
874 | .PRECIOUS: Makefile | |
875 | ||
865 | 876 | |
866 | 877 | coverage-init: |
867 | 878 | lcov --directory src --capture --initial --output-file readosm_cov.info |
868 | 879 | |
869 | 880 | coverage:: |
870 | lcov --directory src --output-file readosm_cov.info --capture | |
871 | genhtml -o covresults readosm_cov.info | |
881 | lcov --rc lcov_branch_coverage=1 --directory src --output-file readosm_cov.info --capture | |
882 | genhtml --rc lcov_branch_coverage=1 -o covresults readosm_cov.info | |
872 | 883 | |
873 | 884 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
874 | 885 | # Otherwise a system limit (for SysV at least) may be exceeded. |
0 | # generated automatically by aclocal 1.14.1 -*- Autoconf -*- | |
1 | ||
2 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. | |
0 | # generated automatically by aclocal 1.15 -*- Autoconf -*- | |
1 | ||
2 | # Copyright (C) 1996-2014 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-2013 Free Software Foundation, Inc. | |
22 | # Copyright (C) 2002-2014 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.14' | |
34 | [am__api_version='1.15' | |
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.14.1], [], | |
37 | m4_if([$1], [1.15], [], | |
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.14.1])dnl | |
53 | [AM_AUTOMAKE_VERSION([1.15])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-2013 Free Software Foundation, Inc. | |
60 | # Copyright (C) 2001-2014 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, |
102 | 102 | # configured tree to be moved without reconfiguration. |
103 | 103 | |
104 | 104 | AC_DEFUN([AM_AUX_DIR_EXPAND], |
105 | [dnl Rely on autoconf to set up CDPATH properly. | |
106 | AC_PREREQ([2.50])dnl | |
107 | # expand $ac_aux_dir to an absolute path | |
108 | am_aux_dir=`cd $ac_aux_dir && pwd` | |
105 | [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl | |
106 | # Expand $ac_aux_dir to an absolute path. | |
107 | am_aux_dir=`cd "$ac_aux_dir" && pwd` | |
109 | 108 | ]) |
110 | 109 | |
111 | 110 | # AM_CONDITIONAL -*- Autoconf -*- |
112 | 111 | |
113 | # Copyright (C) 1997-2013 Free Software Foundation, Inc. | |
112 | # Copyright (C) 1997-2014 Free Software Foundation, Inc. | |
114 | 113 | # |
115 | 114 | # This file is free software; the Free Software Foundation |
116 | 115 | # gives unlimited permission to copy and/or distribute it, |
141 | 140 | Usually this means the macro was only invoked conditionally.]]) |
142 | 141 | fi])]) |
143 | 142 | |
144 | # Copyright (C) 1999-2013 Free Software Foundation, Inc. | |
143 | # Copyright (C) 1999-2014 Free Software Foundation, Inc. | |
145 | 144 | # |
146 | 145 | # This file is free software; the Free Software Foundation |
147 | 146 | # gives unlimited permission to copy and/or distribute it, |
332 | 331 | |
333 | 332 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
334 | 333 | |
335 | # Copyright (C) 1999-2013 Free Software Foundation, Inc. | |
334 | # Copyright (C) 1999-2014 Free Software Foundation, Inc. | |
336 | 335 | # |
337 | 336 | # This file is free software; the Free Software Foundation |
338 | 337 | # gives unlimited permission to copy and/or distribute it, |
408 | 407 | |
409 | 408 | # Do all the work for Automake. -*- Autoconf -*- |
410 | 409 | |
411 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. | |
410 | # Copyright (C) 1996-2014 Free Software Foundation, Inc. | |
412 | 411 | # |
413 | 412 | # This file is free software; the Free Software Foundation |
414 | 413 | # gives unlimited permission to copy and/or distribute it, |
498 | 497 | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
499 | 498 | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
500 | 499 | AC_SUBST([mkdir_p], ['$(MKDIR_P)']) |
501 | # We need awk for the "check" target. The system "awk" is bad on | |
502 | # some platforms. | |
500 | # We need awk for the "check" target (and possibly the TAP driver). The | |
501 | # system "awk" is bad on some platforms. | |
503 | 502 | AC_REQUIRE([AC_PROG_AWK])dnl |
504 | 503 | AC_REQUIRE([AC_PROG_MAKE_SET])dnl |
505 | 504 | AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
572 | 571 | END |
573 | 572 | AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) |
574 | 573 | fi |
575 | fi]) | |
574 | fi | |
575 | dnl The trailing newline in this macro's definition is deliberate, for | |
576 | dnl backward compatibility and to allow trailing 'dnl'-style comments | |
577 | dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. | |
578 | ]) | |
576 | 579 | |
577 | 580 | dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
578 | 581 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
601 | 604 | done |
602 | 605 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
603 | 606 | |
604 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. | |
607 | # Copyright (C) 2001-2014 Free Software Foundation, Inc. | |
605 | 608 | # |
606 | 609 | # This file is free software; the Free Software Foundation |
607 | 610 | # gives unlimited permission to copy and/or distribute it, |
612 | 615 | # Define $install_sh. |
613 | 616 | AC_DEFUN([AM_PROG_INSTALL_SH], |
614 | 617 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
615 | if test x"${install_sh}" != xset; then | |
618 | if test x"${install_sh+set}" != xset; then | |
616 | 619 | case $am_aux_dir in |
617 | 620 | *\ * | *\ *) |
618 | 621 | install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; |
622 | 625 | fi |
623 | 626 | AC_SUBST([install_sh])]) |
624 | 627 | |
625 | # Copyright (C) 2003-2013 Free Software Foundation, Inc. | |
628 | # Copyright (C) 2003-2014 Free Software Foundation, Inc. | |
626 | 629 | # |
627 | 630 | # This file is free software; the Free Software Foundation |
628 | 631 | # gives unlimited permission to copy and/or distribute it, |
644 | 647 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
645 | 648 | # From Jim Meyering |
646 | 649 | |
647 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. | |
650 | # Copyright (C) 1996-2014 Free Software Foundation, Inc. | |
648 | 651 | # |
649 | 652 | # This file is free software; the Free Software Foundation |
650 | 653 | # gives unlimited permission to copy and/or distribute it, |
679 | 682 | |
680 | 683 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
681 | 684 | |
682 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. | |
685 | # Copyright (C) 2001-2014 Free Software Foundation, Inc. | |
683 | 686 | # |
684 | 687 | # This file is free software; the Free Software Foundation |
685 | 688 | # gives unlimited permission to copy and/or distribute it, |
729 | 732 | |
730 | 733 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
731 | 734 | |
732 | # Copyright (C) 1997-2013 Free Software Foundation, Inc. | |
735 | # Copyright (C) 1997-2014 Free Software Foundation, Inc. | |
733 | 736 | # |
734 | 737 | # This file is free software; the Free Software Foundation |
735 | 738 | # gives unlimited permission to copy and/or distribute it, |
770 | 773 | # Obsolete and "removed" macros, that must however still report explicit |
771 | 774 | # error messages when used, to smooth transition. |
772 | 775 | # |
773 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. | |
776 | # Copyright (C) 1996-2014 Free Software Foundation, Inc. | |
774 | 777 | # |
775 | 778 | # This file is free software; the Free Software Foundation |
776 | 779 | # gives unlimited permission to copy and/or distribute it, |
797 | 800 | |
798 | 801 | # Helper functions for option handling. -*- Autoconf -*- |
799 | 802 | |
800 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. | |
803 | # Copyright (C) 2001-2014 Free Software Foundation, Inc. | |
801 | 804 | # |
802 | 805 | # This file is free software; the Free Software Foundation |
803 | 806 | # gives unlimited permission to copy and/or distribute it, |
826 | 829 | AC_DEFUN([_AM_IF_OPTION], |
827 | 830 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
828 | 831 | |
829 | # Copyright (C) 1999-2013 Free Software Foundation, Inc. | |
832 | # Copyright (C) 1999-2014 Free Software Foundation, Inc. | |
830 | 833 | # |
831 | 834 | # This file is free software; the Free Software Foundation |
832 | 835 | # gives unlimited permission to copy and/or distribute it, |
873 | 876 | # For backward compatibility. |
874 | 877 | AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) |
875 | 878 | |
876 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. | |
879 | # Copyright (C) 2001-2014 Free Software Foundation, Inc. | |
877 | 880 | # |
878 | 881 | # This file is free software; the Free Software Foundation |
879 | 882 | # gives unlimited permission to copy and/or distribute it, |
892 | 895 | |
893 | 896 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
894 | 897 | |
895 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. | |
898 | # Copyright (C) 1996-2014 Free Software Foundation, Inc. | |
896 | 899 | # |
897 | 900 | # This file is free software; the Free Software Foundation |
898 | 901 | # gives unlimited permission to copy and/or distribute it, |
973 | 976 | rm -f conftest.file |
974 | 977 | ]) |
975 | 978 | |
976 | # Copyright (C) 2009-2013 Free Software Foundation, Inc. | |
979 | # Copyright (C) 2009-2014 Free Software Foundation, Inc. | |
977 | 980 | # |
978 | 981 | # This file is free software; the Free Software Foundation |
979 | 982 | # gives unlimited permission to copy and/or distribute it, |
1033 | 1036 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
1034 | 1037 | ]) |
1035 | 1038 | |
1036 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. | |
1039 | # Copyright (C) 2001-2014 Free Software Foundation, Inc. | |
1037 | 1040 | # |
1038 | 1041 | # This file is free software; the Free Software Foundation |
1039 | 1042 | # gives unlimited permission to copy and/or distribute it, |
1061 | 1064 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
1062 | 1065 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
1063 | 1066 | |
1064 | # Copyright (C) 2006-2013 Free Software Foundation, Inc. | |
1067 | # Copyright (C) 2006-2014 Free Software Foundation, Inc. | |
1065 | 1068 | # |
1066 | 1069 | # This file is free software; the Free Software Foundation |
1067 | 1070 | # gives unlimited permission to copy and/or distribute it, |
1080 | 1083 | |
1081 | 1084 | # Check how to create a tarball. -*- Autoconf -*- |
1082 | 1085 | |
1083 | # Copyright (C) 2004-2013 Free Software Foundation, Inc. | |
1086 | # Copyright (C) 2004-2014 Free Software Foundation, Inc. | |
1084 | 1087 | # |
1085 | 1088 | # This file is free software; the Free Software Foundation |
1086 | 1089 | # gives unlimited permission to copy and/or distribute it, |
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.0.0d. | |
2 | # Generated by GNU Autoconf 2.69 for readosm 1.0.0e. | |
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.0.0d' | |
593 | PACKAGE_STRING='readosm 1.0.0d' | |
592 | PACKAGE_VERSION='1.0.0e' | |
593 | PACKAGE_STRING='readosm 1.0.0e' | |
594 | 594 | PACKAGE_BUGREPORT='a.furieri@lqt.it' |
595 | 595 | PACKAGE_URL='' |
596 | 596 | |
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.0.0d to adapt to many kinds of systems. | |
1328 | \`configure' configures readosm 1.0.0e 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.0.0d:";; | |
1398 | short | recursive ) echo "Configuration of readosm 1.0.0e:";; | |
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.0.0d | |
1510 | readosm configure 1.0.0e | |
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.0.0d, which was | |
2054 | It was created by readosm $as_me 1.0.0e, 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.14' | |
2439 | am__api_version='1.15' | |
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 |
2608 | 2608 | ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' |
2609 | 2609 | program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` |
2610 | 2610 | |
2611 | # expand $ac_aux_dir to an absolute path | |
2612 | am_aux_dir=`cd $ac_aux_dir && pwd` | |
2611 | # Expand $ac_aux_dir to an absolute path. | |
2612 | am_aux_dir=`cd "$ac_aux_dir" && pwd` | |
2613 | 2613 | |
2614 | 2614 | if test x"${MISSING+set}" != xset; then |
2615 | 2615 | case $am_aux_dir in |
2628 | 2628 | $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} |
2629 | 2629 | fi |
2630 | 2630 | |
2631 | if test x"${install_sh}" != xset; then | |
2631 | if test x"${install_sh+set}" != xset; then | |
2632 | 2632 | case $am_aux_dir in |
2633 | 2633 | *\ * | *\ *) |
2634 | 2634 | install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; |
2922 | 2922 | |
2923 | 2923 | # Define the identity of the package. |
2924 | 2924 | PACKAGE='readosm' |
2925 | VERSION='1.0.0d' | |
2925 | VERSION='1.0.0e' | |
2926 | 2926 | |
2927 | 2927 | |
2928 | 2928 | cat >>confdefs.h <<_ACEOF |
2956 | 2956 | # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
2957 | 2957 | mkdir_p='$(MKDIR_P)' |
2958 | 2958 | |
2959 | # We need awk for the "check" target. The system "awk" is bad on | |
2960 | # some platforms. | |
2959 | # We need awk for the "check" target (and possibly the TAP driver). The | |
2960 | # system "awk" is bad on some platforms. | |
2961 | 2961 | # Always define AMTAR for backward compatibility. Yes, it's still used |
2962 | 2962 | # in the wild :-( We should find a proper way to deprecate it ... |
2963 | 2963 | AMTAR='$${TAR-tar}' |
3014 | 3014 | as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 |
3015 | 3015 | fi |
3016 | 3016 | fi |
3017 | ||
3017 | 3018 | |
3018 | 3019 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
3019 | 3020 | $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } |
17674 | 17675 | # report actual input values of CONFIG_FILES etc. instead of their |
17675 | 17676 | # values after options handling. |
17676 | 17677 | ac_log=" |
17677 | This file was extended by readosm $as_me 1.0.0d, which was | |
17678 | This file was extended by readosm $as_me 1.0.0e, which was | |
17678 | 17679 | generated by GNU Autoconf 2.69. Invocation command line was |
17679 | 17680 | |
17680 | 17681 | CONFIG_FILES = $CONFIG_FILES |
17740 | 17741 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
17741 | 17742 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
17742 | 17743 | ac_cs_version="\\ |
17743 | readosm config.status 1.0.0d | |
17744 | readosm config.status 1.0.0e | |
17744 | 17745 | configured by $0, generated by GNU Autoconf 2.69, |
17745 | 17746 | with options \\"\$ac_cs_config\\" |
17746 | 17747 |
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.0d, a.furieri@lqt.it) | |
4 | AC_INIT(readosm, 1.0.0e, a.furieri@lqt.it) | |
5 | 5 | AC_LANG(C) |
6 | 6 | AC_CONFIG_AUX_DIR([.]) |
7 | 7 | AC_CONFIG_MACRO_DIR([m4]) |
0 | # Makefile.in generated by automake 1.14.1 from Makefile.am. | |
0 | # Makefile.in generated by automake 1.15 from Makefile.am. | |
1 | 1 | # @configure_input@ |
2 | 2 | |
3 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | |
3 | # Copyright (C) 1994-2014 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, |
14 | 14 | @SET_MAKE@ |
15 | 15 | |
16 | 16 | VPATH = @srcdir@ |
17 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | |
17 | am__is_gnu_make = { \ | |
18 | if test -z '$(MAKELEVEL)'; then \ | |
19 | false; \ | |
20 | elif test -n '$(MAKE_HOST)'; then \ | |
21 | true; \ | |
22 | elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ | |
23 | true; \ | |
24 | else \ | |
25 | false; \ | |
26 | fi; \ | |
27 | } | |
18 | 28 | am__make_running_with_option = \ |
19 | 29 | case $${target_option-} in \ |
20 | 30 | ?) ;; \ |
80 | 90 | noinst_PROGRAMS = test_osm1$(EXEEXT) test_osm2$(EXEEXT) \ |
81 | 91 | test_osm3$(EXEEXT) |
82 | 92 | subdir = examples |
83 | DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ | |
84 | $(top_srcdir)/depcomp | |
85 | 93 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
86 | 94 | am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ |
87 | 95 | $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
89 | 97 | $(top_srcdir)/configure.ac |
90 | 98 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
91 | 99 | $(ACLOCAL_M4) |
100 | DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) | |
92 | 101 | mkinstalldirs = $(install_sh) -d |
93 | 102 | CONFIG_HEADER = $(top_builddir)/config.h |
94 | 103 | CONFIG_CLEAN_FILES = |
167 | 176 | done | $(am__uniquify_input)` |
168 | 177 | ETAGS = etags |
169 | 178 | CTAGS = ctags |
179 | am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp | |
170 | 180 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
171 | 181 | ACLOCAL = @ACLOCAL@ |
172 | 182 | AMTAR = @AMTAR@ |
309 | 319 | echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ |
310 | 320 | $(am__cd) $(top_srcdir) && \ |
311 | 321 | $(AUTOMAKE) --gnu examples/Makefile |
312 | .PRECIOUS: Makefile | |
313 | 322 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
314 | 323 | @case '$?' in \ |
315 | 324 | *config.status*) \ |
590 | 599 | mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
591 | 600 | tags tags-am uninstall uninstall-am |
592 | 601 | |
602 | .PRECIOUS: Makefile | |
603 | ||
593 | 604 | |
594 | 605 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
595 | 606 | # Otherwise a system limit (for SysV at least) may be exceeded. |
0 | # Makefile.in generated by automake 1.14.1 from Makefile.am. | |
0 | # Makefile.in generated by automake 1.15 from Makefile.am. | |
1 | 1 | # @configure_input@ |
2 | 2 | |
3 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | |
3 | # Copyright (C) 1994-2014 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, |
14 | 14 | @SET_MAKE@ |
15 | 15 | |
16 | 16 | VPATH = @srcdir@ |
17 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | |
17 | am__is_gnu_make = { \ | |
18 | if test -z '$(MAKELEVEL)'; then \ | |
19 | false; \ | |
20 | elif test -n '$(MAKE_HOST)'; then \ | |
21 | true; \ | |
22 | elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ | |
23 | true; \ | |
24 | else \ | |
25 | false; \ | |
26 | fi; \ | |
27 | } | |
18 | 28 | am__make_running_with_option = \ |
19 | 29 | case $${target_option-} in \ |
20 | 30 | ?) ;; \ |
78 | 88 | build_triplet = @build@ |
79 | 89 | host_triplet = @host@ |
80 | 90 | subdir = headers |
81 | DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ | |
82 | $(include_HEADERS) $(noinst_HEADERS) | |
83 | 91 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
84 | 92 | am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ |
85 | 93 | $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
87 | 95 | $(top_srcdir)/configure.ac |
88 | 96 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
89 | 97 | $(ACLOCAL_M4) |
98 | DIST_COMMON = $(srcdir)/Makefile.am $(include_HEADERS) \ | |
99 | $(noinst_HEADERS) $(am__DIST_COMMON) | |
90 | 100 | mkinstalldirs = $(install_sh) -d |
91 | 101 | CONFIG_HEADER = $(top_builddir)/config.h |
92 | 102 | CONFIG_CLEAN_FILES = |
158 | 168 | done | $(am__uniquify_input)` |
159 | 169 | ETAGS = etags |
160 | 170 | CTAGS = ctags |
171 | am__DIST_COMMON = $(srcdir)/Makefile.in | |
161 | 172 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
162 | 173 | ACLOCAL = @ACLOCAL@ |
163 | 174 | AMTAR = @AMTAR@ |
297 | 308 | echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu headers/Makefile'; \ |
298 | 309 | $(am__cd) $(top_srcdir) && \ |
299 | 310 | $(AUTOMAKE) --gnu headers/Makefile |
300 | .PRECIOUS: Makefile | |
301 | 311 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
302 | 312 | @case '$?' in \ |
303 | 313 | *config.status*) \ |
544 | 554 | ps ps-am tags tags-am uninstall uninstall-am \ |
545 | 555 | uninstall-includeHEADERS |
546 | 556 | |
557 | .PRECIOUS: Makefile | |
558 | ||
547 | 559 | |
548 | 560 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
549 | 561 | # Otherwise a system limit (for SysV at least) may be exceeded. |
0 | # Makefile.in generated by automake 1.14.1 from Makefile.am. | |
0 | # Makefile.in generated by automake 1.15 from Makefile.am. | |
1 | 1 | # @configure_input@ |
2 | 2 | |
3 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | |
3 | # Copyright (C) 1994-2014 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, |
14 | 14 | @SET_MAKE@ |
15 | 15 | |
16 | 16 | VPATH = @srcdir@ |
17 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | |
17 | am__is_gnu_make = { \ | |
18 | if test -z '$(MAKELEVEL)'; then \ | |
19 | false; \ | |
20 | elif test -n '$(MAKE_HOST)'; then \ | |
21 | true; \ | |
22 | elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ | |
23 | true; \ | |
24 | else \ | |
25 | false; \ | |
26 | fi; \ | |
27 | } | |
18 | 28 | am__make_running_with_option = \ |
19 | 29 | case $${target_option-} in \ |
20 | 30 | ?) ;; \ |
78 | 88 | build_triplet = @build@ |
79 | 89 | host_triplet = @host@ |
80 | 90 | subdir = src |
81 | DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ | |
82 | $(top_srcdir)/depcomp | |
83 | 91 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
84 | 92 | am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ |
85 | 93 | $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
87 | 95 | $(top_srcdir)/configure.ac |
88 | 96 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
89 | 97 | $(ACLOCAL_M4) |
98 | DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) | |
90 | 99 | mkinstalldirs = $(install_sh) -d |
91 | 100 | CONFIG_HEADER = $(top_builddir)/config.h |
92 | 101 | CONFIG_CLEAN_FILES = |
192 | 201 | done | $(am__uniquify_input)` |
193 | 202 | ETAGS = etags |
194 | 203 | CTAGS = ctags |
204 | am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp | |
195 | 205 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
196 | 206 | ACLOCAL = @ACLOCAL@ |
197 | 207 | AMTAR = @AMTAR@ |
336 | 346 | echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ |
337 | 347 | $(am__cd) $(top_srcdir) && \ |
338 | 348 | $(AUTOMAKE) --gnu src/Makefile |
339 | .PRECIOUS: Makefile | |
340 | 349 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
341 | 350 | @case '$?' in \ |
342 | 351 | *config.status*) \ |
666 | 675 | mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
667 | 676 | tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES |
668 | 677 | |
678 | .PRECIOUS: Makefile | |
679 | ||
669 | 680 | |
670 | 681 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
671 | 682 | # Otherwise a system limit (for SysV at least) may be exceeded. |
2101 | 2101 | long long delta = 0; |
2102 | 2102 | for (i = 0; i < packed_roles.count; i++) |
2103 | 2103 | { |
2104 | int xtype = READOSM_UNDEFINED; | |
2104 | 2105 | int i_role = *(packed_roles.values + i); |
2105 | 2106 | readosm_string *s_role = *(strings->strings + i_role); |
2106 | 2107 | int type = *(packed_types.values + i); |
2107 | 2108 | delta += *(packed_refs.values + i); |
2108 | append_member_to_relation (relation, type, delta, | |
2109 | if (type == 0) | |
2110 | xtype = READOSM_MEMBER_NODE; | |
2111 | else if (type == 1) | |
2112 | xtype = READOSM_MEMBER_WAY; | |
2113 | else if (type == 2) | |
2114 | xtype = READOSM_MEMBER_RELATION; | |
2115 | append_member_to_relation (relation, xtype, delta, | |
2109 | 2116 | s_role->string); |
2110 | 2117 | } |
2111 | 2118 | } |