diff -Nru viking-1.6.2/aclocal.m4 viking-1.7/aclocal.m4 --- viking-1.6.2/aclocal.m4 2015-12-21 12:13:15.000000000 +0000 +++ viking-1.7/aclocal.m4 2019-01-21 20:16:49.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -47,7 +47,10 @@ # # Modified to require ngettext # Matthias Clasen 08/06/2004 -# + +# Increment this whenever this file is changed. +#serial 1 + # We need this here as well, since someone might use autoconf-2.5x # to configure GLib then an older version to configure a package # using AM_GLIB_GNU_GETTEXT @@ -119,6 +122,51 @@ AC_SUBST($1)dnl ]) +dnl Checks for special options needed on Mac OS X. +dnl Defines INTL_MACOSX_LIBS. +dnl +dnl Copied from intlmacosx.m4 in gettext, GPL. +dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. +glib_DEFUN([glib_gt_INTL_MACOSX], +[ + dnl Check for API introduced in Mac OS X 10.2. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + [gt_cv_func_CFPreferencesCopyAppValue], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFPreferencesCopyAppValue(NULL, NULL)]])], + [gt_cv_func_CFPreferencesCopyAppValue=yes], + [gt_cv_func_CFPreferencesCopyAppValue=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Check for API introduced in Mac OS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFLocaleCopyCurrent();]])], + [gt_cv_func_CFLocaleCopyCurrent=yes], + [gt_cv_func_CFLocaleCopyCurrent=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], + [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) + # GLIB_WITH_NLS #----------------- glib_DEFUN([GLIB_WITH_NLS], @@ -132,6 +180,8 @@ XGETTEXT=: INTLLIBS= + glib_gt_INTL_MACOSX + AC_CHECK_HEADER(libintl.h, [gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" @@ -215,7 +265,7 @@ fi if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" + INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" fi if test "$gt_cv_have_gettext" = "yes"; then @@ -335,7 +385,7 @@ # on various variables needed by the Makefile.in.in installed by # glib-gettextize. dnl -glib_DEFUN([GLIB_GNU_GETTEXT], +AU_DEFUN([GLIB_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_CC])dnl GLIB_LC_MESSAGES @@ -405,7 +455,8 @@ rm -f po/POTFILES sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ < $srcdir/po/POTFILES.in > po/POTFILES - ]) + ], + [[$0: This macro is deprecated. You should use upstream gettext instead.]]) # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) # ------------------------------- @@ -518,7 +569,32 @@ GNOME_DOC_DEFINES ]) -dnl -*- mode: autoconf -*- +# -*- mode: autoconf -*- +# +# gtk-doc.m4 - configure macro to check for gtk-doc +# Copyright (C) 2003 James Henstridge +# 2007-2017 Stefan Sauer +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# As a special exception, the above copyright owner gives unlimited +# permission to copy, distribute and modify the configure scripts that +# are the output of Autoconf when processing the Macro. You need not +# follow the terms of the GNU General Public License when using or +# distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. # serial 2 @@ -741,31 +817,6 @@ # Substitute ALL_LINGUAS so we can use it in po/Makefile AC_SUBST(ALL_LINGUAS) -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - IT_PO_SUBDIR([po]) ]) @@ -1098,7 +1149,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1110,10 +1161,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -1129,14 +1180,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1188,7 +1239,7 @@ # AM_COND_IF -*- Autoconf -*- -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1225,7 +1276,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1256,7 +1307,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1447,13 +1498,12 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. - # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -1461,49 +1511,41 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -1512,18 +1554,17 @@ # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1610,8 +1651,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -1678,7 +1719,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -1720,7 +1761,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1741,7 +1782,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1762,7 +1803,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1770,49 +1811,42 @@ # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1849,7 +1883,7 @@ fi ]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1883,7 +1917,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1912,7 +1946,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1959,7 +1993,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1978,7 +2012,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2059,7 +2093,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2119,7 +2153,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2147,7 +2181,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2166,7 +2200,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru viking-1.6.2/ChangeLog viking-1.7/ChangeLog --- viking-1.6.2/ChangeLog 2015-12-21 12:13:48.000000000 +0000 +++ viking-1.7/ChangeLog 2019-01-21 20:17:06.000000000 +0000 @@ -1,17 +1,773 @@ +2019-01-21 +Rob Norris : + * Releasing Viking 1.7 + * Force .po files update + * Import Launchpad translation updates + * Revert "Force .po files update" + +2019-01-18 +Matthew Hague : + * Change of search to present a list of results + +2018-12-16 +Rob Norris : + * Add Calendar display for Tracks + * Fix webtoolformat for point formats + +2018-12-10 +Rob Norris : + * [QA] Should be using unsigned variable type + * Ensure using an MBTiles file as a map default works. + * Ensure on (re)opening MBTiles the map gets drawn. + * [QA] Make explicit this function call result is not used + * Github #63: Allow automatic location lookup on demand. + * Github #63: Allow configuration of GeoClue accuracy request level + * Better processing of tracks with missing elevation data on the first trackpoint. + +2018-12-04 +Rob Norris : + * SF Bugs#154: Remember to commit test program + * [WINDOWS] Mention file used for 64bit build + * SF Bugs#154: Ensure GPX output values are XSD:Decimal + * Fix crash in copying between instances of Viking + * [QA] Actually use error message + * New property of TRW layer should be performed only when a display is available + * [QA] More standard use of #include directive for own files + +2018-11-20 +Rob Norris : + * [DOC] Extra blank lines for markdown text + +2018-11-18 +Rob Norris : + * Ensure curl cleanup is called after all curl usage + * Use HTTPS for OSM trackpoint downloads + * Convert thumbnail image cache from a custom list to a hash table. + +2018-11-12 +Rob Norris : + * Repair broken travis ubuntu builds + add cosmic + * Github Issue #62: Address Endianness Issue with OSM Metatiles + +2018-10-26 +Rob Norris : + * [QA] Fix unintended change to GPL copyright notice text. + * [QA] Remove unnecessary g_free() statement. + * Default to KMZ file type filter on Import from KMZ dialog. + * Improve georef xmpp calculation for large areas. + +2018-10-17 +Rob Norris : + * [QA] Prevent some potential critical warnings in Georef layer drawing + * Fix memory leak in Georef layer + * Auto suggest a filename in exporting to a KMZ file. + * Support multiple images in reading KMZ files. + +2018-10-15 +Rob Norris : + * Support KMZ files with 'Document' xml namespace + * SF Bugs#151: Compatibility with GPSD API v7.[Part 3] + +2018-10-08 +Rob Norris : + * SF Bugs#151: Compatibility with GPSD API v7.[Part 2] + +2018-10-07 +Rob Norris : + * Use libzip in travis build. + * [QA] Lengths can not be negative: part 2. + +2018-10-06 +Rob Norris : + * Prevent compiler warnings about potential uninitialised variables. + * Better scoping of functions when building without libzip + * Improved usage of g_debug() + * [DOC] Prevent some warnings in man page generation + * Fix logic condition in UTM drawing + * Fix elevation range readouts can be imprecise. + * [DOC] Add figure and words for Aggregate Statistics. + * Add calculation of Eddington number to Statistics + * [QA] Remove unused parameter + * [QA] Lengths can not be negative + * [QA] Some white space fixups + * Github Issue #59: Allow build of documentation on more systems + +2018-09-27 +Rob Norris : + * SF Features#148: Allow better resizing of Trackpoint Edit dialog + * Improved .spec file to install help and man files + * Tidy up messed up merge of OAuth + +2018-09-25 +Rob Norris : + * SF Bugs#152: Fix repeatedly showing the license dialog + * Fix handling actual URLs in GPX Waypoint links + * Distribute the new README.md file + * Make explicit the default enum value. + * Generally prefer g_new0() over g_new() + +2018-09-24 +Rob Norris : + * Merge pull request #58 from sikmir/fix-open-mbtiles + +2018-09-18 +Nikolay Korotkiy : + * Fix opening MBTiles file + +2018-09-13 +Rob Norris : + * Merge pull request #53 from yourealwaysbe/edit-tools-shift + +2018-09-08 +yourealwaysbe : + * Merge branch 'master' into edit-tools-shift + +2018-09-08 +Matthew Hague : + * Crosshair cursor for track/route edit split-join + * Add key_release to VikToolInterface + * Add splitter tool + +2018-09-05 +Rob Norris : + * Don't remove default map layer on loading a recent GPX file + * Fix debug output to use the correct variable + * Waypoint position could have changed by altering lat/lon manually + * SF Bugs#151: Compatibility with GPSD API v7 + * OSM Notes has moved to https + * [QA] Remove extraneous brackets + +2018-09-01 +Matthew Hague : + * Enhance track/route new to track/route edit + +2018-08-27 +Rob Norris : + * Ignore unknown actions in toolbar customization. + * Load GPX & KML files to the selected layer on demand + * Fix busy cursor getting stuck on + * Unsensitize some menu entries when not relevant + * Add function to delete duplicate waypoints. + * Merge pull request #54 from yourealwaysbe/route-finder-segments + +2018-08-26 +Matthew Hague : + * Prevent route finder creating new segments + +2018-08-25 +Rob Norris : + * [QA] Better policy not to modify parameter + * Make Ctrl+Delete delete the selected item. + * Enable string lists to expand vertically with dialog resize + * Remove hard coded widget size request for file lists + * High Resolution Display Support + * Merge pull request #51 from guyou/improve-doc + * Fix automake build, as it needs a 'README' file. + * Convert README into Markdown format. + * A setting to control opening file behaviour. + +2018-08-24 +Rob Norris : + * Protect against accessing out of bounds data in copying TRW layers + +2018-08-22 +Guilhem Bonnefille : + * Add missing trailing dot in sentences + * DOC: use variablelist for contextual enumeration + * DOC: use variablelist for graphical options enumeration + +2018-08-21 +Rob Norris : + * Add Build Status to README + * Merge pull request #49 from guyou/patch-1 + +2018-08-21 +Guilhem Bonnefille : + * Do not redownload sources + +2018-08-20 +Guilhem Bonnefille : + * Update .travis.yml + +2018-08-18 +Rob Norris : + * Fix travis builds + * Enable use of clear function for most entry textboxes. + * OAuth 1.0 support for OpenStreetMap usage + * Add preferences lookup + * Allow method to close preferences dialog + * Function to get a VikWindow + * Improved way to access existing parameters + * Allow downloading via curl into memory rather than having to write to a file. + +2018-08-16 +Rob Norris : + * Really fix copying TRW layers to ensure all data is copied. + +2018-08-13 +Rob Norris : + * [QA] Improve a variable name & a comment + * [QA] Prevent compiler warning + * Fix memory leak in setting track/route new names + * Fix copying TRW layers to ensure all data is copied. + * [QA] More explicit statement about ignoring the returned value + * Extend allowed fixed zoom levels for a map view + +2018-07-08 +Rob Norris : + * [DOC] Minor update on the Windows build guide + * Github Issue #46: Better use of realpath() + * No need to get the list of trw layers twice in a search by date + * Prevent crashing on malformed .vik files + * Fix reading Author name in GPX1.1 files + * Support SOURCE_DATE_EPOCH in date usage + +2018-06-29 +Rob Norris : + * Merge pull request #42 from yourealwaysbe/external-layers + +2018-06-28 +Rob Norris : + * Default OSM Nominatim Search address to use https + * Github Issue #45: Fix OSM GPX Upload For Change to HTTPS + +2018-06-06 +Matthew Hague : + * Add external GPX layers + * Expose choose_file for vikfileentry + +2018-05-28 +Matthew Hague : + * Change track timestamp ordering to fall back on name + * Add file save dialog to uibuilder + +2018-05-18 +Rob Norris : + * Merge pull request #43 from krichter722/travis-trusty-comment + +2018-05-17 +Karl-Philipp Richter : + * .travis.yml: Clarify restrictions for Ubuntu 14.04 + +2018-05-14 +Rob Norris : + * [WINDOWS] Windows 32bit build on OpenSUSE no Longer functional. + * SF Bugs#149: [WINDOWS] HTTPS workaround. + +2018-05-13 +Rob Norris : + * [WINDOWS] Enable use of client GPSD DLL (libgps.dll) + * Need to redraw after track segment merge. + * Merge pull request #41 from krichter722/travis + +2018-05-13 +Karl-Philipp Richter : + * added initial .travis.yml + +2018-05-12 +Rob Norris : + * Merging tracks into a route isn't sensible + * Fix combining routes having more than one segment + * SF Bugs#148: Fix reversing manually created tracks & routes + * More action items button icons. + * Fix test program geotag_write for updated function interface. + * [QA] Explicitly mark these functions for ignoring returned values. + * Enable control of showing side panel buttons + * Fix some small memory leaks. + * [WINDOWS] Text string for GPSBabel is now version 1.5.4 + * [WINDOWS] Use UTF8 mode on installer translation files + * [WINDOWS] NSIS plugin location has changed + +2018-04-08 +Rob Norris : + * SF Features#140: Allow Escape Button to return to default tool + * SF Features#140: Allow configuration of the default window tool + * Save to GPS Device Auto GPX Simplification + * Improved GPX write to disk reliability on Linux + * Rename directory win32 -> windows as it now 64bit compatible. + +2018-04-02 +Rob Norris : + * Support Garmin Hunter waypoint symbols + * [DOC] Ensure man page covers routing.xml extension file + * [DOC] Mention url-ll-lat-first routing option + * [DOC] Cookie file has not been used for long time + +2018-03-05 +Rob Norris : + * Merge branch 'WaypointDirection' + * Allow tolerance in comparing waypoint vs geotag position. + * Allow positional comparison with some tolerance + * When geotagging set the time of waypoint. + * Add option to set waypoint image direction automatically when geotagging images. + * Add function to get the angle of one coordinate from another. + * Save waypoint image direction in .vik files + * Add function to convert double to a string with specified format + * Write support for EXIF GPS Image Direction + * Basic read GPSImgDirection support from image files. + +2018-03-05 +Sebastien Bocahu : + * Add support for Brouter routing service + +2018-03-03 +Rob Norris : + * Better use of a_dialog functions + * [DOC] Better section title + * Store information about the original GPX creator + +2018-02-18 +Rob Norris : + * Allow configurable 'creator' value in writing GPX files + +2018-02-12 +Rob Norris : + * Ensure better GPX specification output + +2018-02-10 +Rob Norris : + * Use enumeration rather than fixed numbers + * Remove definition of non existent function. + +2018-02-04 +Rob Norris : + * [DOC] List dependencies better (many are optional) + * Allow 'Apply' for layer properties. + * Make loading lots of GPX files much faster + * [QA] Explicitly ignore some return values + * Fix gpx2gpx.c for latest function changes + +2018-02-04 +danfos : + * Remove debug printf + +2018-02-04 +Rob Norris : + * Tests for timegm() usage + * GeoClue support to get the initial location + * [WINDOWS] Update to GPSBabel 1.5.4 + * Use correct initial table size + * Improve speed of opening large .vik files + * Fix issue with geotag location/time processing. + +2018-01-20 +Rob Norris : + * [DOC] Improve XML validation + +2017-10-31 +Rob Norris : + * DEM Availability by area + * Use LatLonBBox type with DEMs + * Use LatLonBBox type more for viewport areas + * bbox uses glib types + * Don't load files into invisible layers + * Fix loading DEMs from files. + +2017-10-01 +danfos : + * Clip improvements, previous code was not working correct for long distances. + * Improve/simplify vik_viewport_compute_bearing + * OSM can use both email and username (GitHub Issue #25) + * Allow also negative easting and northing values + * Make Ctrl-F open the Search Location window + +2017-10-01 +Rob Norris : + * Fix memory leaks with ruler usage. + * Improve function comment + * Fix correct parameter usage in babel shell command + * Remove unnecessary track name copy. + * Fix correct type usage for wpt_sym name preference + * Force .po files update + * Prevent compiler warning + * Remove unintentional carriage return in a string + +2017-10-01 +Davide Del Vento : + * Option to use pace for speeds + +2017-08-24 +Rob Norris : + * Some spelling fixes in a comment + * Fix memory leak in freeing Waypoints. + * Fix small memory leak. + +2017-08-21 +Rob Norris : + * Merge pull request #32 from davidedelvento/installnotes + +2017-08-04 +Davide Del Vento : + * More dependencies needed, specified in the README + +2017-06-29 +Rob Norris : + * Fix memory leak on re-downloading 'bad' map image tiles. + * gpsbabel filters must come after the input file type+name. + * Remove definition of a non existant function + +2017-06-08 +Rob Norris : + * Ensure maximum altitude is shown in track properties. + * SF Bugs#146: Fix showing elevation gain/loss in track properties. + +2017-05-20 +Rob Norris : + * SF Bugs#144: Fix Export to World File + * Some explicit setting of dirpath values to NULL. + * SF Bugs#138: Fix handling of tags in GPX files. + * Embed GtkHTML 4.10.0 URI functions + * Fix relative file path loading for DEM files. + * Functions to convert potentially relative filenames to absolute filenames. + * Make a newly loaded file layer more accessible in the layers panel + +2017-05-14 +Guilhem Bonnefille : + * Add 4UMaps example + * Add OpenTopoMap example + * Adding Waymarked Trails layers as example + +2017-04-29 +Rob Norris : + * [DOC] Switch from ordered list to a itemitized list. + * Automatically remove suspicious first points of GPX Tracks. + * Remove unnecessary include statement + * Ensure string value is copied. + * Some test programs should call more uninit functions. + * Rework layer set parameters so it should be more easily extendable. + +2017-04-14 +Rob Norris : + * Remove unnecessary defines and undefs + * Remove non existent function. + * Shift pure glib code from file.c to fileutils.c to simplify dependencies. + +2017-04-04 +Rob Norris : + * XDG_CACHE_HOME compliant thumbnail usage + * Have a non blank tooltip for empty aggregrate layers + * [DOC] Mention XML configuration can override internal defaults. + * Make each tool contain it's own icon definition. + * Ensure consistent use of internal names in building the UI + +2017-03-31 +Rob Norris : + * Use configurable apikey for OSM Cyclemap tiles. + * Fix comment in AC DEFINE + * Remove unused define + +2017-03-28 +Rob Norris : + * Actually use the calculated scale factor in the viewport + * [DOC] Mention map tilesize configuration. + * Improve function comments as these don't return anything + * Fix small memory leak when downloading bzip files. + +2017-03-17 +Rob Norris : + * Menu option to (re)open an MBTiles file. + * Shift include of gpsmapper.h to the only place that uses it + * Add OSM GPS Tiles in default data config + * Remove old tests that no longer useful + * Put vikutils.h into viking.h + * Tidy up type usage + * Disable download menu options for non-downloadable maps + +2017-03-13 +Rob Norris : + * Enable compile time option for Mapbox access token. + * Enable compile time option for geonames username + * Use our standard yes/no dialog box and enable i18n of the string. + * Tidy TrackWaypoint post read & verify thumbnails functions + * Fix gps layer not showing items after file load. + * Really empty GPS realtime layers. + * Prevent Gtk Warnings in deleting all TrackWaypoint items + * Fix spelling in gpsd retry warning print out + * More consistent variable names in gps layer + * Compatibility for latest GEXIV2 0.10.4 + * Trap some errors reported by gpsbabel + * Threading rewrite to remove use of unsupported cross platform threading update of the GUI. + * Improve GPS layer tooltip to include GPSD connection details. + * Add option to auto connect to GPSD rather than having to manually control + +2017-02-27 +Rob Norris : + * Fix Waypoint name suggestion after delete all waypoints + * Fix GTK warnings in Waypoint window + * [DOC] Notes about using the URL field in map configs + * More strings marked for i18n + * Fix URL display of Map tiles + * Improve hostname/uri usage + * Fix GPX file loading in a previously selected layer. + +2017-02-25 +Rob Norris : + * Add Church as a Wikipedia waypoint feature type. + +2017-02-25 +huobos : + * Some more variables need marking for i18n + * More Chinese translations + * Make more text translatable + * Replace remaining gettext calls with '_' + * Improved method for Wikipedia i18n URL + +2017-01-24 +Rob Norris : + * Merge pull request #20 from huobos/zh_CN + +2017-01-24 +huobos : + * zh_CN translation + +2017-01-22 +Rob Norris : + * Info message to remind user of the version in use. + * Ensure correct capitalization of the program name + * Improved feedback/feature availability when no direction routing engines are available. + * Add function to return counts of available routing engines. + * Add YOURS online routing. + * Remove as OSRM routing option as it no longer supports GPX output. + * [DOC] Add details about routing format option + * Allow specifying an alternative URL base location for acquiring DEM SRTM files. + * Use https DEM download site by default + * Allow redirects when attempting to download DEM files. + * Simplify DEM base URL to be one value rather than separate components. + * Prevent compiler warnings - rework as vtl variable type has changed. + +2017-01-21 +Rob Norris : + * Merge pull request #19 from huobos/typo + * Merge pull request #17 from huobos/gpx + +2017-01-20 +huobos : + * Fix typo word Polygonized + * Open files in selected layer + +2017-01-14 +Rob Norris : + * Fix small memory leak. + * Fix small memory leak + * Enable understanding pasted text strings with tabs. + * Fix some spelling mistakes. + * Fix small memory leak. + * Shell test should be '=' rather than '==' for maximum portability. + * Clarify only Bing Aerial Map available. + * Fix small memory leak - free dirpath in all circumstances. + * Fix spelling + * Fix toggling visibility of the menu. + * Support Lodge symbol + * [DOC] Use macro for GPSBabel references + * [DOC] Use URL links to programs + +2016-08-16 +Rob Norris : + * Fix some missing nautical miles output. + * Fix issue in display of maximum speed when there is no speed. + +2016-08-11 +Rob Norris : + * Only call gps_close() after a successful gps_open(). + * Replace defunct IP to location lookup service. + * Github #15: Relicense files marked GPL2 only to GPL2+. + * Explicitly license my small test code+script files as Creative Commons CCO + * SF Bugs#135: Fix OSM Maps shown by default at Maximum Zoom. + +2016-08-09 +Rob Norris : + * SF Bugs#133: Remove the auto added map when opening the first .vik file from the GUI. + * Add aggregate layer functions to return number of layers and to delete a specified child layer. + * Disable more functionality that doesn't work if gpsbabel is not available. + * Fix recent commit: 4dc72a1d407b81853d0093871cff45ef1f47d1b8 + +2016-08-08 +Rob Norris : + * Improved usage of g_stat() + * [DOC] Remove note on GPSBabel Google Direction routes which no longer work. + * [DOC] Stellarium release 0.15.0 has fixed this bug. + * SF Bugs#134: Replaced discontinued MapQuest tile service with rate limited Mapbox Outdoors service. + * Fix crash if a map configuration has no hostname or URL defined. + * Be more explicit that the return value of g_printf() is ignored. + +2016-06-25 +Rob Norris : + * Remove unused function. + * Replace internal uri_escape() function with a glib version. + * Load the startup file first so that subsequent files are loaded on top. + * SF Bugs#132: Fix to correctly open GPX files in Windows via double click. + * [WINDOWS] Extra files needed for theming to work + * Merge pull request #14 from apre/master + +2016-06-23 +apre : + * add debian build-dependencies in readme + +2016-05-03 +Rob Norris : + * Use the correct definition. + * Fix to return the correct hash table pointer. + * Fix to use the correct GC index for drawing track stops. + +2016-05-02 +Rob Norris : + * SF Bugs#130: Fix GeoRef layer alpha value change to 255 is ignored until restart + * Better type to remove compiler warning + * Second fix to e778b260c460c218a8efa27c178219cccf731452 to correct elevation output in GPX files. + * Improve babel debug output + +2016-04-25 +Rob Norris : + * Fix e778b260c460c218a8efa27c178219cccf731452 - missed commit of this file. + * Return function value is ignored in this case. + * Notice gps_stream() errors from gpsd + * Fix small memory leak as this regex should be freed after use. + * Use existing variable rather than explicit name. + * Fix incorrect directory in this README.txt + * Minor update for a perl tool. + * Reduce compiler warnings on Windows. + * Check that the test_babel program runs + * Simple test for basic GPX read->write conformance. + * SF Bugs#22: Fix changing coordinates when saving and exporting + * Ensure some test programs run properly. + * Remove use of function local static variables for code simplicity. + * Don't write unnecessary GPX metadata tags for empty fields. + +2016-04-23 +Rob Norris : + * Prefer default TrackWaypoint layers to be in LatLon mode. + +2016-04-10 +Rob Norris : + * Merge pull request #13 from JojoBoulix/reproducible + +2016-04-10 +JojoBoulix : + * Fixed order headers inclusion in icons.c + +2016-04-09 +Rob Norris : + * Remove use of unnecessary pointer to pointer variables. + * Enable clearing spinbox entries on some numerical input boxes. + * Enable a clear icon on entry boxes used for search like input. + +2016-02-12 +Rob Norris : + * More sensible new name allocation. + * Remove own copy of MD5 hash code and use a library implementation (libnettle) + * [WINDOWS] Enable Windows 64bit cross build + +2016-02-11 +Rob Norris : + * Extra output in case of SQL prepare statement failure. + * Increase line reading length + * Support GPX 'type' field on Waypoints, Tracks and Routes. + * Support GPX src field on Waypoints, Tracks and Routes. + * Don't close track property dialog on return keypress on entry fields. + +2016-01-30 +Rob Norris : + * vikcoord does not depend on GTK + * [QA] Another use of GStatBuf + * [QA] This function should be static + * Import Launchpad translation updates - French Update. + * Retain DOP values when saving to .vik files + +2016-01-29 +Rob Norris : + * [QA] Improve types as string lengths are never negative. + * Prevent writing broken .vik files with multi line strings. + * SF Bugs#128: Fix Crash when loading broken .vik file + * [QA] Enable all warnings on test code + * [QA] Consistent usage of g_stat() GStatBuf parameter type + * Fix crash if a route requested by the route finder is empty. + * [QA] Remove unused variable. + * Enable activating waypoint search when pressing return in the entry field. + * In the location search, only enable the OK button when there is some text to search with. + +2016-01-17 +Rob Norris : + * Enable handling compressed files when acquiring from an URL datasource. + * Fix definition and usage of datasource download file options. + * Remove curl cookie file as it's read only - so never actually used anymore. + * Fix maintaining a transparent background when an alpha value is applied to a pixbuf. + * Remove the now unused viewport alpha pixbuf and gdk pixbuf compositing method. + * Apply alpha setting to the waypoint image pixbuf before storing in the image cache. + * [QA] Reusable function for freeing the waypoint image cache. + * [QA] Remove unused variable. + * Ensure compressed download files are processed. + * [QA] Better value type usage, even if these values are not actually used. + +2015-12-24 +Rob Norris : + * Text output using AC_MSG_NOTICE rather than echo statements. + * [WINDOWS] Build with libgexiv2 + 2015-12-21 Rob Norris : * Ignore help/viking.xml as it's now auto-generated. + * [WINDOWS] Cross build * Make generation of the copyright year in the code automatic. + +2015-12-19 +Rob Norris : * Don't remove project name if one decides not to delete all layers. + +2015-12-15 +Rob Norris : * Mention use of libexpat + * [QA] Rename DownloadMapOptions --> DownloadFileOptions + * AC_OUTPUT doesn't need to take any arguments + * viking-cache.py tool: Enable converting from OSM cache layout to mbtiles. + * viking-cache.py tool: Rework into simple elif statements. + * viking-cache.py tool: Allow specifying zoom limits in creating mbtiles file + * Allow copying positions as well from the waypoint list dialog. + * Allow configuration of the date format displayed on Track and Waypoint lists. + * Add tooltip for a more readable hours:minutes display rather than just total minutes in the track statistics tab. + * Add display of the without gaps track time. + * Extend function to get optionally get duration of a track without including gaps between segments. + * Save bfilter values used for subsequent reuse in a session. + * Add settings to override bfilter simplify and compress default values. + * [QA] Extra output for failing date/timezone string generation. + * Add capability to manually define parameters for GPSBabel filter command. + * Merge branch 'KMZ-Maps' + +2015-12-14 +Rob Norris : + * [DOC] KMZ Map help + * KMZ file of OSM Mapnik rendering of Stonehenge area, zoom level 15. + * [WINDOWS] Installer and build notes for using libzip.dll + * Allow internal check_magic function to work on various lengths as specified. + * Enable importing a map from a KMZ file. + * Allow creating GeoRef layers from a specified pixbuf and area. + * Make the find best zoom level function reusable. + * Add utility function to write a temporary file from a byte buffer. + * Enable KMZ Map file generation for Custom Map support on Garmin devices. * Fix routes not saved in GPX when tracks are made invisible. + +2015-12-12 +Rob Norris : * SF Bugs#103: Fix TrackWaypoint layer items may not be displayed when pasted * Enable Catalan and Turkish translations. * Auto generate the date for man pages. * Restore opening of JPG files. + +2015-12-07 +Rob Norris : + * [QA] Tidy trw_layer_draw_point_names() * SF Bugs#127: Fix initial display of Waypoint sort order. + +2015-12-04 +Rob Norris : * Fix map layer widget sensitivity dependent on map type. + * Merge pull request #8 from swegener/etag-in-xattr + * Merge pull request #3 from Shura0/point_names + +2015-11-29 +Sven Wegener : + * download: Move setting of etag and convert_file + * download: Store ETAG in extended attributes 2015-11-24 Rob Norris : @@ -184,6 +940,10 @@ * [QA] Fix spelling in a comment and add function comment 2015-07-08 +Alexander Zaitsev : + * Optimization + +2015-07-08 Rob Norris : * Ensure layer visibility is retained when copying layers. @@ -194,6 +954,10 @@ * Read zip files contents which are stored with no compression. * [QA] Protection from large malloc failures +2015-07-07 +Alexander Zaitsev : + * trackpoint labels + 2015-07-05 Rob Norris : * Fix logic for comparing timestamps diff -Nru viking-1.6.2/compile viking-1.7/compile --- viking-1.6.2/compile 2015-12-21 12:13:17.000000000 +0000 +++ viking-1.7/compile 2019-01-19 18:39:43.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru viking-1.6.2/config.guess viking-1.7/config.guess --- viking-1.6.2/config.guess 2015-12-21 12:13:17.000000000 +0000 +++ viking-1.7/config.guess 2019-01-19 18:39:43.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2015-08-20' +timestamp='2018-02-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -27,7 +27,7 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . @@ -39,7 +39,7 @@ Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -107,9 +107,9 @@ dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; + ,,) echo "int x;" > "$dummy.c" ; for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; @@ -132,14 +132,14 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in +case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) # If the system lacks a compiler, then just pick glibc. # We could probably try harder. LIBC=gnu - eval $set_cc_for_build - cat <<-EOF > $dummy.c + eval "$set_cc_for_build" + cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) LIBC=uclibc @@ -149,13 +149,20 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -169,27 +176,30 @@ # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + machine="${arch}${endian}"-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + # to ELF recently (or will in the future) and ABI. + case "$UNAME_MACHINE_ARCH" in + earm*) + os=netbsdelf + ;; + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -205,10 +215,10 @@ ;; esac # Determine ABI tags. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` ;; esac # The OS release @@ -216,42 +226,55 @@ # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}${abi}" + echo "$machine-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" + exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + exit ;; + *:MidnightBSD:*:*) + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" exit ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:Sortix:*:*) - echo ${UNAME_MACHINE}-unknown-sortix + echo "$UNAME_MACHINE"-unknown-sortix exit ;; + *:Redox:*:*) + echo "$UNAME_MACHINE"-unknown-redox + exit ;; + mips:OSF1:*.*) + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -268,63 +291,54 @@ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos + echo "$UNAME_MACHINE"-unknown-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + echo "$UNAME_MACHINE"-unknown-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -336,7 +350,7 @@ echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} + echo arm-acorn-riscix"$UNAME_RELEASE" exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos @@ -363,38 +377,38 @@ sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} + echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" + eval "$set_cc_for_build" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in @@ -403,25 +417,25 @@ ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" exit ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac exit ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} + echo sparc-auspex-sunos"$UNAME_RELEASE" exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not @@ -432,44 +446,44 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} + echo m68k-milan-mint"$UNAME_RELEASE" exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} + echo m68k-hades-mint"$UNAME_RELEASE" exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} + echo m68k-unknown-mint"$UNAME_RELEASE" exit ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} + echo m68k-apple-machten"$UNAME_RELEASE" exit ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} + echo powerpc-apple-machten"$UNAME_RELEASE" exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} + echo mips-dec-ultrix"$UNAME_RELEASE" exit ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} + echo vax-dec-ultrix"$UNAME_RELEASE" exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} + echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -478,23 +492,23 @@ #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} + echo mips-mips-riscos"$UNAME_RELEASE" exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax @@ -520,17 +534,17 @@ AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ + [ "$TARGET_BINARY_INTERFACE"x = x ] then - echo m88k-dg-dgux${UNAME_RELEASE} + echo m88k-dg-dgux"$UNAME_RELEASE" else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - echo i586-dg-dgux${UNAME_RELEASE} + echo i586-dg-dgux"$UNAME_RELEASE" fi exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) @@ -547,7 +561,7 @@ echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id @@ -559,14 +573,14 @@ if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include main() @@ -577,7 +591,7 @@ exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then echo "$SYSTEM_NAME" else @@ -591,7 +605,7 @@ exit ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -600,18 +614,18 @@ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" exit ;; *:AIX:*:*) echo rs6000-ibm-aix exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx @@ -626,28 +640,28 @@ echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + case "$UNAME_MACHINE" in + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + case "$sc_cpu_version" in + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + case "$sc_kernel_bits" in + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + if [ "$HP_ARCH" = "" ]; then + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE #include @@ -680,13 +694,13 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ "$HP_ARCH" = hppa2.0w ] then - eval $set_cc_for_build + eval "$set_cc_for_build" # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -697,23 +711,23 @@ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include int main () @@ -738,11 +752,11 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) echo hppa1.1-hp-bsd exit ;; 9000/8??:4.3bsd:*:*) @@ -751,7 +765,7 @@ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) echo hppa1.1-hp-osf exit ;; hp8??:OSF1:*:*) @@ -759,9 +773,9 @@ exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + echo "$UNAME_MACHINE"-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -786,127 +800,109 @@ echo c4-convex-bsd exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} + echo sparc-unknown-bsdi"$UNAME_RELEASE" exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + case "$UNAME_PROCESSOR" in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin + echo "$UNAME_MACHINE"-pc-cygwin exit ;; *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 + echo "$UNAME_MACHINE"-pc-mingw64 exit ;; *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 + echo "$UNAME_MACHINE"-pc-mingw32 exit ;; *:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + echo "$UNAME_MACHINE"-pc-msys exit ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 + echo "$UNAME_MACHINE"-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case "$UNAME_MACHINE" in x86) - echo i586-pc-interix${UNAME_RELEASE} + echo i586-pc-interix"$UNAME_RELEASE" exit ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} + echo x86_64-unknown-interix"$UNAME_RELEASE" exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} + echo ia64-unknown-interix"$UNAME_RELEASE" exit ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin + echo "$UNAME_MACHINE"-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix + echo "$UNAME_MACHINE"-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -919,61 +915,64 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; e2k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + k1om:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} #undef ${UNAME_MACHINE}el @@ -987,64 +986,74 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" + test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } ;; + mips64el:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + echo or1k-unknown-linux-"$LIBC" exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-"$LIBC" exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-"$LIBC" exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-"$LIBC" exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} + echo powerpc-unknown-linux-"$LIBC" exit ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} + echo powerpc64le-unknown-linux-"$LIBC" exit ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpcle-unknown-linux-"$LIBC" + exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + if objdump -f /bin/sh | grep -q elf32-x86-64; then + echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 + else + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + fi exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1058,34 +1067,34 @@ # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx + echo "$UNAME_MACHINE"-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + echo "$UNAME_MACHINE"-unknown-stop exit ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + echo "$UNAME_MACHINE"-unknown-atheos exit ;; i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable + echo "$UNAME_MACHINE"-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} + echo i386-unknown-lynxos"$UNAME_RELEASE" exit ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp + echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + i*86:*:4.*:*) + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi exit ;; i*86:*:5:[678]*) @@ -1095,12 +1104,12 @@ *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1110,9 +1119,9 @@ && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi exit ;; pc:*:*:*) @@ -1120,7 +1129,7 @@ # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1132,9 +1141,9 @@ exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -1154,9 +1163,9 @@ test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; @@ -1165,28 +1174,28 @@ test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} + echo m68k-unknown-lynxos"$UNAME_RELEASE" exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} + echo sparc-unknown-lynxos"$UNAME_RELEASE" exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} + echo rs6000-unknown-lynxos"$UNAME_RELEASE" exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} + echo powerpc-unknown-lynxos"$UNAME_RELEASE" exit ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} + echo mips-dde-sysv"$UNAME_RELEASE" exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 @@ -1197,7 +1206,7 @@ *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv fi @@ -1217,23 +1226,23 @@ exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos + echo "$UNAME_MACHINE"-stratus-vos exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos exit ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} + echo m68k-apple-aux"$UNAME_RELEASE" exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv"$UNAME_RELEASE" else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv"$UNAME_RELEASE" fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1252,46 +1261,56 @@ echo x86_64-unknown-haiku exit ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} + echo sx4-nec-superux"$UNAME_RELEASE" exit ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} + echo sx5-nec-superux"$UNAME_RELEASE" exit ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} + echo sx6-nec-superux"$UNAME_RELEASE" exit ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} + echo sx7-nec-superux"$UNAME_RELEASE" exit ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} + echo sx8-nec-superux"$UNAME_RELEASE" exit ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} + echo sx8r-nec-superux"$UNAME_RELEASE" + exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux"$UNAME_RELEASE" exit ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} + echo powerpc-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build + eval "$set_cc_for_build" if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in i386) UNAME_PROCESSOR=x86_64 ;; powerpc) UNAME_PROCESSOR=powerpc64 ;; esac fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi elif test "$UNAME_PROCESSOR" = i386 ; then # Avoid executing cc on OS X 10.9, as it ships with a stub @@ -1302,27 +1321,33 @@ # that Apple uses in portable devices. UNAME_PROCESSOR=x86_64 fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" exit ;; *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} + NEO-*:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk"$UNAME_RELEASE" exit ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} + echo nse-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSR-*:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk"$UNAME_RELEASE" exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} + NSV-*:NONSTOP_KERNEL:*:*) + echo nsv-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSX-*:NONSTOP_KERNEL:*:*) + echo nsx-tandem-nsk"$UNAME_RELEASE" exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux @@ -1331,18 +1356,18 @@ echo bs2000-siemens-sysv exit ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" fi - echo ${UNAME_MACHINE}-unknown-plan9 + echo "$UNAME_MACHINE"-unknown-plan9 exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 @@ -1363,14 +1388,14 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in + case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; @@ -1379,34 +1404,48 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" exit ;; i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos + echo "$UNAME_MACHINE"-pc-rdos exit ;; i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros + echo "$UNAME_MACHINE"-pc-aros exit ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx + echo "$UNAME_MACHINE"-unknown-esx + exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs exit ;; esac +echo "$0: unable to guess system type" >&2 + +case "$UNAME_MACHINE:$UNAME_SYSTEM" in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <&2 < in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp @@ -1425,16 +1464,16 @@ /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru viking-1.6.2/config.sub viking-1.7/config.sub --- viking-1.6.2/config.sub 2015-12-21 12:13:17.000000000 +0000 +++ viking-1.7/config.sub 2019-01-19 18:39:43.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2015-08-20' +timestamp='2018-02-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,12 +53,11 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -68,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -95,7 +94,7 @@ *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -113,24 +112,24 @@ # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; android-linux) os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ;; *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` + basic_machine=`echo "$1" | sed 's/-[^-]*$//'` + if [ "$basic_machine" != "$1" ] + then os=`echo "$1" | sed 's/.*-/-/'` else os=; fi ;; esac @@ -179,44 +178,44 @@ ;; -sco6) os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco5) os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco4) os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco3.2.[4-9]*) os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco3.2v[4-9]*) # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco5v6*) # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco*) os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -isc) os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -clix*) basic_machine=clipper-intergraph ;; -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -lynx*178) os=-lynxos178 @@ -228,10 +227,7 @@ os=-lynxos ;; -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` ;; -psos*) os=-psos @@ -264,7 +260,7 @@ | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia64 \ + | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ | k1om \ | le32 | le64 \ @@ -300,8 +296,9 @@ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 | or1k | or1knd | or32 \ - | pdp10 | pdp11 | pj | pjl \ + | pdp10 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ @@ -315,7 +312,7 @@ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | visium \ - | we32k \ + | wasm32 \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown @@ -336,7 +333,7 @@ basic_machine=$basic_machine-unknown os=-none ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) ;; ms1) basic_machine=mt-unknown @@ -365,7 +362,7 @@ ;; # Object if more than one company name word. *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; # Recognize the basic CPU types with company name. @@ -388,7 +385,7 @@ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ip2k-* | iq2000-* \ | k1om-* \ | le32-* | le64-* \ @@ -429,6 +426,7 @@ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ @@ -445,6 +443,7 @@ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ | visium-* \ + | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -458,7 +457,7 @@ # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) - basic_machine=i386-unknown + basic_machine=i386-pc os=-bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) @@ -492,7 +491,7 @@ basic_machine=x86_64-pc ;; amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; amdahl) basic_machine=580-amdahl @@ -521,7 +520,7 @@ basic_machine=i386-pc os=-aros ;; - asmjs) + asmjs) basic_machine=asmjs-unknown ;; aux) @@ -537,7 +536,7 @@ os=-linux ;; blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; bluegene*) @@ -545,13 +544,13 @@ os=-cnk ;; c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c90) basic_machine=c90-cray @@ -640,10 +639,18 @@ basic_machine=rs6000-bull os=-bosx ;; - dpx2* | dpx2*-bull) + dpx2*) basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -733,9 +740,6 @@ hp9k8[0-9][0-9] | hp8[0-9][0-9]) basic_machine=hppa1.0-hp ;; - hppa-next) - os=-nextstep3 - ;; hppaosf) basic_machine=hppa1.1-hp os=-osf @@ -748,26 +752,26 @@ basic_machine=i370-ibm ;; i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv ;; i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; i386mach) basic_machine=i386-mach os=-mach ;; - i386-vsta | vsta) + vsta) basic_machine=i386-unknown os=-vsta ;; @@ -786,19 +790,16 @@ os=-sysv ;; leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` ;; m68knommu) basic_machine=m68k-unknown os=-linux ;; m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; - m88k-omron*) - basic_machine=m88k-omron - ;; magnum | m3230) basic_machine=mips-mips os=-sysv @@ -830,10 +831,10 @@ os=-mint ;; mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` ;; mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown ;; monitor) basic_machine=m68k-rom68k @@ -852,7 +853,7 @@ os=-msdos ;; ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` ;; msys) basic_machine=i686-pc @@ -894,7 +895,7 @@ basic_machine=v70-nec os=-sysv ;; - next | m*-next ) + next | m*-next) basic_machine=m68k-next case $os in -nextstep* ) @@ -939,6 +940,12 @@ nsr-tandem) basic_machine=nsr-tandem ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -971,7 +978,7 @@ os=-linux ;; parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; pbd) @@ -987,7 +994,7 @@ basic_machine=i386-pc ;; pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc @@ -1002,16 +1009,16 @@ basic_machine=i786-pc ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould @@ -1021,23 +1028,23 @@ ppc | ppcbe) basic_machine=powerpc-unknown ;; ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ps2) basic_machine=i386-ibm @@ -1091,17 +1098,10 @@ sequent) basic_machine=i386-sequent ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; sh5el) basic_machine=sh5le-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) + simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -1120,7 +1120,7 @@ os=-sysv4 ;; strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; sun2) basic_machine=m68000-sun @@ -1242,6 +1242,9 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + x64) + basic_machine=x86_64-pc + ;; xbox) basic_machine=i686-pc os=-mingw32 @@ -1250,20 +1253,12 @@ basic_machine=xps100-honeywell ;; xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` ;; ymp) basic_machine=ymp-cray os=-unicos ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; none) basic_machine=none-none os=-none @@ -1292,10 +1287,6 @@ vax) basic_machine=vax-dec ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; pdp11) basic_machine=pdp11-dec ;; @@ -1305,9 +1296,6 @@ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; cydra) basic_machine=cydra-cydrome ;; @@ -1327,7 +1315,7 @@ # Make sure to match an already-canonicalized machine name. ;; *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; esac @@ -1335,10 +1323,10 @@ # Here we canonicalize certain aliases for manufacturers. case $basic_machine in *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` ;; *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` ;; *) ;; @@ -1349,8 +1337,8 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases that might get confused + # with valid system types. # -solaris* is a basic system type, with this one exception. -auroraux) os=-auroraux @@ -1361,18 +1349,19 @@ -solaris) os=-solaris2 ;; - -svr4*) - os=-sysv4 - ;; -unixware*) os=-sysv4.2uw ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; - # First accept the basic system types. + # es1800 is here to avoid being matched by es* (a different OS) + -es1800*) + os=-ose + ;; + # Now accept the basic system types. # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. + # Each alternative MUST end in a * to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ @@ -1382,24 +1371,26 @@ | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -morphos* | -superux* | -rtmk* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ + | -midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1416,12 +1407,12 @@ -nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + -sim | -xray | -os68k* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) - os=`echo $os | sed -e 's|mac|macos|'` + os=`echo "$os" | sed -e 's|mac|macos|'` ;; -linux-dietlibc) os=-linux-dietlibc @@ -1430,10 +1421,10 @@ os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` + os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` + os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; -opened*) os=-openedition @@ -1444,12 +1435,6 @@ -wince*) os=-wince ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; -utek*) os=-bsd ;; @@ -1474,7 +1459,7 @@ -nova*) os=-rtmk-nova ;; - -ns2 ) + -ns2) os=-nextstep2 ;; -nsk*) @@ -1496,7 +1481,7 @@ -oss*) os=-sysv3 ;; - -svr4) + -svr4*) os=-sysv4 ;; -svr3) @@ -1511,32 +1496,38 @@ -ose*) os=-ose ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; - -aros*) - os=-aros - ;; -zvmoe) os=-zvmoe ;; -dicos*) os=-dicos ;; + -pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $basic_machine in + arm*) + os=-eabi + ;; + *) + os=-elf + ;; + esac + ;; -nacl*) ;; + -ios) + ;; -none) ;; *) # Get rid of the `-' at the beginning of $os. os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; esac @@ -1626,12 +1617,12 @@ sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; - *-haiku) - os=-haiku - ;; *-ibm) os=-aix ;; @@ -1671,7 +1662,7 @@ m88k-omron*) os=-luna ;; - *-next ) + *-next) os=-nextstep ;; *-sequent) @@ -1686,9 +1677,6 @@ i370-*) os=-mvs ;; - *-next) - os=-nextstep3 - ;; *-gould) os=-sysv ;; @@ -1798,15 +1786,15 @@ vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os +echo "$basic_machine$os" exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru viking-1.6.2/configure viking-1.7/configure --- viking-1.6.2/configure 2015-12-21 12:13:16.000000000 +0000 +++ viking-1.7/configure 2019-01-21 20:16:51.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for viking 1.6.2. +# Generated by GNU Autoconf 2.69 for viking 1.7. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='viking' PACKAGE_TARNAME='viking' -PACKAGE_VERSION='1.6.2' -PACKAGE_STRING='viking 1.6.2' +PACKAGE_VERSION='1.7' +PACKAGE_STRING='viking 1.7' PACKAGE_BUGREPORT='' PACKAGE_URL='http://viking.sf.net/' @@ -622,6 +622,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +LIBOBJS ISODATE GEN_MANPAGES_FALSE GEN_MANPAGES_TRUE @@ -639,6 +640,12 @@ ac_ct_CXX CXXFLAGS CXX +MD5_HASH_FALSE +MD5_HASH_TRUE +ZIP_FALSE +ZIP_TRUE +LIBZIP_LIBS +LIBZIP_CFLAGS SQLITE_FALSE SQLITE_TRUE MAGIC_FALSE @@ -647,6 +654,8 @@ BZIP2_TRUE REALTIME_GPS_TRACKING_FALSE REALTIME_GPS_TRACKING_TRUE +OAUTH_FALSE +OAUTH_TRUE DEM24K_FALSE DEM24K_TRUE LIBEXIF_FALSE @@ -655,6 +664,10 @@ GEXIV2_TRUE GEOTAG_FALSE GEOTAG_TRUE +GEOCLUE_FALSE +GEOCLUE_TRUE +LIBGEOCLUE_LIBS +LIBGEOCLUE_CFLAGS GEOCACHES_FALSE GEOCACHES_TRUE GEONAMES_FALSE @@ -692,8 +705,6 @@ EXPAT_INSTALLED_TRUE WINDOWS_FALSE WINDOWS_TRUE -POW_LIB -LIBOBJS ACLOCAL_AMFLAGS CONFIG_STATUS_DEPENDENCIES ALL_LINGUAS @@ -730,15 +741,6 @@ LIBINTL LTLIBICONV LIBICONV -INTL_MACOSX_LIBS -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build XGETTEXT_EXTRA_OPTIONS MSGMERGE XGETTEXT_015 @@ -760,6 +762,7 @@ GMSGFMT MSGFMT_OPTS MSGFMT +INTL_MACOSX_LIBS USE_NLS EGREP GREP @@ -774,7 +777,6 @@ AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR OBJEXT @@ -833,6 +835,18 @@ INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM +target_os +target_vendor +target_cpu +target +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build target_alias host_alias build_alias @@ -871,7 +885,8 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -902,14 +917,21 @@ enable_bluemarble enable_geonames enable_geocaches +enable_geoclue with_libexif enable_geotag enable_dem24k +enable_oauth enable_realtime_gps_tracking enable_bzip2 enable_magic enable_mbtiles +enable_zip +enable_nettle enable_mapnik +with_mapbox_access_token +with_thunderforest_apikey +with_geonames_username with_mapcache with_tileage ' @@ -929,6 +951,10 @@ CPP PACKAGE_CFLAGS PACKAGE_LIBS +LIBGEOCLUE_CFLAGS +LIBGEOCLUE_LIBS +LIBZIP_CFLAGS +LIBZIP_LIBS CXX CXXFLAGS CCC @@ -1483,7 +1509,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures viking 1.6.2 to adapt to many kinds of systems. +\`configure' configures viking 1.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1549,12 +1575,13 @@ System types: --build=BUILD configure for building on BUILD [guessed] --host=HOST cross-compile to build programs to run on HOST [BUILD] + --target=TARGET configure for building compilers for TARGET [HOST] _ACEOF fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of viking 1.6.2:";; + short | recursive ) echo "Configuration of viking 1.7:";; esac cat <<\_ACEOF @@ -1585,9 +1612,11 @@ --enable-bluemarble enable BlueMarble stuff (default is enable) --enable-geonames enable Geonames stuff (default is enable) --enable-geocaches enable Geocaches Acquire (default is disable). + --enable-geoclue enable GeoClue support (default is enable). --enable-geotag enable Geotag Support (default is enable). --enable-dem24k enable USGS 24k DEM (default is disable) download source. Requires dem24k.pl script in path. + --enable-oauth enable OAuth Support (default is enable). --enable-realtime-gps-tracking enable realtime GPS tracking (default is enable) --enable-bzip2 enable bzip2 Support (default is enable). @@ -1595,6 +1624,8 @@ enable). --enable-mbtiles enable MBTiles support via libsqlite3 (default is enable). + --enable-zip enable zip support (default is enable). + --enable-nettle enable MD5 Hash support (default is enable) --enable-mapnik enable Mapnik (default is enable) Optional Packages: @@ -1613,6 +1644,19 @@ --with-help-formats=FORMATS list of formats --with-libexif Force usage of libexif instead of libgexiv2 + --with-mapbox_access_token + Access token for MapBox tiles. Please register your + own if you're going to distribute the package, as + requests are limited per token. + --with-thunderforest_apikey + API Key for Thunderforest (OSM Cyclemap) tiles. + Please register your own if you're going to + distribute the package, as requests are limited per + key. + --with-geonames_username + Username for the GeoNames webservice. Please + register your own if you're going to distribute the + package, as requests are limited per username. --with-mapcache specify the size of the map cache in MB (default is 128) --with-tileage specify the age of a tile before checking it @@ -1640,6 +1684,13 @@ C compiler flags for PACKAGE, overriding pkg-config PACKAGE_LIBS linker flags for PACKAGE, overriding pkg-config + LIBGEOCLUE_CFLAGS + C compiler flags for LIBGEOCLUE, overriding pkg-config + LIBGEOCLUE_LIBS + linker flags for LIBGEOCLUE, overriding pkg-config + LIBZIP_CFLAGS + C compiler flags for LIBZIP, overriding pkg-config + LIBZIP_LIBS linker flags for LIBZIP, overriding pkg-config CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor @@ -1711,7 +1762,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -viking configure 1.6.2 +viking configure 1.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2338,7 +2389,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by viking $as_me 1.6.2, which was +It was created by viking $as_me 1.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2687,7 +2738,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.15' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2718,6 +2768,119 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 +$as_echo_n "checking target system type... " >&6; } +if ${ac_cv_target+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$target_alias" = x; then + ac_cv_target=$ac_cv_host +else + ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 +$as_echo "$ac_cv_target" >&6; } +case $ac_cv_target in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; +esac +target=$ac_cv_target +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_target +shift +target_cpu=$1 +target_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +target_os=$* +IFS=$ac_save_IFS +case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac + + +# The aliases save the names the user supplied, while $host etc. +# will get canonicalized. +test -n "$target_alias" && + test "$program_prefix$program_suffix$program_transform_name" = \ + NONENONEs,x,x, && + program_prefix=${target_alias}- + +am__api_version='1.16' + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -3202,7 +3365,7 @@ # Define the identity of the package. PACKAGE='viking' - VERSION='1.6.2' + VERSION='1.7' cat >>confdefs.h <<_ACEOF @@ -3232,8 +3395,8 @@ # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -3284,7 +3447,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -4643,45 +4806,45 @@ ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -5288,6 +5451,15 @@ +ac_mingw32=no +case $target_os in + *mingw32*) + ac_mingw32=yes + ;; + *) + ;; +esac + # I18N GETTEXT_PACKAGE=viking @@ -5750,6 +5922,82 @@ XGETTEXT=: INTLLIBS= + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 +$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } +if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +CFPreferencesCopyAppValue(NULL, NULL) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFPreferencesCopyAppValue=yes +else + gt_cv_func_CFPreferencesCopyAppValue=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 +$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + +$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 +$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } +if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +CFLocaleCopyCurrent(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFLocaleCopyCurrent=yes +else + gt_cv_func_CFLocaleCopyCurrent=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 +$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + +$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h + + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + + + ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" if test "x$ac_cv_header_libintl_h" = xyes; then : gt_cv_func_dgettext_libintl="no" @@ -6090,7 +6338,7 @@ fi if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" + INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" fi if test "$gt_cv_have_gettext" = "yes"; then @@ -6748,83 +6996,12 @@ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" prefix="$acl_save_prefix" -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no + with_gnu_ld=no fi # Prepare PATH_SEPARATOR. @@ -8931,44 +9108,6 @@ # Substitute ALL_LINGUAS so we can use it in po/Makefile -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - DATADIRNAME=share -else - case $host in - *-*-solaris*) - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - DATADIRNAME=share -else - DATADIRNAME=lib -fi - - ;; - *) - DATADIRNAME=lib - ;; - esac -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi - - @@ -9201,227 +9340,6 @@ # Checks for library functions or symbols -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 -$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } -if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -f conftest.sym conftest.file -echo >conftest.file -if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then - if test "$cross_compiling" = yes; then : - ac_cv_func_lstat_dereferences_slashed_symlink=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -struct stat sbuf; - /* Linux will dereference the symlink and fail, as required by POSIX. - That is better in the sense that it means we will not - have to compile and use the lstat wrapper. */ - return lstat ("conftest.sym/", &sbuf) == 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_lstat_dereferences_slashed_symlink=yes -else - ac_cv_func_lstat_dereferences_slashed_symlink=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -else - # If the `ln -s' command failed, then we probably don't even - # have an lstat function. - ac_cv_func_lstat_dereferences_slashed_symlink=no -fi -rm -f conftest.sym conftest.file - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 -$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } - -test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && - -cat >>confdefs.h <<_ACEOF -#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 -_ACEOF - - -if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then - case " $LIBOBJS " in - *" lstat.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS lstat.$ac_objext" - ;; -esac - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5 -$as_echo_n "checking whether stat accepts an empty string... " >&6; } -if ${ac_cv_func_stat_empty_string_bug+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_stat_empty_string_bug=yes -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -struct stat sbuf; - return stat ("", &sbuf) == 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_stat_empty_string_bug=no -else - ac_cv_func_stat_empty_string_bug=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5 -$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; } -if test $ac_cv_func_stat_empty_string_bug = yes; then - case " $LIBOBJS " in - *" stat.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS stat.$ac_objext" - ;; -esac - - -cat >>confdefs.h <<_ACEOF -#define HAVE_STAT_EMPTY_STRING_BUG 1 -_ACEOF - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5 -$as_echo_n "checking for working strtod... " >&6; } -if ${ac_cv_func_strtod+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_strtod=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -$ac_includes_default -#ifndef strtod -double strtod (); -#endif -int -main() -{ - { - /* Some versions of Linux strtod mis-parse strings with leading '+'. */ - char *string = " +69"; - char *term; - double value; - value = strtod (string, &term); - if (value != 69 || term != (string + 4)) - return 1; - } - - { - /* Under Solaris 2.4, strtod returns the wrong value for the - terminating character under some conditions. */ - char *string = "NaN"; - char *term; - strtod (string, &term); - if (term != string && *(term - 1) == 0) - return 1; - } - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_strtod=yes -else - ac_cv_func_strtod=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5 -$as_echo "$ac_cv_func_strtod" >&6; } -if test $ac_cv_func_strtod = no; then - case " $LIBOBJS " in - *" strtod.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strtod.$ac_objext" - ;; -esac - -ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow" -if test "x$ac_cv_func_pow" = xyes; then : - -fi - -if test $ac_cv_func_pow = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5 -$as_echo_n "checking for pow in -lm... " >&6; } -if ${ac_cv_lib_m_pow+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pow (); -int -main () -{ -return pow (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_pow=yes -else - ac_cv_lib_m_pow=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5 -$as_echo "$ac_cv_lib_m_pow" >&6; } -if test "x$ac_cv_lib_m_pow" = xyes; then : - POW_LIB=-lm -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5 -$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;} -fi - -fi - -fi - for ac_func in floor memset mkdtemp pow realpath sqrt strcasecmp strchr strncasecmp strtol strtoul do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -10654,52 +10572,213 @@ fi -# Geotagging - -# Check whether --with-libexif was given. -if test "${with_libexif+set}" = set; then : - withval=$with_libexif; -fi - -# Check whether --enable-geotag was given. -if test "${enable_geotag+set}" = set; then : - enableval=$enable_geotag; ac_cv_enable_geotag=$enableval +# GeoClue +# Check whether --enable-geoclue was given. +if test "${enable_geoclue+set}" = set; then : + enableval=$enable_geoclue; ac_cv_enable_geoclue=$enableval else - ac_cv_enable_geotag=yes + ac_cv_enable_geoclue=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Geotag Support" >&5 -$as_echo_n "checking whether to enable Geotag Support... " >&6; } -if ${ac_cv_enable_geotag+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable GeoClue Support" >&5 +$as_echo_n "checking whether to enable GeoClue Support... " >&6; } +if ${ac_cv_enable_geoclue+:} false; then : $as_echo_n "(cached) " >&6 else - ac_cv_enable_geotag=yes + ac_cv_enable_geoclue=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_geotag" >&5 -$as_echo "$ac_cv_enable_geotag" >&6; } -case $ac_cv_enable_geotag in +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_geoclue" >&5 +$as_echo "$ac_cv_enable_geoclue" >&6; } +case $ac_cv_enable_geoclue in yes) - if test x$with_libexif = xyes; then : - ac_fn_c_check_header_mongrel "$LINENO" "libexif/exif-data.h" "ac_cv_header_libexif_exif_data_h" "$ac_includes_default" -if test "x$ac_cv_header_libexif_exif_data_h" = xyes; then : +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGEOCLUE" >&5 +$as_echo_n "checking for LIBGEOCLUE... " >&6; } + +if test -n "$LIBGEOCLUE_CFLAGS"; then + pkg_cv_LIBGEOCLUE_CFLAGS="$LIBGEOCLUE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgeoclue-2.0 >= 2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgeoclue-2.0 >= 2") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBGEOCLUE_CFLAGS=`$PKG_CONFIG --cflags "libgeoclue-2.0 >= 2" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - as_fn_error $? "exif-data.h is needed but not found - you will need to install package 'libexif-dev' or similar" "$LINENO" 5 + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBGEOCLUE_LIBS"; then + pkg_cv_LIBGEOCLUE_LIBS="$LIBGEOCLUE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgeoclue-2.0 >= 2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgeoclue-2.0 >= 2") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBGEOCLUE_LIBS=`$PKG_CONFIG --libs "libgeoclue-2.0 >= 2" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exif_loader_new in -lexif" >&5 -$as_echo_n "checking for exif_loader_new in -lexif... " >&6; } -if ${ac_cv_lib_exif_exif_loader_new+:} false; then : - $as_echo_n "(cached) " >&6 + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lexif $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBGEOCLUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgeoclue-2.0 >= 2" 2>&1` + else + LIBGEOCLUE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgeoclue-2.0 >= 2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBGEOCLUE_PKG_ERRORS" >&5 -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC + as_fn_error $? "Package requirements (libgeoclue-2.0 >= 2) were not met: + +$LIBGEOCLUE_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables LIBGEOCLUE_CFLAGS +and LIBGEOCLUE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables LIBGEOCLUE_CFLAGS +and LIBGEOCLUE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + LIBGEOCLUE_CFLAGS=$pkg_cv_LIBGEOCLUE_CFLAGS + LIBGEOCLUE_LIBS=$pkg_cv_LIBGEOCLUE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgeoclue-2" >&5 +$as_echo_n "checking for main in -lgeoclue-2... " >&6; } +if ${ac_cv_lib_geoclue_2_main+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgeoclue-2 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_geoclue_2_main=yes +else + ac_cv_lib_geoclue_2_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_geoclue_2_main" >&5 +$as_echo "$ac_cv_lib_geoclue_2_main" >&6; } +if test "x$ac_cv_lib_geoclue_2_main" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBGEOCLUE_2 1 +_ACEOF + + LIBS="-lgeoclue-2 $LIBS" + +else + as_fn_error $? "libgeoclue is needed but not found - you will need to install package 'libgeoclue-2-dev' or similar " "$LINENO" 5 +fi + +fi + ;; +esac + if test x$ac_cv_enable_geoclue = xyes; then + GEOCLUE_TRUE= + GEOCLUE_FALSE='#' +else + GEOCLUE_TRUE='#' + GEOCLUE_FALSE= +fi + + +# Geotagging + +# Check whether --with-libexif was given. +if test "${with_libexif+set}" = set; then : + withval=$with_libexif; +fi + +# Check whether --enable-geotag was given. +if test "${enable_geotag+set}" = set; then : + enableval=$enable_geotag; ac_cv_enable_geotag=$enableval +else + ac_cv_enable_geotag=yes +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Geotag Support" >&5 +$as_echo_n "checking whether to enable Geotag Support... " >&6; } +if ${ac_cv_enable_geotag+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_enable_geotag=yes +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_geotag" >&5 +$as_echo "$ac_cv_enable_geotag" >&6; } +case $ac_cv_enable_geotag in + yes) + if test x$with_libexif = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "libexif/exif-data.h" "ac_cv_header_libexif_exif_data_h" "$ac_includes_default" +if test "x$ac_cv_header_libexif_exif_data_h" = xyes; then : + +else + as_fn_error $? "exif-data.h is needed but not found - you will need to install package 'libexif-dev' or similar" "$LINENO" 5 +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exif_loader_new in -lexif" >&5 +$as_echo_n "checking for exif_loader_new in -lexif... " >&6; } +if ${ac_cv_lib_exif_exif_loader_new+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lexif $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" @@ -10851,6 +10930,97 @@ fi +# OAuth +# Check whether --enable-oauth was given. +if test "${enable_oauth+set}" = set; then : + enableval=$enable_oauth; ac_cv_enable_oauth=$enableval +else + ac_cv_enable_oauth=yes +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable OAuth Support" >&5 +$as_echo_n "checking whether to enable OAuth Support... " >&6; } +if ${ac_cv_enable_oauth+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_enable_oauth=yes +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_oauth" >&5 +$as_echo "$ac_cv_enable_oauth" >&6; } +case $ac_cv_enable_oauth in + yes) + for ac_header in oauth.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "oauth.h" "ac_cv_header_oauth_h" "$ac_includes_default" +if test "x$ac_cv_header_oauth_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_OAUTH_H 1 +_ACEOF + +else + as_fn_error $? "oauth.h is needed but not found - you will need to install package 'liboauth-dev' or similar. The feature can be disabled with --disable-oauth" "$LINENO" 5 +fi + +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for oauth_sign_url2 in -loauth" >&5 +$as_echo_n "checking for oauth_sign_url2 in -loauth... " >&6; } +if ${ac_cv_lib_oauth_oauth_sign_url2+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-loauth $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char oauth_sign_url2 (); +int +main () +{ +return oauth_sign_url2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_oauth_oauth_sign_url2=yes +else + ac_cv_lib_oauth_oauth_sign_url2=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_oauth_oauth_sign_url2" >&5 +$as_echo "$ac_cv_lib_oauth_oauth_sign_url2" >&6; } +if test "x$ac_cv_lib_oauth_oauth_sign_url2" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBOAUTH 1 +_ACEOF + + LIBS="-loauth $LIBS" + +else + as_fn_error $? "liboauth is needed but not found." "$LINENO" 5 +fi + + ;; +esac + if test x$ac_cv_enable_oauth = xyes; then + OAUTH_TRUE= + OAUTH_FALSE='#' +else + OAUTH_TRUE='#' + OAUTH_FALSE= +fi + + # Realtime GPS tracking # Check whether --enable-realtime-gps-tracking was given. if test "${enable_realtime_gps_tracking+set}" = set; then : @@ -10870,6 +11040,20 @@ $as_echo "$ac_cv_enable_realtimegpstracking" >&6; } case $ac_cv_enable_realtimegpstracking in yes) + for ac_header in gps.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "gps.h" "ac_cv_header_gps_h" "$ac_includes_default" +if test "x$ac_cv_header_gps_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GPS_H 1 +_ACEOF + +else + as_fn_error $? "gps.h is needed but not found - you will need to install package 'libgps-dev' or similar. The feature can be disabled with --disable-realtime-gps-tracking" "$LINENO" 5 +fi + +done + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gps_close in -lgps" >&5 $as_echo_n "checking for gps_close in -lgps... " >&6; } if ${ac_cv_lib_gps_gps_close+:} false; then : @@ -10914,7 +11098,13 @@ LIBS="-lgps $LIBS" else - as_fn_error $? "libgps is needed for Realtime GPS Tracking feature, but not found. The feature can be disable with --disable-realtime-gps-tracking" "$LINENO" 5 + if test "$ac_mingw32" = "yes"; then + LIBS="-lgps $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgps not found! Forcing it anyway!" >&5 +$as_echo "$as_me: WARNING: libgps not found! Forcing it anyway!" >&2;} + else + as_fn_error $? "libgps is needed but not found." "$LINENO" 5 + fi fi @@ -10964,9 +11154,14 @@ done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzBuffToBuffDecompress in -lbz2" >&5 -$as_echo_n "checking for BZ2_bzBuffToBuffDecompress in -lbz2... " >&6; } -if ${ac_cv_lib_bz2_BZ2_bzBuffToBuffDecompress+:} false; then : + if test "$ac_mingw32" = "yes"; then + # Using the cross compiler it bizarrely fails to detect BZ2_bzRead during the configure stage + # I SWEAR THIS WORKED AT SOME POINT - BUT ON A DIFFERENT DAY IT DOESN'T = MORE SWEARING + BZ2FUNC=main + as_ac_Lib=`$as_echo "ac_cv_lib_bz2_$BZ2FUNC" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $BZ2FUNC in -lbz2" >&5 +$as_echo_n "checking for $BZ2FUNC in -lbz2... " >&6; } +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10980,27 +11175,81 @@ #ifdef __cplusplus extern "C" #endif -char BZ2_bzBuffToBuffDecompress (); +char $BZ2FUNC (); int main () { -return BZ2_bzBuffToBuffDecompress (); +return $BZ2FUNC (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_bz2_BZ2_bzBuffToBuffDecompress=yes + eval "$as_ac_Lib=yes" else - ac_cv_lib_bz2_BZ2_bzBuffToBuffDecompress=no + eval "$as_ac_Lib=no" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzBuffToBuffDecompress" >&5 -$as_echo "$ac_cv_lib_bz2_BZ2_bzBuffToBuffDecompress" >&6; } -if test "x$ac_cv_lib_bz2_BZ2_bzBuffToBuffDecompress" = xyes; then : +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBBZ2 1 +_ACEOF + + LIBS="-lbz2 $LIBS" + +else + LIBS="-lbz2 $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libbz2 not found! Forcing it anyway!" >&5 +$as_echo "$as_me: WARNING: libbz2 not found! Forcing it anyway!" >&2;} +fi + + else + BZ2FUNC=BZ2_bzRead + as_ac_Lib=`$as_echo "ac_cv_lib_bz2_$BZ2FUNC" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $BZ2FUNC in -lbz2" >&5 +$as_echo_n "checking for $BZ2FUNC in -lbz2... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbz2 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $BZ2FUNC (); +int +main () +{ +return $BZ2FUNC (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBBZ2 1 _ACEOF @@ -11011,6 +11260,7 @@ as_fn_error $? "libbz2 is needed but not found." "$LINENO" 5 fi + fi ;; esac if test x$ac_cv_enable_bzip2 = xyes; then @@ -11055,6 +11305,7 @@ done + # Using the cross compiler it fails to find libmagic.dll during the configure stage { $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_open in -lmagic" >&5 $as_echo_n "checking for magic_open in -lmagic... " >&6; } if ${ac_cv_lib_magic_magic_open+:} false; then : @@ -11099,7 +11350,13 @@ LIBS="-lmagic $LIBS" else - as_fn_error $? "libmagic is needed but not found." "$LINENO" 5 + if test "$ac_mingw32" = "yes"; then + LIBS="-lmagic $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libmagic not found! Forcing it anyway!" >&5 +$as_echo "$as_me: WARNING: libmagic not found! Forcing it anyway!" >&2;} + else + as_fn_error $? "libmagic is needed but not found." "$LINENO" 5 + fi fi ;; @@ -11190,7 +11447,13 @@ LIBS="-lsqlite3 $LIBS" else - as_fn_error $? "libsqlite3 is needed but not found." "$LINENO" 5 + if test "$ac_mingw32" = "yes"; then + LIBS="-lsqlite3 $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsqlite3 not found! Forcing it anyway!" >&5 +$as_echo "$as_me: WARNING: libsqlite3 not found! Forcing it anyway!" >&2;} + else + as_fn_error $? "libsqlite3 is needed but not found." "$LINENO" 5 + fi fi ;; @@ -11204,6 +11467,264 @@ fi +# Standard compression is handled by libz +# libzip enables a friendlier file based interface +# libzip itself depends on libz (which is required in the Viking build ATM) +# ZIP +# Check whether --enable-zip was given. +if test "${enable_zip+set}" = set; then : + enableval=$enable_zip; ac_cv_enable_zip=$enableval +else + ac_cv_enable_zip=yes +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable zip Support" >&5 +$as_echo_n "checking whether to enable zip Support... " >&6; } +if ${ac_cv_enable_zip+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_enable_zip=yes +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_zip" >&5 +$as_echo "$ac_cv_enable_zip" >&6; } +case $ac_cv_enable_zip in + yes) + # NB As far as I can tell libzip doesn't provide any versioning info within the header code itself + # Thus supporting old versions via simple #if #else #endif directives is seemingly not possible + # Resort to checking versioning only via pkgconfig + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBZIP" >&5 +$as_echo_n "checking for LIBZIP... " >&6; } + +if test -n "$LIBZIP_CFLAGS"; then + pkg_cv_LIBZIP_CFLAGS="$LIBZIP_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libzip >= 0.11") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBZIP_CFLAGS=`$PKG_CONFIG --cflags "libzip >= 0.11" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBZIP_LIBS"; then + pkg_cv_LIBZIP_LIBS="$LIBZIP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libzip >= 0.11") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBZIP_LIBS=`$PKG_CONFIG --libs "libzip >= 0.11" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libzip >= 0.11" 2>&1` + else + LIBZIP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libzip >= 0.11" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBZIP_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libzip version needs to be at least 0.11, use of libzip is disabled" >&5 +$as_echo "$as_me: WARNING: libzip version needs to be at least 0.11, use of libzip is disabled" >&2;} + ac_cv_enable_zip=no + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libzip version needs to be at least 0.11, use of libzip is disabled" >&5 +$as_echo "$as_me: WARNING: libzip version needs to be at least 0.11, use of libzip is disabled" >&2;} + ac_cv_enable_zip=no + +else + LIBZIP_CFLAGS=$pkg_cv_LIBZIP_CFLAGS + LIBZIP_LIBS=$pkg_cv_LIBZIP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + for ac_header in zip.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "zip.h" "ac_cv_header_zip_h" "$ac_includes_default" +if test "x$ac_cv_header_zip_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ZIP_H 1 +_ACEOF + +else + as_fn_error $? "zip.h is needed but not found - you will need to install package 'libzip-dev' or similar. The feature can be disabled with --disable-zip" "$LINENO" 5 +fi + +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lzip" >&5 +$as_echo_n "checking for main in -lzip... " >&6; } +if ${ac_cv_lib_zip_main+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lzip $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_zip_main=yes +else + ac_cv_lib_zip_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_main" >&5 +$as_echo "$ac_cv_lib_zip_main" >&6; } +if test "x$ac_cv_lib_zip_main" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBZIP 1 +_ACEOF + + LIBS="-lzip $LIBS" + +else + if test "$ac_mingw32" = "yes"; then + LIBS="-lzip $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libzip not found! Forcing it anyway!" >&5 +$as_echo "$as_me: WARNING: libzip not found! Forcing it anyway!" >&2;} + else + as_fn_error $? "libzip is needed but not found." "$LINENO" 5 + fi +fi + +fi + ;; +esac + if test x$ac_cv_enable_zip = xyes; then + ZIP_TRUE= + ZIP_FALSE='#' +else + ZIP_TRUE='#' + ZIP_FALSE= +fi + + +# ATM only for MD5 Hashing which is currently only used for filename of image thumbnails +# Check whether --enable-nettle was given. +if test "${enable_nettle+set}" = set; then : + enableval=$enable_nettle; ac_cv_enable_nettle=$enableval +else + ac_cv_enable_nettle=yes +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable MD5 Hash support" >&5 +$as_echo_n "checking whether to enable MD5 Hash support... " >&6; } +if ${ac_cv_enable_nettle+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_enable_nettle=yes +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_nettle" >&5 +$as_echo "$ac_cv_enable_nettle" >&6; } +case $ac_cv_enable_nettle in + yes) + ac_fn_c_check_header_mongrel "$LINENO" "nettle/md5-compat.h" "ac_cv_header_nettle_md5_compat_h" "$ac_includes_default" +if test "x$ac_cv_header_nettle_md5_compat_h" = xyes; then : + +else + as_fn_error $? "nettle/md5-compat.h is needed but not found - you will need to install package 'nettle-dev' or similar. The feature can be disabled with --disable-nettle" "$LINENO" 5 +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnettle" >&5 +$as_echo_n "checking for main in -lnettle... " >&6; } +if ${ac_cv_lib_nettle_main+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnettle $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nettle_main=yes +else + ac_cv_lib_nettle_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nettle_main" >&5 +$as_echo "$ac_cv_lib_nettle_main" >&6; } +if test "x$ac_cv_lib_nettle_main" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBNETTLE 1 +_ACEOF + + LIBS="-lnettle $LIBS" + +else + if test "$ac_mingw32" = "yes"; then + LIBS="-lnettle $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnettle not found! Forcing it anyway!" >&5 +$as_echo "$as_me: WARNING: libnettle not found! Forcing it anyway!" >&2;} + else + as_fn_error $? "libnettle is needed but not found." "$LINENO" 5 + fi +fi + + ;; +esac + if test x$ac_cv_enable_nettle = xyes; then + MD5_HASH_TRUE= + MD5_HASH_FALSE='#' +else + MD5_HASH_TRUE='#' + MD5_HASH_FALSE= +fi + + # Mapnik rendering layer # Check whether --enable-mapnik was given. if test "${enable_mapnik+set}" = set; then : @@ -12298,6 +12819,49 @@ ## +# Check whether --with-mapbox_access_token was given. +if test "${with_mapbox_access_token+set}" = set; then : + withval=$with_mapbox_access_token; VIK_CONFIG_MAPBOX_TOKEN="\"${withval}\"" +else + VIK_CONFIG_MAPBOX_TOKEN="\"pk.eyJ1Ijoicndub3JyaXMiLCJhIjoiY2lxc294anN2MDA5bWhzbWFseWsxMW1ydiJ9.HcybKtZsiG6RVuOHg481Kg\"" +fi + + +cat >>confdefs.h <<_ACEOF +#define VIK_CONFIG_MAPBOX_TOKEN ${VIK_CONFIG_MAPBOX_TOKEN} +_ACEOF + + + + +# Check whether --with-thunderforest_apikey was given. +if test "${with_thunderforest_apikey+set}" = set; then : + withval=$with_thunderforest_apikey; VIK_CONFIG_THUNDERFOREST_KEY="\"${withval}\"" +else + VIK_CONFIG_THUNDERFOREST_KEY="\"7387c111d85642b18f63608bd4cb8b4f\"" +fi + + +cat >>confdefs.h <<_ACEOF +#define VIK_CONFIG_THUNDERFOREST_KEY ${VIK_CONFIG_THUNDERFOREST_KEY} +_ACEOF + + + +# Check whether --with-geonames_username was given. +if test "${with_geonames_username+set}" = set; then : + withval=$with_geonames_username; VIK_CONFIG_GEONAMES_USERNAME="\"${withval}\"" +else + VIK_CONFIG_GEONAMES_USERNAME="\"$PACKAGE\"" +fi + + +cat >>confdefs.h <<_ACEOF +#define VIK_CONFIG_GEONAMES_USERNAME ${VIK_CONFIG_GEONAMES_USERNAME} +_ACEOF + + + # Check whether --with-mapcache was given. if test "${with_mapcache+set}" = set; then : @@ -12342,7 +12906,13 @@ $as_echo "#define HAVE_VIKING 1" >>confdefs.h -DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl +if test -r /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl; then + DB2MAN_XSL=/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl +elif test -r /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl; then + DB2MAN_XSL=/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl +else + DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl +fi # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 @@ -12429,7 +12999,7 @@ fi - if test "x$XP" != "x" && test -r "$DB2MAN_XSL" && test "${HAVE_SCROLLKEEPER}" == "yes" ; then + if test "x$XP" != "x" && test -r "$DB2MAN_XSL" && test "${HAVE_SCROLLKEEPER}" = "yes" ; then GEN_MANPAGES_TRUE= GEN_MANPAGES_FALSE='#' else @@ -12437,22 +13007,25 @@ GEN_MANPAGES_FALSE= fi +if test -z "$GEN_MANPAGES_TRUE"; then : + ac_cv_enable_man=yes +else + ac_cv_enable_man=no +fi -ISODATE=`date +%Y-%m-%d` +ISODATE="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)" cat >>confdefs.h <<_ACEOF -#define THEYEAR "`date +%Y`" +#define THEYEAR "$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y)" _ACEOF # Configuration -ac_config_files="$ac_config_files Makefile src/Makefile src/icons/Makefile po/Makefile.in data/Makefile tools/Makefile test/Makefile help/Makefile help/viking.xml win32/Makefile win32/installer/Makefile win32/installer/pixmaps/Makefile win32/installer/translations/Makefile doc/Makefile doc/reference/Makefile doc/examples/Makefile" +ac_config_files="$ac_config_files viking.spec mingw-viking.spec mingw64-viking.spec Makefile src/Makefile src/icons/Makefile po/Makefile.in data/Makefile tools/Makefile test/Makefile help/Makefile help/viking.xml windows/Makefile windows/installer/Makefile windows/installer/pixmaps/Makefile windows/installer/translations/Makefile doc/Makefile doc/reference/Makefile doc/examples/Makefile" -ac_config_files="$ac_config_files viking.spec" - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -12662,6 +13235,10 @@ as_fn_error $? "conditional \"GEOCACHES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${GEOCLUE_TRUE}" && test -z "${GEOCLUE_FALSE}"; then + as_fn_error $? "conditional \"GEOCLUE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${GEOTAG_TRUE}" && test -z "${GEOTAG_FALSE}"; then as_fn_error $? "conditional \"GEOTAG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -12678,6 +13255,10 @@ as_fn_error $? "conditional \"DEM24K\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${OAUTH_TRUE}" && test -z "${OAUTH_FALSE}"; then + as_fn_error $? "conditional \"OAUTH\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${REALTIME_GPS_TRACKING_TRUE}" && test -z "${REALTIME_GPS_TRACKING_FALSE}"; then as_fn_error $? "conditional \"REALTIME_GPS_TRACKING\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -12694,6 +13275,14 @@ as_fn_error $? "conditional \"SQLITE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ZIP_TRUE}" && test -z "${ZIP_FALSE}"; then + as_fn_error $? "conditional \"ZIP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${MD5_HASH_TRUE}" && test -z "${MD5_HASH_FALSE}"; then + as_fn_error $? "conditional \"MD5_HASH\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -13111,7 +13700,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by viking $as_me 1.6.2, which was +This file was extended by viking $as_me 1.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13178,7 +13767,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -viking config.status 1.6.2 +viking config.status 1.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -13297,7 +13886,7 @@ # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" # Capture the value of obsolete ALL_LINGUAS because we need it to compute # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it @@ -13319,6 +13908,9 @@ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; + "viking.spec") CONFIG_FILES="$CONFIG_FILES viking.spec" ;; + "mingw-viking.spec") CONFIG_FILES="$CONFIG_FILES mingw-viking.spec" ;; + "mingw64-viking.spec") CONFIG_FILES="$CONFIG_FILES mingw64-viking.spec" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/icons/Makefile") CONFIG_FILES="$CONFIG_FILES src/icons/Makefile" ;; @@ -13328,14 +13920,13 @@ "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;; "help/viking.xml") CONFIG_FILES="$CONFIG_FILES help/viking.xml" ;; - "win32/Makefile") CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;; - "win32/installer/Makefile") CONFIG_FILES="$CONFIG_FILES win32/installer/Makefile" ;; - "win32/installer/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES win32/installer/pixmaps/Makefile" ;; - "win32/installer/translations/Makefile") CONFIG_FILES="$CONFIG_FILES win32/installer/translations/Makefile" ;; + "windows/Makefile") CONFIG_FILES="$CONFIG_FILES windows/Makefile" ;; + "windows/installer/Makefile") CONFIG_FILES="$CONFIG_FILES windows/installer/Makefile" ;; + "windows/installer/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES windows/installer/pixmaps/Makefile" ;; + "windows/installer/translations/Makefile") CONFIG_FILES="$CONFIG_FILES windows/installer/translations/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/reference/Makefile") CONFIG_FILES="$CONFIG_FILES doc/reference/Makefile" ;; "doc/examples/Makefile") CONFIG_FILES="$CONFIG_FILES doc/examples/Makefile" ;; - "viking.spec") CONFIG_FILES="$CONFIG_FILES viking.spec" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -13936,29 +14527,35 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -13976,53 +14573,48 @@ q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)$/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) @@ -14200,34 +14792,67 @@ fi -echo "" -echo "===========================================" -echo "$PACKAGE $PACKAGE_URL $VERSION" -echo "-------------------------------------------" -echo "Bing Maps : $ac_cv_enable_bing" -echo "Google : $ac_cv_enable_google" -echo "Terraserver Maps : $ac_cv_enable_terraserver" -echo "Expedia Maps : $ac_cv_enable_expedia" -echo "Open Street Map : $ac_cv_enable_openstreetmap" -echo "BlueMarble : $ac_cv_enable_bluemarble" -echo "Geonames : $ac_cv_enable_geonames" -echo "Geocaches Acquire : $ac_cv_enable_geocaches" -echo "Geotag Support : $ac_cv_enable_geotag (libgexiv2=$ac_cv_lib_gexiv2_gexiv2_metadata_new libexif=$ac_cv_lib_exif_exif_loader_new)" -echo "USGS 24k DEM : $ac_cv_enable_dem24k" -echo "Realtime GPS Tracking : $ac_cv_enable_realtimegpstracking" -echo "bzip2 Support : $ac_cv_enable_bzip2" -echo "File Magic Support : $ac_cv_enable_magic" -echo "MBTiles Support (SQLite3) : $ac_cv_enable_mbtiles" -echo "Mapnik Rendering Support (C++) : $ac_cv_enable_mapnik" -echo "Size of map cache (in memory) : ${VIK_CONFIG_MAPCACHE_SIZE}" -echo "Age of tiles (in seconds) : ${VIK_CONFIG_DEFAULT_TILE_AGE}" -echo -n "Man page generation : " -if test -z "$GEN_MANPAGES_TRUE"; then : - echo "yes" -else - echo "no" -fi -echo "Documentation (+HTML) : ${enable_gtk_doc} (HTML: ${enable_gtk_doc_html})" -echo "-------------------------------------------" -echo "" -echo "Configure finished, type 'make' to build." +{ $as_echo "$as_me:${as_lineno-$LINENO}: \" +=========================================== +$PACKAGE $PACKAGE_URL $VERSION +------------------------------------------- +Bing Maps : $ac_cv_enable_bing +Google : $ac_cv_enable_google +Terraserver Maps : $ac_cv_enable_terraserver +Expedia Maps : $ac_cv_enable_expedia +Open Street Map : $ac_cv_enable_openstreetmap +BlueMarble : $ac_cv_enable_bluemarble +GeoClue Support : $ac_cv_enable_geoclue +Geonames : $ac_cv_enable_geonames +Geocaches Acquire : $ac_cv_enable_geocaches +Geotag Support : $ac_cv_enable_geotag (libgexiv2=$ac_cv_lib_gexiv2_gexiv2_metadata_new libexif=$ac_cv_lib_exif_exif_loader_new) +USGS 24k DEM : $ac_cv_enable_dem24k +Realtime GPS Tracking : $ac_cv_enable_realtimegpstracking +bzip2 Support : $ac_cv_enable_bzip2 +File Magic Support : $ac_cv_enable_magic +MBTiles Support (SQLite3) : $ac_cv_enable_mbtiles +Zip File Support (with libzip) : $ac_cv_enable_zip +MD5 Hash Support (with libnettle): $ac_cv_enable_nettle +Mapnik Rendering Support (C++) : $ac_cv_enable_mapnik +OAuth : $ac_cv_enable_oauth +Size of map cache (in memory) : ${VIK_CONFIG_MAPCACHE_SIZE} +Age of tiles (in seconds) : ${VIK_CONFIG_DEFAULT_TILE_AGE} +GeoNames user : ${VIK_CONFIG_GEONAMES_USERNAME} +Man page generation : $ac_cv_enable_man +Documentation (+HTML) : ${enable_gtk_doc} (HTML: ${enable_gtk_doc_html}) +------------------------------------------- + +Configure finished, type 'make' to build. +\"" >&5 +$as_echo "$as_me: \" +=========================================== +$PACKAGE $PACKAGE_URL $VERSION +------------------------------------------- +Bing Maps : $ac_cv_enable_bing +Google : $ac_cv_enable_google +Terraserver Maps : $ac_cv_enable_terraserver +Expedia Maps : $ac_cv_enable_expedia +Open Street Map : $ac_cv_enable_openstreetmap +BlueMarble : $ac_cv_enable_bluemarble +GeoClue Support : $ac_cv_enable_geoclue +Geonames : $ac_cv_enable_geonames +Geocaches Acquire : $ac_cv_enable_geocaches +Geotag Support : $ac_cv_enable_geotag (libgexiv2=$ac_cv_lib_gexiv2_gexiv2_metadata_new libexif=$ac_cv_lib_exif_exif_loader_new) +USGS 24k DEM : $ac_cv_enable_dem24k +Realtime GPS Tracking : $ac_cv_enable_realtimegpstracking +bzip2 Support : $ac_cv_enable_bzip2 +File Magic Support : $ac_cv_enable_magic +MBTiles Support (SQLite3) : $ac_cv_enable_mbtiles +Zip File Support (with libzip) : $ac_cv_enable_zip +MD5 Hash Support (with libnettle): $ac_cv_enable_nettle +Mapnik Rendering Support (C++) : $ac_cv_enable_mapnik +OAuth : $ac_cv_enable_oauth +Size of map cache (in memory) : ${VIK_CONFIG_MAPCACHE_SIZE} +Age of tiles (in seconds) : ${VIK_CONFIG_DEFAULT_TILE_AGE} +GeoNames user : ${VIK_CONFIG_GEONAMES_USERNAME} +Man page generation : $ac_cv_enable_man +Documentation (+HTML) : ${enable_gtk_doc} (HTML: ${enable_gtk_doc_html}) +------------------------------------------- + +Configure finished, type 'make' to build. +\"" >&6;} diff -Nru viking-1.6.2/configure.ac viking-1.7/configure.ac --- viking-1.6.2/configure.ac 2015-12-21 11:59:17.000000000 +0000 +++ viking-1.7/configure.ac 2019-01-21 18:29:55.000000000 +0000 @@ -2,7 +2,11 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.64) -AC_INIT(viking, 1.6.2, , viking, http://viking.sf.net/) +AC_INIT(viking, 1.7, , viking, http://viking.sf.net/) + +AC_CANONICAL_HOST +AC_CANONICAL_TARGET + AM_INIT_AUTOMAKE([dist-bzip2 dist-zip subdir-objects]) dnl AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_HEADERS([src/config.h]) @@ -21,6 +25,15 @@ AC_PROG_RANLIB AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) +ac_mingw32=no +case $target_os in + *mingw32*) + ac_mingw32=yes + ;; + *) + ;; +esac + # I18N GETTEXT_PACKAGE=viking AC_SUBST(GETTEXT_PACKAGE) @@ -49,8 +62,6 @@ AC_TYPE_MODE_T # Checks for library functions or symbols -AC_FUNC_STAT -AC_FUNC_STRTOD AC_CHECK_FUNCS([floor memset mkdtemp pow realpath sqrt strcasecmp strchr strncasecmp strtol strtoul]) AC_CHECK_LIB(m, tan) AC_CHECK_LIB(z, inflate) @@ -234,6 +245,21 @@ esac AM_CONDITIONAL([GEOCACHES], [test x$ac_cv_enable_geocaches = xyes]) +# GeoClue +AC_ARG_ENABLE(geoclue, AC_HELP_STRING([--enable-geoclue], + [enable GeoClue support (default is enable).]), + [ac_cv_enable_geoclue=$enableval], + [ac_cv_enable_geoclue=yes]) +AC_CACHE_CHECK([whether to enable GeoClue Support], + [ac_cv_enable_geoclue], [ac_cv_enable_geoclue=yes]) +case $ac_cv_enable_geoclue in + yes) + PKG_CHECK_MODULES( [LIBGEOCLUE], [libgeoclue-2.0 >= 2], + AC_CHECK_LIB(geoclue-2, main,, AC_MSG_ERROR([libgeoclue is needed but not found - you will need to install package 'libgeoclue-2-dev' or similar ])) ) + ;; +esac +AM_CONDITIONAL([GEOCLUE], [test x$ac_cv_enable_geoclue = xyes]) + # Geotagging AC_ARG_WITH(libexif, AC_HELP_STRING([--with-libexif], [Force usage of libexif instead of libgexiv2])) AC_ARG_ENABLE(geotag, AC_HELP_STRING([--enable-geotag], @@ -273,6 +299,21 @@ esac AM_CONDITIONAL([DEM24K], [test x$ac_cv_enable_dem24k = xyes]) +# OAuth +AC_ARG_ENABLE(oauth, AC_HELP_STRING([--enable-oauth], + [enable OAuth Support (default is enable).]), + [ac_cv_enable_oauth=$enableval], + [ac_cv_enable_oauth=yes]) +AC_CACHE_CHECK([whether to enable OAuth Support], + [ac_cv_enable_oauth], [ac_cv_enable_oauth=yes]) +case $ac_cv_enable_oauth in + yes) + AC_CHECK_HEADERS([oauth.h],[],[AC_MSG_ERROR([oauth.h is needed but not found - you will need to install package 'liboauth-dev' or similar. The feature can be disabled with --disable-oauth])]) + AC_CHECK_LIB(oauth, oauth_sign_url2, [], [AC_MSG_ERROR([liboauth is needed but not found.])]) + ;; +esac +AM_CONDITIONAL([OAUTH], [test x$ac_cv_enable_oauth = xyes]) + # Realtime GPS tracking AC_ARG_ENABLE(realtime-gps-tracking, AC_HELP_STRING([--enable-realtime-gps-tracking], [enable realtime GPS tracking (default is enable)]), @@ -282,7 +323,14 @@ [ac_cv_enable_realtimegpstracking], [ac_cv_enable_realtimegpstracking=yes]) case $ac_cv_enable_realtimegpstracking in yes) - AC_CHECK_LIB(gps,gps_close,,AC_MSG_ERROR([libgps is needed for Realtime GPS Tracking feature[,] but not found. The feature can be disable with --disable-realtime-gps-tracking])) + AC_CHECK_HEADERS([gps.h],[],[AC_MSG_ERROR([gps.h is needed but not found - you will need to install package 'libgps-dev' or similar. The feature can be disabled with --disable-realtime-gps-tracking])]) + AC_CHECK_LIB(gps, gps_close, [], + if test "$ac_mingw32" = "yes"; then + [LIBS="-lgps $LIBS" + AC_MSG_WARN([libgps not found! Forcing it anyway!])] + else + AC_MSG_ERROR([libgps is needed but not found.]) + fi) AC_DEFINE(VIK_CONFIG_REALTIME_GPS_TRACKING, [], [REALTIME GPS TRACKING STUFF]) ;; esac @@ -298,7 +346,16 @@ case $ac_cv_enable_bzip2 in yes) AC_CHECK_HEADERS([bzlib.h],[],[AC_MSG_ERROR([bzlib.h is needed but not found - you will need to install package 'libbz2-dev' or similar. The feature can be disabled with --disable-bzip2])]) - AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffDecompress, [], [AC_MSG_ERROR([libbz2 is needed but not found.])]) + if test "$ac_mingw32" = "yes"; then + # Using the cross compiler it bizarrely fails to detect BZ2_bzRead during the configure stage + # I SWEAR THIS WORKED AT SOME POINT - BUT ON A DIFFERENT DAY IT DOESN'T = MORE SWEARING + BZ2FUNC=main + AC_CHECK_LIB(bz2, [$BZ2FUNC], [], [LIBS="-lbz2 $LIBS" + AC_MSG_WARN([libbz2 not found! Forcing it anyway!])]) + else + BZ2FUNC=BZ2_bzRead + AC_CHECK_LIB(bz2, [$BZ2FUNC], [], [AC_MSG_ERROR([libbz2 is needed but not found.])]) + fi ;; esac AM_CONDITIONAL([BZIP2], [test x$ac_cv_enable_bzip2 = xyes]) @@ -313,7 +370,14 @@ case $ac_cv_enable_magic in yes) AC_CHECK_HEADERS([magic.h],[],[AC_MSG_ERROR([magic.h is needed but not found - you will need to install package 'libmagic-dev' or similar. The feature can be disabled with --disable-magic])]) - AC_CHECK_LIB(magic, magic_open, [], [AC_MSG_ERROR([libmagic is needed but not found.])]) + # Using the cross compiler it fails to find libmagic.dll during the configure stage + AC_CHECK_LIB(magic, magic_open, [], + if test "$ac_mingw32" = "yes"; then + [LIBS="-lmagic $LIBS" + AC_MSG_WARN([libmagic not found! Forcing it anyway!])] + else + AC_MSG_ERROR([libmagic is needed but not found.]) + fi) ;; esac AM_CONDITIONAL([MAGIC], [test x$ac_cv_enable_magic = xyes]) @@ -328,11 +392,69 @@ case $ac_cv_enable_mbtiles in yes) AC_CHECK_HEADERS([sqlite3.h],[],[AC_MSG_ERROR([sqlite3.h is needed but not found - you will need to install package 'libsqlite3-dev' or similar. The feature can be disabled with --disable-mbtiles])]) - AC_CHECK_LIB(sqlite3, sqlite3_open, [], [AC_MSG_ERROR([libsqlite3 is needed but not found.])]) + AC_CHECK_LIB(sqlite3, sqlite3_open, [], + if test "$ac_mingw32" = "yes"; then + [LIBS="-lsqlite3 $LIBS" + AC_MSG_WARN([libsqlite3 not found! Forcing it anyway!])] + else + AC_MSG_ERROR([libsqlite3 is needed but not found.]) + fi) ;; esac AM_CONDITIONAL([SQLITE], [test x$ac_cv_enable_mbtiles = xyes]) +# Standard compression is handled by libz +# libzip enables a friendlier file based interface +# libzip itself depends on libz (which is required in the Viking build ATM) +# ZIP +AC_ARG_ENABLE(zip, AC_HELP_STRING([--enable-zip], + [enable zip support (default is enable).]), + [ac_cv_enable_zip=$enableval], + [ac_cv_enable_zip=yes]) +AC_CACHE_CHECK([whether to enable zip Support], + [ac_cv_enable_zip], [ac_cv_enable_zip=yes]) +case $ac_cv_enable_zip in + yes) + # NB As far as I can tell libzip doesn't provide any versioning info within the header code itself + # Thus supporting old versions via simple #if #else #endif directives is seemingly not possible + # Resort to checking versioning only via pkgconfig + PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11], + [ AC_CHECK_HEADERS([zip.h],[],[AC_MSG_ERROR([zip.h is needed but not found - you will need to install package 'libzip-dev' or similar. The feature can be disabled with --disable-zip])]) + AC_CHECK_LIB(zip, [main], [], + if test "$ac_mingw32" = "yes"; then + [LIBS="-lzip $LIBS" + AC_MSG_WARN([libzip not found! Forcing it anyway!])] + else + AC_MSG_ERROR([libzip is needed but not found.]) + fi)], + [ AC_MSG_WARN([libzip version needs to be at least 0.11, use of libzip is disabled]) + ac_cv_enable_zip=no ] + ) + ;; +esac +AM_CONDITIONAL([ZIP], [test x$ac_cv_enable_zip = xyes]) + +# ATM only for MD5 Hashing which is currently only used for filename of image thumbnails +AC_ARG_ENABLE(nettle, AC_HELP_STRING([--enable-nettle], + [enable MD5 Hash support (default is enable)]), + [ac_cv_enable_nettle=$enableval], + [ac_cv_enable_nettle=yes]) +AC_CACHE_CHECK([whether to enable MD5 Hash support], + [ac_cv_enable_nettle], [ac_cv_enable_nettle=yes]) +case $ac_cv_enable_nettle in + yes) + AC_CHECK_HEADER([nettle/md5-compat.h],[],[AC_MSG_ERROR([nettle/md5-compat.h is needed but not found - you will need to install package 'nettle-dev' or similar. The feature can be disabled with --disable-nettle])]) + AC_CHECK_LIB([nettle], [main], [], + if test "$ac_mingw32" = "yes"; then + [LIBS="-lnettle $LIBS" + AC_MSG_WARN([libnettle not found! Forcing it anyway!])] + else + AC_MSG_ERROR([libnettle is needed but not found.]) + fi) + ;; +esac +AM_CONDITIONAL([MD5_HASH], [test x$ac_cv_enable_nettle = xyes]) + # Mapnik rendering layer AC_ARG_ENABLE(mapnik, AC_HELP_STRING([--enable-mapnik], [enable Mapnik (default is enable)]), @@ -369,6 +491,36 @@ m4_popdef([AC_MSG_ERROR]) ## +dnl Compile time defined access token +AC_ARG_WITH(mapbox_access_token, + [AC_HELP_STRING([--with-mapbox_access_token], + [Access token for MapBox tiles. + Please register your own if you're going to distribute the + package, as requests are limited per token.])], + [VIK_CONFIG_MAPBOX_TOKEN="\"${withval}\""], + [VIK_CONFIG_MAPBOX_TOKEN="\"pk.eyJ1Ijoicndub3JyaXMiLCJhIjoiY2lxc294anN2MDA5bWhzbWFseWsxMW1ydiJ9.HcybKtZsiG6RVuOHg481Kg\""]) +AC_DEFINE_UNQUOTED(VIK_CONFIG_MAPBOX_TOKEN, ${VIK_CONFIG_MAPBOX_TOKEN}, [Mapbox Token]) + + +dnl Compile time defined key +AC_ARG_WITH(thunderforest_apikey, + [AC_HELP_STRING([--with-thunderforest_apikey], + [API Key for Thunderforest (OSM Cyclemap) tiles. + Please register your own if you're going to distribute the + package, as requests are limited per key.])], + [VIK_CONFIG_THUNDERFOREST_KEY="\"${withval}\""], + [VIK_CONFIG_THUNDERFOREST_KEY="\"7387c111d85642b18f63608bd4cb8b4f\""]) +AC_DEFINE_UNQUOTED(VIK_CONFIG_THUNDERFOREST_KEY, ${VIK_CONFIG_THUNDERFOREST_KEY}, [Thunderforest key]) + +AC_ARG_WITH(geonames_username, + [AC_HELP_STRING([--with-geonames_username], + [Username for the GeoNames webservice. + Please register your own if you're going to distribute the + package, as requests are limited per username.])], + [VIK_CONFIG_GEONAMES_USERNAME="\"${withval}\""], + [VIK_CONFIG_GEONAMES_USERNAME="\"$PACKAGE\""]) +AC_DEFINE_UNQUOTED(VIK_CONFIG_GEONAMES_USERNAME, ${VIK_CONFIG_GEONAMES_USERNAME}, [geonames username]) + AC_ARG_WITH(mapcache, [AC_HELP_STRING([--with-mapcache], @@ -401,20 +553,34 @@ AC_DEFINE(HAVE_VIKING, 1, [Enable Viking specifics in otherwise reusable code]) dnl man pages processing -DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl +dnl Different distributions have differing locations for the docbook.xsl +dnl Debian like +if test -r /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl; then + DB2MAN_XSL=/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl +dnl RedHat like +elif test -r /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl; then + DB2MAN_XSL=/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl +else +dnl Old default + DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl +fi AC_SUBST(DB2MAN_XSL) AC_PATH_PROG(XP,xsltproc) AM_CONDITIONAL([HAVE_XSLTPROC],[test "x$XP" != "x"]) AC_CHECK_PROG([HAVE_SCROLLKEEPER],scrollkeeper-config,"yes") -AM_CONDITIONAL([GEN_MANPAGES],[test "x$XP" != "x" && test -r "$DB2MAN_XSL"] && test "${HAVE_SCROLLKEEPER}" == "yes" ) +AM_CONDITIONAL([GEN_MANPAGES],[test "x$XP" != "x" && test -r "$DB2MAN_XSL"] && test "${HAVE_SCROLLKEEPER}" = "yes" ) +AM_COND_IF([GEN_MANPAGES], [ac_cv_enable_man=yes], [ac_cv_enable_man=no]) -ISODATE=`date +%Y-%m-%d` +ISODATE="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)" AC_SUBST(ISODATE) -AC_DEFINE_UNQUOTED(THEYEAR, "`date +%Y`", [The Year]) +AC_DEFINE_UNQUOTED(THEYEAR, "$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y)", [The Year]) # Configuration AC_CONFIG_FILES([ + viking.spec + mingw-viking.spec + mingw64-viking.spec Makefile src/Makefile src/icons/Makefile @@ -424,43 +590,46 @@ test/Makefile help/Makefile help/viking.xml - win32/Makefile - win32/installer/Makefile - win32/installer/pixmaps/Makefile - win32/installer/translations/Makefile + windows/Makefile + windows/installer/Makefile + windows/installer/pixmaps/Makefile + windows/installer/translations/Makefile doc/Makefile doc/reference/Makefile doc/examples/Makefile]) -AC_OUTPUT([ - viking.spec - ]) +AC_OUTPUT dnl Output the configuration summary -echo "" -echo "===========================================" -echo "$PACKAGE $PACKAGE_URL $VERSION" -echo "-------------------------------------------" -echo "Bing Maps : $ac_cv_enable_bing" -echo "Google : $ac_cv_enable_google" -echo "Terraserver Maps : $ac_cv_enable_terraserver" -echo "Expedia Maps : $ac_cv_enable_expedia" -echo "Open Street Map : $ac_cv_enable_openstreetmap" -echo "BlueMarble : $ac_cv_enable_bluemarble" -echo "Geonames : $ac_cv_enable_geonames" -echo "Geocaches Acquire : $ac_cv_enable_geocaches" -echo "Geotag Support : $ac_cv_enable_geotag (libgexiv2=$ac_cv_lib_gexiv2_gexiv2_metadata_new libexif=$ac_cv_lib_exif_exif_loader_new)" -echo "USGS 24k DEM : $ac_cv_enable_dem24k" -echo "Realtime GPS Tracking : $ac_cv_enable_realtimegpstracking" -echo "bzip2 Support : $ac_cv_enable_bzip2" -echo "File Magic Support : $ac_cv_enable_magic" -echo "MBTiles Support (SQLite3) : $ac_cv_enable_mbtiles" -echo "Mapnik Rendering Support (C++) : $ac_cv_enable_mapnik" -echo "Size of map cache (in memory) : ${VIK_CONFIG_MAPCACHE_SIZE}" -echo "Age of tiles (in seconds) : ${VIK_CONFIG_DEFAULT_TILE_AGE}" -echo -n "Man page generation : " -AM_COND_IF([GEN_MANPAGES], [echo "yes"], [echo "no"]) -echo "Documentation (+HTML) : ${enable_gtk_doc} (HTML: ${enable_gtk_doc_html})" -echo "-------------------------------------------" -echo "" -echo "Configure finished, type 'make' to build." +AC_MSG_NOTICE([" +=========================================== +$PACKAGE $PACKAGE_URL $VERSION +------------------------------------------- +Bing Maps : $ac_cv_enable_bing +Google : $ac_cv_enable_google +Terraserver Maps : $ac_cv_enable_terraserver +Expedia Maps : $ac_cv_enable_expedia +Open Street Map : $ac_cv_enable_openstreetmap +BlueMarble : $ac_cv_enable_bluemarble +GeoClue Support : $ac_cv_enable_geoclue +Geonames : $ac_cv_enable_geonames +Geocaches Acquire : $ac_cv_enable_geocaches +Geotag Support : $ac_cv_enable_geotag (libgexiv2=$ac_cv_lib_gexiv2_gexiv2_metadata_new libexif=$ac_cv_lib_exif_exif_loader_new) +USGS 24k DEM : $ac_cv_enable_dem24k +Realtime GPS Tracking : $ac_cv_enable_realtimegpstracking +bzip2 Support : $ac_cv_enable_bzip2 +File Magic Support : $ac_cv_enable_magic +MBTiles Support (SQLite3) : $ac_cv_enable_mbtiles +Zip File Support (with libzip) : $ac_cv_enable_zip +MD5 Hash Support (with libnettle): $ac_cv_enable_nettle +Mapnik Rendering Support (C++) : $ac_cv_enable_mapnik +OAuth : $ac_cv_enable_oauth +Size of map cache (in memory) : ${VIK_CONFIG_MAPCACHE_SIZE} +Age of tiles (in seconds) : ${VIK_CONFIG_DEFAULT_TILE_AGE} +GeoNames user : ${VIK_CONFIG_GEONAMES_USERNAME} +Man page generation : $ac_cv_enable_man +Documentation (+HTML) : ${enable_gtk_doc} (HTML: ${enable_gtk_doc_html}) +------------------------------------------- + +Configure finished, type 'make' to build. +"]) diff -Nru viking-1.6.2/data/Makefile.am viking-1.7/data/Makefile.am --- viking-1.6.2/data/Makefile.am 2015-11-10 21:01:35.000000000 +0000 +++ viking-1.7/data/Makefile.am 2018-12-23 10:48:06.000000000 +0000 @@ -1,4 +1,10 @@ -pkgdata_DATA = maps.xml external_tools.xml goto_tools.xml datasources.xml latlontz.txt +pkgdata_DATA = \ + maps.xml \ + external_tools.xml \ + goto_tools.xml \ + datasources.xml \ + routing.xml \ + latlontz.txt EXTRA_DIST = \ $(pkgdata_DATA) diff -Nru viking-1.6.2/data/Makefile.in viking-1.7/data/Makefile.in --- viking-1.6.2/data/Makefile.in 2015-12-21 12:13:18.000000000 +0000 +++ viking-1.7/data/Makefile.in 2019-01-21 20:16:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -88,6 +88,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ subdir = data ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/expat.m4 \ @@ -227,10 +228,14 @@ LDFLAGS = @LDFLAGS@ LIBCURL = @LIBCURL@ LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ +LIBGEOCLUE_CFLAGS = @LIBGEOCLUE_CFLAGS@ +LIBGEOCLUE_LIBS = @LIBGEOCLUE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBZIP_CFLAGS = @LIBZIP_CFLAGS@ +LIBZIP_LIBS = @LIBZIP_LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -259,7 +264,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ -POW_LIB = @POW_LIB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ @@ -323,11 +327,22 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +target = @target@ target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -pkgdata_DATA = maps.xml external_tools.xml goto_tools.xml datasources.xml latlontz.txt +pkgdata_DATA = \ + maps.xml \ + external_tools.xml \ + goto_tools.xml \ + datasources.xml \ + routing.xml \ + latlontz.txt + EXTRA_DIST = \ $(pkgdata_DATA) @@ -351,8 +366,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -391,7 +406,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru viking-1.6.2/data/maps.xml viking-1.7/data/maps.xml --- viking-1.6.2/data/maps.xml 2015-11-10 21:01:35.000000000 +0000 +++ viking-1.7/data/maps.xml 2018-12-23 10:48:06.000000000 +0000 @@ -30,6 +30,19 @@ --> + OSM GPS Traces + https://gps-c.tile.openstreetmap.org + /lines/%d/%d/%d.png + 0 + 18 + 33 + OSM-GPS + © OpenStreetMap contributors + CC-BY-SA + http://www.openstreetmap.org/copyright + TRUE + + 29 CalTopo CalTopo USGS 7.5" Topos @@ -69,4 +82,71 @@ CC-BY-SA http://www.openstreetmap.org/copyright + + Waymarked Trails Hiking + tile.waymarkedtrails.org + /hiking/%d/%d/%d.png + 701 + CC-by-SA 3.0 / ODBl + http://creativecommons.org/licenses/by-sa/3.0/de/deed.en + + + Waymarked Trails Cycling + tile.waymarkedtrails.org + /cycling/%d/%d/%d.png + 702 + CC-by-SA 3.0 / ODBl + http://creativecommons.org/licenses/by-sa/3.0/de/deed.en + + + Waymarked Trails MTB + tile.waymarkedtrails.org + /mtb/%d/%d/%d.png + 703 + CC-by-SA 3.0 / ODBl + http://creativecommons.org/licenses/by-sa/3.0/de/deed.en + + + Waymarked Trails Inline Skating + tile.waymarkedtrails.org + /skating/%d/%d/%d.png + 704 + CC-by-SA 3.0 / ODBl + http://creativecommons.org/licenses/by-sa/3.0/de/deed.en + + + Waymarked Trails Riding + tile.waymarkedtrails.org + /riding/%d/%d/%d.png + 705 + CC-by-SA 3.0 / ODBl + http://creativecommons.org/licenses/by-sa/3.0/de/deed.en + + + Waymarked Trails Winter Sport Slopes + tile.waymarkedtrails.org + /slopes/%d/%d/%d.png + 706 + CC-by-SA 3.0 / ODBl + http://creativecommons.org/licenses/by-sa/3.0/de/deed.en + + + 4UMaps + tileserver.4umaps.eu + /%d/%d/%d.png + © 4UMaps.eu © OpenStreetMap and contributors + CC-BY-SA + http://www.4umaps.eu/terms-of-use-copyright.aspx + 801 + + + OpenTopoMap + a.tile.opentopomap.org + /%d/%d/%d.png + 2 + Kartendaten: © OpenStreetMap-Mitwirkende, SRTM | Kartendarstellung: © OpenTopoMap + CC-BY-SA + https://creativecommons.org/licenses/by-sa/3.0/ + 901 + diff -Nru viking-1.6.2/data/routing.xml viking-1.7/data/routing.xml --- viking-1.6.2/data/routing.xml 1970-01-01 00:00:00.000000000 +0000 +++ viking-1.7/data/routing.xml 2018-12-23 10:48:06.000000000 +0000 @@ -0,0 +1,28 @@ + + + yourscar + Yours: Car + kml + http://www.yournavigation.org/api/1.0/gosmore.php?format=kml + &flat=%s&flon=%s + &tlat=%s&tlon=%s&v=car&fast=1&layer=mapnik + + + yoursbikefoot + Yours: Bicycle/Foot + kml + http://www.yournavigation.org/api/1.0/gosmore.php?format=kml + &flat=%s&flon=%s + &tlat=%s&tlon=%s&v=bicycle&fast=1&layer=mapnik + + + brouter + brouter + gpx + http://h2096617.stratoserver.net:443/brouter?nogos=&profile=hiking-beta&alternativeidx=0&format=gpx + &lonlats=%s,%s + |%s,%s + + FALSE + + diff -Nru viking-1.6.2/debian/changelog viking-1.7/debian/changelog --- viking-1.6.2/debian/changelog 2018-10-28 01:24:18.000000000 +0000 +++ viking-1.7/debian/changelog 2019-02-02 17:33:20.000000000 +0000 @@ -1,3 +1,17 @@ +viking (1.7-1) unstable; urgency=medium + + * [52e02dc1] New upstream version 1.7 + * [271f7f44] Refreshing patches. + * [72021c78] Add .gitlab-ci.yml + * [65f08de8] snapshot changelog + * [daf9b299] Don't build doc files. + (refreshed version of old patch) + * [8ec9f18e] Add libgeoclue-2-dev as build-dep. + * [9ee585c6] Add liboauth-dev as build-dep + * [573f1f9a] Build-depend on nettle-dev. + + -- Bernd Zeimetz Sat, 02 Feb 2019 18:33:20 +0100 + viking (1.6.2-3.2) unstable; urgency=medium * Non-maintainer upload diff -Nru viking-1.6.2/debian/control viking-1.7/debian/control --- viking-1.6.2/debian/control 2018-10-28 01:24:18.000000000 +0000 +++ viking-1.7/debian/control 2019-02-02 17:33:20.000000000 +0000 @@ -21,6 +21,9 @@ gnome-common, libsqlite3-dev, libmapnik-dev [!mips !mips64el !mipsel !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !powerpcspe !sh4 !x32 !alpha], + libgeoclue-2-dev, + liboauth-dev, + nettle-dev Standards-Version: 3.8.4 Homepage: http://viking.sf.net Vcs-Git: https://salsa.debian.org/debian/viking.git diff -Nru viking-1.6.2/debian/.gitlab-ci.yml viking-1.7/debian/.gitlab-ci.yml --- viking-1.6.2/debian/.gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ viking-1.7/debian/.gitlab-ci.yml 2019-02-02 17:33:20.000000000 +0000 @@ -0,0 +1,11 @@ +image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest + +pages: + stage: deploy + artifacts: + paths: + - public + script: + - gitlab-ci-git-buildpackage + - gitlab-ci-lintian + - gitlab-ci-aptly diff -Nru viking-1.6.2/debian/patches/0001-disable-po-check.patch viking-1.7/debian/patches/0001-disable-po-check.patch --- viking-1.6.2/debian/patches/0001-disable-po-check.patch 2018-10-28 01:24:18.000000000 +0000 +++ viking-1.7/debian/patches/0001-disable-po-check.patch 2019-02-02 17:33:20.000000000 +0000 @@ -6,12 +6,10 @@ po/Makefile.in.in | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -diff --git a/po/Makefile.in.in b/po/Makefile.in.in -index 06a8cfe..ece39a4 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in -@@ -146,12 +146,8 @@ uninstall: - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ +@@ -145,12 +145,8 @@ uninstall: + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done -check: all $(GETTEXT_PACKAGE).pot diff -Nru viking-1.6.2/debian/patches/0003-Add-missing-lz.patch viking-1.7/debian/patches/0003-Add-missing-lz.patch --- viking-1.6.2/debian/patches/0003-Add-missing-lz.patch 2018-10-28 01:24:18.000000000 +0000 +++ viking-1.7/debian/patches/0003-Add-missing-lz.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -From: Bernd Zeimetz -Date: Wed, 3 Nov 2010 21:10:03 +0100 -Subject: [PATCH] Add missing -lz. - ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 049cf40..110aa8a 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -218,7 +218,7 @@ endif - - viking_SOURCES = main.c - --LDADD = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a -+LDADD = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a -lz - if WINDOWS - LDADD += \ - ../win32/installer/pixmaps/viking_icon.o diff -Nru viking-1.6.2/debian/patches/build-without-scrollkeeper.patch viking-1.7/debian/patches/build-without-scrollkeeper.patch --- viking-1.6.2/debian/patches/build-without-scrollkeeper.patch 2018-10-28 01:24:18.000000000 +0000 +++ viking-1.7/debian/patches/build-without-scrollkeeper.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -From: Jeremy Bicha -Date: Sun, 21 Oct 2018 17:01:53 -0400 -Subject: build without scrollkeeper - ---- - configure.ac | 3 +-- - help/viking.omf.in | 10 ---------- - 2 files changed, 1 insertion(+), 12 deletions(-) - delete mode 100644 help/viking.omf.in - -diff --git a/configure.ac b/configure.ac -index fee2b74..80c0201 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -401,8 +401,7 @@ DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl - AC_SUBST(DB2MAN_XSL) - AC_PATH_PROG(XP,xsltproc) - AM_CONDITIONAL([HAVE_XSLTPROC],[test "x$XP" != "x"]) --AC_CHECK_PROG([HAVE_SCROLLKEEPER],scrollkeeper-config,"yes") --AM_CONDITIONAL([GEN_MANPAGES],[test "x$XP" != "x" && test -r "$DB2MAN_XSL"] && test "${HAVE_SCROLLKEEPER}" == "yes" ) -+AM_CONDITIONAL([GEN_MANPAGES],[test "x$XP" != "x" && test -r "$DB2MAN_XSL"]) - - ISODATE=`date +%Y-%m-%d` - AC_SUBST(ISODATE) -diff --git a/help/viking.omf.in b/help/viking.omf.in -deleted file mode 100644 -index 745d1e5..0000000 ---- a/help/viking.omf.in -+++ /dev/null -@@ -1,10 +0,0 @@ -- -- -- -- -- manual -- -- -- -- -- diff -Nru viking-1.6.2/debian/patches/fix_build_on_hurd viking-1.7/debian/patches/fix_build_on_hurd --- viking-1.6.2/debian/patches/fix_build_on_hurd 2018-10-28 01:24:18.000000000 +0000 +++ viking-1.7/debian/patches/fix_build_on_hurd 2019-02-02 17:33:20.000000000 +0000 @@ -6,8 +6,6 @@ src/metatile.h | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/src/metatile.h b/src/metatile.h -index 0206133..50d5b0c 100644 --- a/src/metatile.h +++ b/src/metatile.h @@ -26,3 +26,7 @@ diff -Nru viking-1.6.2/debian/patches/no-doc-dir viking-1.7/debian/patches/no-doc-dir --- viking-1.6.2/debian/patches/no-doc-dir 1970-01-01 00:00:00.000000000 +0000 +++ viking-1.7/debian/patches/no-doc-dir 2019-02-02 17:33:20.000000000 +0000 @@ -0,0 +1,35 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = src test data po windows help tools doc ++SUBDIRS = src test data po windows help tools + + INTLTOOL = \ + intltool-extract.in \ +--- a/configure.ac ++++ b/configure.ac +@@ -11,13 +11,6 @@ AM_INIT_AUTOMAKE([dist-bzip2 dist-zip su + dnl AC_CONFIG_SRCDIR([src/main.c]) + AC_CONFIG_HEADERS([src/config.h]) + +-# check for gtk-doc +-m4_ifdef([GTK_DOC_CHECK], [ +-GTK_DOC_CHECK([1.0],[--flavour no-tmpl]) +-],[ +-AM_CONDITIONAL([ENABLE_GTK_DOC], false) +-]) +- + AC_PROG_CC + AC_PROG_CC_STDC + # Checks for programs. +@@ -594,9 +587,7 @@ AC_CONFIG_FILES([ + windows/installer/Makefile + windows/installer/pixmaps/Makefile + windows/installer/translations/Makefile +- doc/Makefile +- doc/reference/Makefile +- doc/examples/Makefile]) ++ ]) + + AC_OUTPUT + diff -Nru viking-1.6.2/debian/patches/no_doc-dir.patch viking-1.7/debian/patches/no_doc-dir.patch --- viking-1.6.2/debian/patches/no_doc-dir.patch 2018-10-28 01:24:18.000000000 +0000 +++ viking-1.7/debian/patches/no_doc-dir.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -From: Hideki Yamane -Date: Wed, 23 Oct 2013 22:14:47 +0900 -Subject: don't try to process doc sub directory - - - remove declaration of Makefile inside doc subtree - - GTK_DOC_CHECK cause parse error - -Forwarded: no -Last-Update: 2015-08-30 ---- - Makefile.am | 2 +- - configure.ac | 8 +------- - 2 files changed, 2 insertions(+), 8 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 6882a89..fd7cee1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = src test data po win32 help tools doc -+SUBDIRS = src test data po win32 help tools - - INTLTOOL = \ - intltool-extract.in \ -diff --git a/configure.ac b/configure.ac -index c807559..fee2b74 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8,11 +8,7 @@ dnl AC_CONFIG_SRCDIR([src/main.c]) - AC_CONFIG_HEADERS([src/config.h]) - - # check for gtk-doc --m4_ifdef([GTK_DOC_CHECK], [ --GTK_DOC_CHECK([1.0],[--flavour no-tmpl]) --],[ - AM_CONDITIONAL([ENABLE_GTK_DOC], false) --]) - - AC_PROG_CC - AC_PROG_CC_STDC -@@ -428,9 +424,7 @@ AC_CONFIG_FILES([ - win32/installer/Makefile - win32/installer/pixmaps/Makefile - win32/installer/translations/Makefile -- doc/Makefile -- doc/reference/Makefile -- doc/examples/Makefile]) -+ ]) - - AC_OUTPUT([ - viking.spec diff -Nru viking-1.6.2/debian/patches/series viking-1.7/debian/patches/series --- viking-1.6.2/debian/patches/series 2018-10-28 01:24:18.000000000 +0000 +++ viking-1.7/debian/patches/series 2019-02-02 17:33:20.000000000 +0000 @@ -1,6 +1,3 @@ 0001-disable-po-check.patch -0003-Add-missing-lz.patch -no_doc-dir.patch -#fix-IT_PROG_INTLTOOL-and-AM_GNU_GETTEXT-conflict.patch fix_build_on_hurd -build-without-scrollkeeper.patch +no-doc-dir diff -Nru viking-1.6.2/depcomp viking-1.7/depcomp --- viking-1.6.2/depcomp 2015-12-21 12:13:18.000000000 +0000 +++ viking-1.7/depcomp 2019-01-19 18:39:43.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -783,9 +783,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru viking-1.6.2/doc/examples/Makefile.in viking-1.7/doc/examples/Makefile.in --- viking-1.6.2/doc/examples/Makefile.in 2015-12-21 12:13:18.000000000 +0000 +++ viking-1.7/doc/examples/Makefile.in 2019-01-21 20:16:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -87,6 +87,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ subdir = doc/examples ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/expat.m4 \ @@ -197,10 +198,14 @@ LDFLAGS = @LDFLAGS@ LIBCURL = @LIBCURL@ LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ +LIBGEOCLUE_CFLAGS = @LIBGEOCLUE_CFLAGS@ +LIBGEOCLUE_LIBS = @LIBGEOCLUE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBZIP_CFLAGS = @LIBZIP_CFLAGS@ +LIBZIP_LIBS = @LIBZIP_LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -229,7 +234,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ -POW_LIB = @POW_LIB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ @@ -293,7 +297,11 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +target = @target@ target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -318,8 +326,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -337,7 +345,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru viking-1.6.2/doc/examples/maps.xml viking-1.7/doc/examples/maps.xml --- viking-1.6.2/doc/examples/maps.xml 2015-11-10 21:01:35.000000000 +0000 +++ viking-1.7/doc/examples/maps.xml 2018-12-23 10:48:06.000000000 +0000 @@ -65,4 +65,17 @@ -5.8 1.9 + + + + 193 + OSMANDHD + OSMAND HD + https://tile.osmand.net/hd/%d/%d/%d.png + 2 + © OpenStreetMap contributors + CC-BY-SA + http://www.openstreetmap.org/copyright + + diff -Nru viking-1.6.2/doc/Makefile.in viking-1.7/doc/Makefile.in --- viking-1.6.2/doc/Makefile.in 2015-12-21 12:13:18.000000000 +0000 +++ viking-1.7/doc/Makefile.in 2019-01-21 20:16:50.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -87,6 +87,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +target_triplet = @target@ subdir = doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/expat.m4 \ @@ -137,7 +138,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -257,10 +258,14 @@ LDFLAGS = @LDFLAGS@ LIBCURL = @LIBCURL@ LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ +LIBGEOCLUE_CFLAGS = @LIBGEOCLUE_CFLAGS@ +LIBGEOCLUE_LIBS = @LIBGEOCLUE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBZIP_CFLAGS = @LIBZIP_CFLAGS@ +LIBZIP_LIBS = @LIBZIP_LIBS@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -289,7 +294,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ -POW_LIB = @POW_LIB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ @@ -353,7 +357,11 @@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +target = @target@ target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -380,8 +388,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -492,7 +500,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru viking-1.6.2/doc/reference/html/api-index-full.html viking-1.7/doc/reference/html/api-index-full.html --- viking-1.6.2/doc/reference/html/api-index-full.html 2015-12-21 12:13:48.000000000 +0000 +++ viking-1.7/doc/reference/html/api-index-full.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,6255 +0,0 @@ - - - - -API Index: viking Reference Manual - - - - - - - - - - - - - - - - -
-

-API Index

-

A

-
-acq_dialog_widgets_t, struct in VikDataSource -
-
-
-acq_vik_t, struct in VikDataSource -
-
-
-addtr_18_pixbuf, variable in icons -
-
-
-addwp_18_pixbuf, variable in icons -
-
-
-vikaggregatelayer_pixbuf, variable in vikaggregatelayer_pixmap -
-
-
-vik_aggregate_layer_add_layer, function in VikAggregateLayer -
-
-
-vik_aggregate_layer_clear, function in VikAggregateLayer -
-
-
-vik_aggregate_layer_create, function in VikAggregateLayer -
-
-
-vik_aggregate_layer_delete, function in VikAggregateLayer -
-
-
-vik_aggregate_layer_draw, function in VikAggregateLayer -
-
-
-vik_aggregate_layer_free, function in VikAggregateLayer -
-
-
-vik_aggregate_layer_get_all_layers_of_type, function in VikAggregateLayer -
-
-
-vik_aggregate_layer_get_children, function in VikAggregateLayer -
-
-
-vik_aggregate_layer_get_top_visible_layer_of_type, function in VikAggregateLayer -
-
-
-vik_aggregate_layer_insert_layer, function in VikAggregateLayer -
-
-
-vik_aggregate_layer_is_empty, function in VikAggregateLayer -
-
-
-vik_aggregate_layer_load_layers, function in VikAggregateLayer -
-
-
-vik_aggregate_layer_move_layer, function in VikAggregateLayer -
-
-
-vik_aggregate_layer_new, function in VikAggregateLayer -
-
-
-vik_aggregate_layer_realize, function in VikAggregateLayer -
-
-
-VIK_AGGREGATE_LAYER_TYPE, macro in VikAggregateLayer -
-
-
-ALTI_TO_MPP, macro in globals -
-
-
-append_file_ext, function in file -
-
-
-atof_i8n, function in strtod -
-
-
-a_acquire, function in VikDataSource -
-
-
-a_acquire_set_filter_track, function in VikDataSource -
-
-
-a_acquire_track_menu, function in VikDataSource -
-
-
-a_acquire_trwlayer_menu, function in VikDataSource -
-
-
-a_acquire_trwlayer_track_menu, function in VikDataSource -
-
-
-a_babel_available, function in babel -
-
-
-a_babel_convert_from, function in babel -
-
-
-a_babel_convert_to, function in babel -
-
-
-a_babel_foreach_file_read_any, function in babel -
-
-
-a_babel_foreach_file_with_mode, function in babel -
-
-
-a_babel_init, function in babel -
-
-
-a_babel_post_init, function in babel -
-
-
-a_babel_ui_file_type_selector_destroy, function in babel_ui -
-
-
-a_babel_ui_file_type_selector_get, function in babel_ui -
-
-
-a_babel_ui_file_type_selector_new, function in babel_ui -
-
-
-a_babel_ui_modes_get, function in babel_ui -
-
-
-a_babel_ui_modes_new, function in babel_ui -
-
-
-a_babel_ui_type_selector_dialog_sensitivity_cb, function in babel_ui -
-
-
-a_babel_uninit, function in babel -
-
-
-a_background_add_window, function in background -
-
-
-a_background_init, function in background -
-
-
-a_background_post_init, function in background -
-
-
-a_background_remove_window, function in background -
-
-
-a_background_show_window, function in background -
-
-
-a_background_testcancel, function in background -
-
-
-a_background_thread, function in background -
-
-
-a_background_thread_progress, function in background -
-
-
-a_background_uninit, function in background -
-
-
-a_check_html_file, function in download -
-
-
-a_check_kml_file, function in download -
-
-
-a_check_map_file, function in download -
-
-
-a_clipboard_copy, function in clipboard -
-
-
-a_clipboard_copy_selected, function in clipboard -
-
-
-a_clipboard_paste, function in clipboard -
-
-
-a_clipboard_type, function in clipboard -
-
-
-a_coords_dtostr, function in coords -
-
-
-a_coords_latlon_diff, function in coords -
-
-
-a_coords_latlon_to_string, function in coords -
-
-
-a_coords_latlon_to_utm, function in coords -
-
-
-a_coords_utm_diff, function in coords -
-
-
-a_coords_utm_equal, function in coords -
-
-
-a_coords_utm_to_latlon, function in coords -
-
-
-a_datasource_gc_init, function in datasources -
-
-
-a_dems_get, function in dems -
-
-
-a_dems_get_elev_by_coord, function in dems -
-
-
-a_dems_list_copy, function in dems -
-
-
-a_dems_list_free, function in dems -
-
-
-a_dems_list_get_elev_by_coord, function in dems -
-
-
-a_dems_load, function in dems -
-
-
-a_dems_load_list, function in dems -
-
-
-a_dems_uninit, function in dems -
-
-
-a_dems_unref, function in dems -
-
-
-a_dialog_about, function in dialog -
-
-
-a_dialog_choose_dir, function in dialog -
-
-
-a_dialog_create_label_vbox, function in dialog -
-
-
-a_dialog_custom_zoom, function in dialog -
-
-
-a_dialog_error_msg, macro in dialog -
-
-
-a_dialog_error_msg_extra, macro in dialog -
-
-
-a_dialog_get_date, function in dialog -
-
-
-a_dialog_get_positive_number, function in dialog -
-
-
-a_dialog_goto_latlon, function in dialog -
-
-
-a_dialog_goto_utm, function in dialog -
-
-
-a_dialog_info_msg, macro in dialog -
-
-
-a_dialog_info_msg_extra, macro in dialog -
-
-
-a_dialog_license, function in dialog -
-
-
-a_dialog_list, function in dialog -
-
-
-a_dialog_map_n_zoom, function in dialog -
-
-
-a_dialog_msg, function in dialog -
-
-
-a_dialog_new_track, function in dialog -
-
-
-a_dialog_response_accept, function in dialog -
-
-
-a_dialog_select_from_list, function in dialog -
-
-
-a_dialog_time_threshold, function in dialog -
-
-
-a_dialog_warning_msg, macro in dialog -
-
-
-a_dialog_waypoint, function in viktrwlayer_wpwin -
-
-
-a_dialog_yes_or_no, function in dialog -
-
-
-a_download_handle_cleanup, function in download -
-
-
-a_download_handle_init, function in download -
-
-
-a_download_init, function in download -
-
-
-a_download_uninit, function in download -
-
-
-a_download_uri_to_tmp_file, function in download -
-
-
-a_file_basename, function in fileutils -
-
-
-a_file_check_ext, function in file -
-
-
-a_file_export, function in file -
-
-
-a_file_export_babel, function in file -
-
-
-a_file_load, function in file -
-
-
-a_file_save, function in file -
-
-
-a_ftp_download_get_url, function in download -
-
-
-a_geojson_import_to_gpx, function in geojson -
-
-
-a_geojson_program_export, function in geojson -
-
-
-a_geojson_program_import, function in geojson -
-
-
-a_geojson_write_file, function in geojson -
-
-
-a_geonames_wikipedia_box, function in geonamessearch -
-
-
-a_geotag_create_waypoint_from_file, function in geotag_exif -
-
-
-a_geotag_get_exif_date_from_file, function in geotag_exif -
-
-
-a_geotag_get_position, function in geotag_exif -
-
-
-a_geotag_waypoint_positioned, function in geotag_exif -
-
-
-a_geotag_write_exif_gps, function in geotag_exif -
-
-
-a_get_hashed_sym, function in garminsymbols -
-
-
-a_get_viking_data_home, function in dir -
-
-
-a_get_viking_data_path, function in dir -
-
-
-a_get_viking_dir, function in dir -
-
-
-a_get_viking_dir_no_create, function in dir -
-
-
-a_get_wp_sym, function in garminsymbols -
-
-
-a_gpsmapper_write_file, function in gpsmapper -
-
-
-a_gpspoint_read_file, function in gpspoint -
-
-
-a_gpspoint_write_file, function in gpspoint -
-
-
-a_gpx_read_file, function in gpx -
-
-
-a_gpx_write_file, function in gpx -
-
-
-a_gpx_write_tmp_file, function in gpx -
-
-
-a_gpx_write_track_file, function in gpx -
-
-
-a_gpx_write_track_tmp_file, function in gpx -
-
-
-a_http_download_get_url, function in download -
-
-
-a_jpg_load_file, function in jpg -
-
-
-a_jpg_magic_check, function in jpg -
-
-
-a_layer_defaults_get, function in viklayer_defaults -
-
-
-a_layer_defaults_init, function in viklayer_defaults -
-
-
-a_layer_defaults_register, function in viklayer_defaults -
-
-
-a_layer_defaults_save, function in viklayer_defaults -
-
-
-a_layer_defaults_show_window, function in viklayer_defaults -
-
-
-a_layer_defaults_uninit, function in viklayer_defaults -
-
-
-a_mapcache_add, function in mapcache -
-
-
-a_mapcache_flush, function in mapcache -
-
-
-a_mapcache_flush_type, function in mapcache -
-
-
-a_mapcache_get, function in mapcache -
-
-
-a_mapcache_get_count, function in mapcache -
-
-
-a_mapcache_get_extra, function in mapcache -
-
-
-a_mapcache_get_size, function in mapcache -
-
-
-a_mapcache_init, function in mapcache -
-
-
-a_mapcache_remove_all_shrinkfactors, function in mapcache -
-
-
-a_mapcache_uninit, function in mapcache -
-
-
-a_populate_sym_list, function in garminsymbols -
-
-
-a_preferences_get, function in preferences -
-
-
-a_preferences_init, function in preferences -
-
-
-a_preferences_register, function in preferences -
-
-
-a_preferences_register_group, function in preferences -
-
-
-a_preferences_run_setparam, function in preferences -
-
-
-a_preferences_save_to_file, function in preferences -
-
-
-a_preferences_show_window, function in preferences -
-
-
-a_preferences_uninit, function in preferences -
-
-
-a_print, function in print -
-
-
-a_settings_get_boolean, function in settings -
-
-
-a_settings_get_double, function in settings -
-
-
-a_settings_get_integer, function in settings -
-
-
-a_settings_get_integer_list_contains, function in settings -
-
-
-a_settings_get_string, function in settings -
-
-
-a_settings_init, function in settings -
-
-
-a_settings_set_boolean, function in settings -
-
-
-a_settings_set_double, function in settings -
-
-
-a_settings_set_integer, function in settings -
-
-
-a_settings_set_integer_list_containing, function in settings -
-
-
-a_settings_set_string, function in settings -
-
-
-a_settings_uninit, function in settings -
-
-
-a_thumbnails_create, function in thumbnails -
-
-
-a_thumbnails_exists, function in thumbnails -
-
-
-a_thumbnails_get, function in thumbnails -
-
-
-a_thumbnails_get_default, function in thumbnails -
-
-
-a_thumbnails_scale_pixbuf, function in thumbnails -
-
-
-a_toolbar_init, function in toolbar -
-
-
-a_toolbar_uninit, function in toolbar -
-
-
-a_try_decompress_file, function in download -
-
-
-a_uibuilder_free_paramdatas, function in uibuilder -
-
-
-a_uibuilder_new_widget, function in uibuilder -
-
-
-a_uibuilder_properties_factory, function in uibuilder -
-
-
-a_uibuilder_run_dialog, function in uibuilder -
-
-
-a_uibuilder_widget_get_value, function in uibuilder -
-
-
-a_viewport_clip_line, function in VikViewport -
-
-
-a_vik_get_add_default_map_layer, function in globals -
-
-
-a_vik_get_ask_for_create_track_name, function in globals -
-
-
-a_vik_get_check_version, function in globals -
-
-
-a_vik_get_create_track_tooltip, function in globals -
-
-
-a_vik_get_default_lat, function in globals -
-
-
-a_vik_get_default_long, function in globals -
-
-
-a_vik_get_degree_format, function in globals -
-
-
-a_vik_get_external_gpx_program_1, function in globals -
-
-
-a_vik_get_external_gpx_program_2, function in globals -
-
-
-a_vik_get_file_ref_format, function in globals -
-
-
-a_vik_get_gpx_export_trk_sort, function in globals -
-
-
-a_vik_get_image_viewer, function in globals -
-
-
-a_vik_get_kml_export_units, function in globals -
-
-
-a_vik_get_recent_number_files, function in globals -
-
-
-a_vik_get_restore_window_state, function in globals -
-
-
-a_vik_get_startup_file, function in globals -
-
-
-a_vik_get_startup_method, function in globals -
-
-
-a_vik_get_time_ref_frame, function in globals -
-
-
-a_vik_get_units_distance, function in globals -
-
-
-a_vik_get_units_height, function in globals -
-
-
-a_vik_get_units_speed, function in globals -
-
-
-a_vik_get_use_large_waypoint_icons, function in globals -
-
-
-a_vik_goto, function in vikgoto -
-
-
-a_vik_goto_get_search_string_for_this_place, function in vikgoto -
-
-
-a_vik_goto_where_am_i, function in vikgoto -
-
-
-a_vik_gpx_export_wpt_sym_name, function in globals -
-
-
-a_vik_preferences_init, function in globals -
-
-
-a_vik_very_first_run, function in globals -
-
-

B

-
-BabelDevice, struct in babel -
-
-
-BabelFile, struct in babel -
-
-
-BabelMode, struct in babel -
-
-
-BabelProgressCode, enum in babel -
-
-
-BabelStatusFunc, user_function in babel -
-
-
-Background_Pool_Type, enum in background -
-
-
-BBOX_INTERSECT, macro in bbox -
-
-
-begintr_18_pixbuf, variable in begintr_18_pixmap -
-
-
-BingMapSource:api-key, object property in BingMapSource -
-
-
-BingMapSource:hostname, object property in BingMapSource -
-
-
-BingMapSource:url, object property in BingMapSource -
-
-
-bing_init, function in bing -
-
-
-bing_maps_pixbuf, variable in icons -
-
-
-bing_map_source_new_with_id, function in BingMapSource -
-
-
-bluemarble_init, function in bluemarble -
-
-

C

-
-check_file_magic_vik, function in file -
-
-
-clear_garmin_icon_syms, function in garminsymbols -
-
-
-VikClipboardDataType, enum in clipboard -
-
-
-vik_combo_box_text_append, macro in vik_compat -
-
-
-vik_combo_box_text_new, macro in vik_compat -
-
-
-VIK_CONFIG_BING, macro in config -
-
-
-VIK_CONFIG_BLUEMARBLE, macro in config -
-
-
-VIK_CONFIG_DEFAULT_TILE_AGE, macro in config -
-
-
-VIK_CONFIG_GEONAMES, macro in config -
-
-
-VIK_CONFIG_GEOTAG, macro in config -
-
-
-VIK_CONFIG_GOOGLE, macro in config -
-
-
-VIK_CONFIG_MAPCACHE_SIZE, macro in config -
-
-
-VIK_CONFIG_OPENSTREETMAP, macro in config -
-
-
-VIK_CONFIG_REALTIME_GPS_TRACKING, macro in config -
-
-
-convert_dms_to_dec, function in degrees_converters -
-
-
-convert_lat_dec_to_ddd, function in degrees_converters -
-
-
-convert_lat_dec_to_dmm, function in degrees_converters -
-
-
-convert_lat_dec_to_dms, function in degrees_converters -
-
-
-convert_lon_dec_to_ddd, function in degrees_converters -
-
-
-convert_lon_dec_to_dmm, function in degrees_converters -
-
-
-convert_lon_dec_to_dms, function in degrees_converters -
-
-
-VikCoord, struct in vikcoord -
-
-
-vikcoordlayer_pixbuf, variable in vikcoordlayer_pixmap -
-
-
-VikCoordMode, typedef in vikcoord -
-
-
-vik_coord_convert, function in vikcoord -
-
-
-vik_coord_copy_convert, function in vikcoord -
-
-
-vik_coord_diff, function in vikcoord -
-
-
-vik_coord_equals, function in vikcoord -
-
-
-vik_coord_inside, function in vikcoord -
-
-
-VIK_COORD_LATLON, macro in vikcoord -
-
-
-VIK_COORD_LAYER_TYPE, macro in VikCoordLayer -
-
-
-vik_coord_load_from_latlon, function in vikcoord -
-
-
-vik_coord_load_from_utm, function in vikcoord -
-
-
-vik_coord_set_area, function in vikcoord -
-
-
-vik_coord_to_latlon, function in vikcoord -
-
-
-vik_coord_to_utm, function in vikcoord -
-
-
-VIK_COORD_UTM, macro in vikcoord -
-
-
-curl_download_get_url, function in curl_download -
-
-
-curl_download_handle_cleanup, function in curl_download -
-
-
-curl_download_handle_init, function in curl_download -
-
-
-curl_download_init, function in curl_download -
-
-
-curl_download_uninit, function in curl_download -
-
-
-curl_download_uri, function in curl_download -
-
-
-cursor_addtr_pixbuf, variable in icons -
-
-
-cursor_addwp_pixbuf, variable in icons -
-
-
-cursor_begintr_pixbuf, variable in cursor_begintr_pixmap -
-
-
-cursor_demdl_pixbuf, variable in icons -
-
-
-cursor_edtr_pixbuf, variable in icons -
-
-
-cursor_edwp_pixbuf, variable in icons -
-
-
-cursor_geomove_pixbuf, variable in icons -
-
-
-cursor_geozoom_pixbuf, variable in icons -
-
-
-cursor_mapdl_pixbuf, variable in icons -
-
-
-cursor_new_route_pixbuf, variable in icons -
-
-
-cursor_route_finder_pixbuf, variable in icons -
-
-
-cursor_ruler_pixbuf, variable in icons -
-
-
-cursor_showpic_pixbuf, variable in icons -
-
-
-cursor_zoom_pixbuf, variable in icons -
-
-

D

-
-VikDataSourceAddProgressWidgetsFunc, user_function in VikDataSource -
-
-
-VikDataSourceAddSetupWidgetsFunc, user_function in VikDataSource -
-
-
-VikDataSourceCheckExistenceFunc, user_function in VikDataSource -
-
-
-VikDataSourceCleanupFunc, user_function in VikDataSource -
-
-
-VikDataSourceGetProcessOptionsFunc, user_function in VikDataSource -
-
-
-VikDataSourceInitFunc, user_function in VikDataSource -
-
-
-VikDataSourceInterface, struct in VikDataSource -
-
-
-VikDataSourceOffFunc, user_function in VikDataSource -
-
-
-VikDataSourceProcessFunc, user_function in VikDataSource -
-
-
-VikDataSourceProgressFunc, user_function in VikDataSource -
-
-
-vik_datasource_file_interface, variable in datasources -
-
-
-vik_datasource_gc_interface, variable in datasources -
-
-
-vik_datasource_geojson_interface, variable in datasources -
-
-
-vik_datasource_geotag_interface, variable in datasources -
-
-
-datasource_gps_clean_up, function in datasource_gps -
-
-
-datasource_gps_get_descriptor, function in datasource_gps -
-
-
-datasource_gps_get_do_routes, function in datasource_gps -
-
-
-datasource_gps_get_do_tracks, function in datasource_gps -
-
-
-datasource_gps_get_do_waypoints, function in datasource_gps -
-
-
-datasource_gps_get_off, function in datasource_gps -
-
-
-datasource_gps_get_protocol, function in datasource_gps -
-
-
-vik_datasource_gps_interface, variable in datasources -
-
-
-datasource_gps_setup, function in datasource_gps -
-
-
-vik_datasource_inputtype_t, enum in VikDataSource -
-
-
-vik_datasource_mode_t, enum in VikDataSource -
-
-
-vik_datasource_osm_interface, variable in datasources -
-
-
-vik_datasource_osm_my_traces_interface, variable in datasources -
-
-
-vik_datasource_routing_interface, variable in datasources -
-
-
-vik_datasource_url_interface, variable in datasources -
-
-
-vik_datasource_wikipedia_interface, variable in datasources -
-
-
-vik_datetime_edit_dialog, function in vikdatetime_edit_dialog -
-
-
-vik_debug, variable in globals -
-
-
-VIK_DEFAULT_ALTITUDE, macro in globals -
-
-
-VIK_DEFAULT_DOP, macro in globals -
-
-
-DEG2RAD, macro in globals -
-
-
-vik_degree_format_t, enum in globals -
-
-
-VikDEM, struct in dem -
-
-
-VikDEMColumn, struct in dem -
-
-
-demdl_18_pixbuf, variable in icons -
-
-
-DEMERCLAT, macro in globals -
-
-
-VikDemInterpol, enum in dems -
-
-
-vikdemlayer_pixbuf, variable in vikdemlayer_pixmap -
-
-
-vik_dem_east_north_to_xy, function in dem -
-
-
-vik_dem_free, function in dem -
-
-
-vik_dem_get_best_interpol, function in dem -
-
-
-vik_dem_get_east_north, function in dem -
-
-
-vik_dem_get_shepard_interpol, function in dem -
-
-
-vik_dem_get_simple_interpol, function in dem -
-
-
-vik_dem_get_xy, function in dem -
-
-
-VIK_DEM_HORIZ_LL_ARCSECONDS, macro in dem -
-
-
-VIK_DEM_HORIZ_UTM_METERS, macro in dem -
-
-
-VIK_DEM_INVALID_ELEVATION, macro in dem -
-
-
-VIK_DEM_LAYER_TYPE, macro in VikDEMLayer -
-
-
-vik_dem_new_from_file, function in dem -
-
-
-VIK_DEM_VERT_DECIMETERS, macro in dem -
-
-
-VIK_DEM_VERT_METERS, macro in dem -
-
-
-DownloadFileOptions, struct in download -
-
-
-DownloadMapOptions, struct in download -
-
-
-DownloadResult_t, enum in download -
-
-

E

-
-edtr_18_pixbuf, variable in icons -
-
-
-edwp_18_pixbuf, variable in icons -
-
-
-EMPTY, macro in util -
-
-
-ENABLE_NLS, macro in config -
-
-
-expedia_init, function in expedia -
-
-
-VikExtTool:id, object property in VikExtTool -
-
-
-VikExtTool:label, object property in VikExtTool -
-
-
-vik_ext_tools_add_action_items, function in vikexttools -
-
-
-vik_ext_tools_add_menu_items_to_menu, function in vikexttools -
-
-
-vik_ext_tools_register, function in vikexttools -
-
-
-vik_ext_tools_unregister_all, function in vikexttools -
-
-
-vik_ext_tool_datasources_add_menu_items, function in vikexttool_datasources -
-
-
-vik_ext_tool_datasources_add_menu_items_to_menu, function in vikexttool_datasources -
-
-
-vik_ext_tool_datasources_register, function in vikexttool_datasources -
-
-
-vik_ext_tool_datasources_unregister_all, function in vikexttool_datasources -
-
-
-vik_ext_tool_get_label, function in VikExtTool -
-
-
-vik_ext_tool_open, function in VikExtTool -
-
-
-vik_ext_tool_open_at_position, function in VikExtTool -
-
-
-VIK_EXT_TOOL_TYPE, macro in VikExtTool -
-
-

F

-
-VIK_FEET_IN_METER, macro in globals -
-
-
-VIK_FEET_TO_METERS, macro in globals -
-
-
-VikFileContentCheckerFunc, user_function in download -
-
-
-VikFileContentConvertFunc, user_function in download -
-
-
-VikFileEntryFunc, user_function in VikFileEntry -
-
-
-VikFileType_t, enum in file -
-
-
-vik_file_entry_get_filename, function in VikFileEntry -
-
-
-vik_file_entry_new, function in VikFileEntry -
-
-
-vik_file_entry_set_filename, function in VikFileEntry -
-
-
-VIK_FILE_ENTRY_TYPE, macro in VikFileEntry -
-
-
-file_GetRelativeFilename, function in file -
-
-
-vik_file_list_get_files, function in VikFileList -
-
-
-vik_file_list_new, function in VikFileList -
-
-
-vik_file_list_set_files, function in VikFileList -
-
-
-VIK_FILE_LIST_TYPE, macro in VikFileList -
-
-
-file_realpath, function in file -
-
-
-file_realpath_dup, function in file -
-
-
-vik_file_ref_format_t, enum in globals -
-
-
-file_write_layer_param, function in file -
-
-
-foreach_list, macro in util -
-
-
-foreach_slist, macro in util -
-
-
-foreach_str, macro in util -
-
-

G

-
-vik_gc_get_fg_color, function in VikViewport -
-
-
-vik_gc_get_function, function in VikViewport -
-
-
-geomove_18_pixbuf, variable in icons -
-
-
-geonames_init, function in geonames -
-
-
-vikgeoreflayer_pixbuf, variable in vikgeoreflayer_pixmap -
-
-
-vik_georef_layer_init, function in VikGeorefLayer -
-
-
-VIK_GEOREF_LAYER_TYPE, macro in VikGeorefLayer -
-
-
-geozoom_18_pixbuf, variable in icons -
-
-
-GETTEXT_PACKAGE, macro in config -
-
-
-get_wp_sym_small, function in VikTrwLayer -
-
-
-GlibcurlCallback, user_function in glibcurl -
-
-
-glibcurl_add, function in glibcurl -
-
-
-glibcurl_cleanup, function in glibcurl -
-
-
-glibcurl_handle, function in glibcurl -
-
-
-glibcurl_init, function in glibcurl -
-
-
-glibcurl_remove, function in glibcurl -
-
-
-glibcurl_set_callback, function in glibcurl -
-
-
-glibcurl_start, function in glibcurl -
-
-
-VikGobjectBuilder::new-object, object signal in VikGobjectBuilder -
-
-
-vik_gobject_builder_new, function in VikGobjectBuilder -
-
-
-vik_gobject_builder_parse, function in VikGobjectBuilder -
-
-
-google_goto_tool_new, function in GoogleGotoTool -
-
-
-GOOGLE_GOTO_TOOL_TYPE, macro in GoogleGotoTool -
-
-
-google_init, function in google -
-
-
-google_post_init, function in google -
-
-
-VikGotoTool:id, object property in VikGotoTool -
-
-
-VikGotoTool:label, object property in VikGotoTool -
-
-
-VikGotoXmlTool:lat-attr, object property in VikGotoXmlTool -
-
-
-VikGotoXmlTool:lat-path, object property in VikGotoXmlTool -
-
-
-VikGotoXmlTool:lon-attr, object property in VikGotoXmlTool -
-
-
-VikGotoXmlTool:lon-path, object property in VikGotoXmlTool -
-
-
-VikGotoXmlTool:url-format, object property in VikGotoXmlTool -
-
-
-vik_goto_register, function in vikgoto -
-
-
-vik_goto_tool_get_coord, function in VikGotoTool -
-
-
-vik_goto_tool_get_download_options, function in VikGotoTool -
-
-
-vik_goto_tool_get_label, function in VikGotoTool -
-
-
-vik_goto_tool_get_url_format, function in VikGotoTool -
-
-
-vik_goto_tool_parse_file_for_latlon, function in VikGotoTool -
-
-
-VIK_GOTO_TOOL_TYPE, macro in VikGotoTool -
-
-
-vik_goto_unregister_all, function in vikgoto -
-
-
-vik_goto_xml_tool_new, function in VikGotoXmlTool -
-
-
-VIK_GOTO_XML_TOOL_TYPE, macro in VikGotoXmlTool -
-
-
-vikgpslayer_pixbuf, variable in vikgpslayer_pixmap -
-
-
-vik_gps_comm, function in VikGpsLayer -
-
-
-vik_gps_dir, enum in VikGpsLayer -
-
-
-vik_gps_layer_get_a_child, function in VikGpsLayer -
-
-
-vik_gps_layer_get_children, function in VikGpsLayer -
-
-
-vik_gps_layer_is_empty, function in VikGpsLayer -
-
-
-VIK_GPS_LAYER_TYPE, macro in VikGpsLayer -
-
-
-vik_gps_xfer_type, enum in VikGpsLayer -
-
-
-GpxWritingOptions, struct in gpx -
-
-
-vik_gpx_export_trk_sort_t, enum in globals -
-
-
-vik_gpx_export_wpt_sym_name_t, enum in globals -
-
-
-VIK_GTK_WINDOW_FROM_LAYER, macro in globals -
-
-
-VIK_GTK_WINDOW_FROM_WIDGET, macro in globals -
-
-
-VIK_GZ, macro in maputils -
-
-

H

-
-HAVE_BIND_TEXTDOMAIN_CODESET, macro in config -
-
-
-HAVE_BZLIB_H, macro in config -
-
-
-HAVE_DCGETTEXT, macro in config -
-
-
-HAVE_EXPAT_H, macro in config -
-
-
-HAVE_GETTEXT, macro in config -
-
-
-HAVE_INTTYPES_H, macro in config -
-
-
-HAVE_LC_MESSAGES, macro in config -
-
-
-HAVE_LIBBZ2, macro in config -
-
-
-HAVE_LIBCURL, macro in config -
-
-
-HAVE_LIBGEXIV2, macro in config -
-
-
-HAVE_LIBGPS, macro in config -
-
-
-HAVE_LIBICUUC, macro in config -
-
-
-HAVE_LIBM, macro in config -
-
-
-HAVE_LIBMAGIC, macro in config -
-
-
-HAVE_LIBMAPNIK, macro in config -
-
-
-HAVE_LIBSQLITE3, macro in config -
-
-
-HAVE_LIBSTDC__, macro in config -
-
-
-HAVE_LIBX11, macro in config -
-
-
-HAVE_LIBZ, macro in config -
-
-
-HAVE_LOCALE_H, macro in config -
-
-
-HAVE_MAGIC_H, macro in config -
-
-
-HAVE_MALLOC_H, macro in config -
-
-
-HAVE_MATH_H, macro in config -
-
-
-HAVE_MEMORY_H, macro in config -
-
-
-HAVE_MEMSET, macro in config -
-
-
-HAVE_MKDTEMP, macro in config -
-
-
-HAVE_REALPATH, macro in config -
-
-
-HAVE_SQLITE3_H, macro in config -
-
-
-HAVE_STDINT_H, macro in config -
-
-
-HAVE_STDLIB_H, macro in config -
-
-
-HAVE_STRCASECMP, macro in config -
-
-
-HAVE_STRCHR, macro in config -
-
-
-HAVE_STRINGS_H, macro in config -
-
-
-HAVE_STRING_H, macro in config -
-
-
-HAVE_STRNCASECMP, macro in config -
-
-
-HAVE_STRTOL, macro in config -
-
-
-HAVE_STRTOUL, macro in config -
-
-
-HAVE_SYS_PARAM_H, macro in config -
-
-
-HAVE_SYS_STAT_H, macro in config -
-
-
-HAVE_SYS_TYPES_H, macro in config -
-
-
-HAVE_UNISTD_H, macro in config -
-
-
-HAVE_UTIME_H, macro in config -
-
-
-HAVE_VIKING, macro in config -
-
-
-HAVE_X11_XLIB_H, macro in config -
-
-

I

-
-viking_pixbuf, variable in viking_pixmap -
-
-
-VIKING_PREFERENCES_ADVANCED_GROUP_KEY, macro in globals -
-
-
-VIKING_PREFERENCES_ADVANCED_NAMESPACE, macro in globals -
-
-
-VIKING_PREFERENCES_GROUP_KEY, macro in globals -
-
-
-VIKING_PREFERENCES_IO_GROUP_KEY, macro in globals -
-
-
-VIKING_PREFERENCES_IO_NAMESPACE, macro in globals -
-
-
-VIKING_PREFERENCES_NAMESPACE, macro in globals -
-
-
-VIKING_PREFERENCES_STARTUP_GROUP_KEY, macro in globals -
-
-
-VIKING_PREFERENCES_STARTUP_NAMESPACE, macro in globals -
-
-
-VIKING_URL, macro in globals -
-
-
-VIKING_VERSION, macro in globals -
-
-
-VIKING_VERSION_NAME, macro in globals -
-
-
-viking_version_to_number, function in globals -
-
-

J

-
-JPEGContent, union in jpeg-data -
-
-
-JPEGContentAPP1, typedef in jpeg-data -
-
-
-JPEGContentGeneric, struct in jpeg-data -
-
-
-JPEGData, struct in jpeg-data -
-
-
-JPEGDataPrivate, struct in jpeg-data -
-
-
-JPEGSection, struct in jpeg-data -
-
-
-jpeg_data_append_section, function in jpeg-data -
-
-
-jpeg_data_dump, function in jpeg-data -
-
-
-jpeg_data_free, function in jpeg-data -
-
-
-jpeg_data_get_exif_data, function in jpeg-data -
-
-
-jpeg_data_load_data, function in jpeg-data -
-
-
-jpeg_data_load_file, function in jpeg-data -
-
-
-jpeg_data_log, function in jpeg-data -
-
-
-jpeg_data_new, function in jpeg-data -
-
-
-jpeg_data_new_from_data, function in jpeg-data -
-
-
-jpeg_data_new_from_file, function in jpeg-data -
-
-
-jpeg_data_ref, function in jpeg-data -
-
-
-jpeg_data_save_data, function in jpeg-data -
-
-
-jpeg_data_save_file, function in jpeg-data -
-
-
-jpeg_data_set_exif_data, function in jpeg-data -
-
-
-jpeg_data_unref, function in jpeg-data -
-
-
-jpeg_marker_get_description, function in jpeg-marker -
-
-
-jpeg_marker_get_name, function in jpeg-marker -
-
-

K

-
-kdres, struct in kdtree -
-
-
-kdtree, struct in kdtree -
-
-
-kd_clear, function in kdtree -
-
-
-kd_create, function in kdtree -
-
-
-kd_data_destructor, function in kdtree -
-
-
-kd_free, function in kdtree -
-
-
-kd_insert, function in kdtree -
-
-
-kd_insert3, function in kdtree -
-
-
-kd_insert3f, function in kdtree -
-
-
-kd_insertf, function in kdtree -
-
-
-kd_nearest, function in kdtree -
-
-
-kd_nearest3, function in kdtree -
-
-
-kd_nearest3f, function in kdtree -
-
-
-kd_nearestf, function in kdtree -
-
-
-kd_nearest_range, function in kdtree -
-
-
-kd_nearest_range3, function in kdtree -
-
-
-kd_nearest_range3f, function in kdtree -
-
-
-kd_nearest_rangef, function in kdtree -
-
-
-kd_res_end, function in kdtree -
-
-
-kd_res_free, function in kdtree -
-
-
-kd_res_item, function in kdtree -
-
-
-kd_res_item3, function in kdtree -
-
-
-kd_res_item3f, function in kdtree -
-
-
-kd_res_itemf, function in kdtree -
-
-
-kd_res_item_data, function in kdtree -
-
-
-kd_res_next, function in kdtree -
-
-
-kd_res_rewind, function in kdtree -
-
-
-kd_res_size, function in kdtree -
-
-
-vik_kml_export_units_t, enum in globals -
-
-
-VIK_KNOTS_IN_MPS, macro in globals -
-
-
-VIK_KNOTS_TO_MPS, macro in globals -
-
-
-VIK_KPH_IN_MPS, macro in globals -
-
-
-VIK_KPH_TO_MPS, macro in globals -
-
-

L

-
-LatLon, struct in coords -
-
-
-VIK_LATLON, macro in vikcoord -
-
-
-LatLonBBox, struct in bbox -
-
-
-VikLayer::update, object signal in VikLayer -
-
-
-VikLayerConvertFunc, user_function in uibuilder -
-
-
-VikLayerDefaultFunc, user_function in uibuilder -
-
-
-VikLayerFuncAddMenuItems, user_function in VikLayer -
-
-
-VikLayerFuncChangeCoordMode, user_function in VikLayer -
-
-
-VikLayerFuncChangeParam, user_function in VikLayer -
-
-
-VikLayerFuncCopyItem, user_function in VikLayer -
-
-
-VikLayerFuncCreate, user_function in VikLayer -
-
-
-VikLayerFuncCutItem, user_function in VikLayer -
-
-
-VikLayerFuncDeleteItem, user_function in VikLayer -
-
-
-VikLayerFuncDragDropRequest, user_function in VikLayer -
-
-
-VikLayerFuncDraw, user_function in VikLayer -
-
-
-VikLayerFuncFree, user_function in VikLayer -
-
-
-VikLayerFuncFreeCopiedItem, user_function in VikLayer -
-
-
-VikLayerFuncGetMenuItemsSelection, user_function in VikLayer -
-
-
-VikLayerFuncGetParam, user_function in VikLayer -
-
-
-VikLayerFuncGetTimestamp, user_function in VikLayer -
-
-
-VikLayerFuncLayerSelected, user_function in VikLayer -
-
-
-VikLayerFuncLayerTooltip, user_function in VikLayer -
-
-
-VikLayerFuncMarshall, user_function in VikLayer -
-
-
-VikLayerFuncPasteItem, user_function in VikLayer -
-
-
-VikLayerFuncPostRead, user_function in VikLayer -
-
-
-VikLayerFuncProperties, user_function in VikLayer -
-
-
-VikLayerFuncReadFileData, user_function in VikLayer -
-
-
-VikLayerFuncRealize, user_function in VikLayer -
-
-
-VikLayerFuncSelectClick, user_function in VikLayer -
-
-
-VikLayerFuncSelectedViewportMenu, user_function in VikLayer -
-
-
-VikLayerFuncSelectMove, user_function in VikLayer -
-
-
-VikLayerFuncSelectRelease, user_function in VikLayer -
-
-
-VikLayerFuncSetMenuItemsSelection, user_function in VikLayer -
-
-
-VikLayerFuncSetParam, user_function in VikLayer -
-
-
-VikLayerFuncSublayerAddMenuItems, user_function in VikLayer -
-
-
-VikLayerFuncSublayerRenameRequest, user_function in VikLayer -
-
-
-VikLayerFuncSublayerToggleVisible, user_function in VikLayer -
-
-
-VikLayerFuncSublayerTooltip, user_function in VikLayer -
-
-
-VikLayerFuncUnmarshall, user_function in VikLayer -
-
-
-VikLayerFuncWriteFileData, user_function in VikLayer -
-
-
-VikLayerInterface, struct in VikLayer -
-
-
-VikLayerParam, struct in uibuilder -
-
-
-VikLayerParamData, union in uibuilder -
-
-
-VikLayerParamScale, struct in uibuilder -
-
-
-VikLayerParamType, enum in uibuilder -
-
-
-VikLayersPanel::delete-layer, object signal in VikLayersPanel -
-
-
-VikLayersPanel::update, object signal in VikLayersPanel -
-
-
-vik_layers_panel_add_layer, function in VikLayersPanel -
-
-
-vik_layers_panel_change_coord_mode, function in VikLayersPanel -
-
-
-vik_layers_panel_clear, function in VikLayersPanel -
-
-
-vik_layers_panel_copy_selected, function in VikLayersPanel -
-
-
-vik_layers_panel_cut_selected, function in VikLayersPanel -
-
-
-vik_layers_panel_delete_selected, function in VikLayersPanel -
-
-
-vik_layers_panel_draw_all, function in VikLayersPanel -
-
-
-vik_layers_panel_emit_update, function in VikLayersPanel -
-
-
-vik_layers_panel_free, function in VikLayersPanel -
-
-
-vik_layers_panel_get_all_layers_of_type, function in VikLayersPanel -
-
-
-vik_layers_panel_get_layer_of_type, function in VikLayersPanel -
-
-
-vik_layers_panel_get_selected, function in VikLayersPanel -
-
-
-vik_layers_panel_get_top_layer, function in VikLayersPanel -
-
-
-vik_layers_panel_get_treeview, function in VikLayersPanel -
-
-
-vik_layers_panel_get_viewport, function in VikLayersPanel -
-
-
-vik_layers_panel_new, function in VikLayersPanel -
-
-
-vik_layers_panel_new_layer, function in VikLayersPanel -
-
-
-vik_layers_panel_paste_selected, function in VikLayersPanel -
-
-
-vik_layers_panel_properties, function in VikLayersPanel -
-
-
-vik_layers_panel_set_viewport, function in VikLayersPanel -
-
-
-VIK_LAYERS_PANEL_TYPE, macro in VikLayersPanel -
-
-
-VikLayerToolFuncStatus, enum in VikLayer -
-
-
-VikLayerTypedParamData, struct in VikLayer -
-
-
-VikLayerTypeEnum, enum in uibuilder -
-
-
-VikLayerWidgetType, enum in uibuilder -
-
-
-vik_layer_add_menu_items, function in VikLayer -
-
-
-vik_layer_change_coord_mode, function in VikLayer -
-
-
-vik_layer_copy, function in VikLayer -
-
-
-vik_layer_create, function in VikLayer -
-
-
-vik_layer_data_typed_param_copy_from_string, function in VikLayer -
-
-
-vik_layer_draw, function in VikLayer -
-
-
-vik_layer_emit_update, function in VikLayer -
-
-
-vik_layer_emit_update_although_invisible, function in VikLayer -
-
-
-vik_layer_emit_update_secondary, function in VikLayer -
-
-
-vik_layer_get_and_reset_trigger, function in VikLayer -
-
-
-vik_layer_get_interface, function in VikLayer -
-
-
-vik_layer_get_menu_items_selection, function in VikLayer -
-
-
-vik_layer_get_name, function in VikLayer -
-
-
-vik_layer_get_timestamp, function in VikLayer -
-
-
-vik_layer_layer_tooltip, function in VikLayer -
-
-
-vik_layer_load_icon, function in VikLayer -
-
-
-vik_layer_marshall, function in VikLayer -
-
-
-vik_layer_marshall_params, function in VikLayer -
-
-
-vik_layer_post_read, function in VikLayer -
-
-
-vik_layer_properties, function in VikLayer -
-
-
-vik_layer_realize, function in VikLayer -
-
-
-vik_layer_rename, function in VikLayer -
-
-
-vik_layer_rename_no_copy, function in VikLayer -
-
-
-vik_layer_selected, function in VikLayer -
-
-
-vik_layer_set_defaults, function in VikLayer -
-
-
-vik_layer_set_menu_items_selection, function in VikLayer -
-
-
-vik_layer_set_param, function in VikLayer -
-
-
-vik_layer_set_type, function in VikLayer -
-
-
-vik_layer_sort_order_t, enum in uibuilder -
-
-
-vik_layer_sublayer_add_menu_items, function in VikLayer -
-
-
-vik_layer_sublayer_rename_request, function in VikLayer -
-
-
-vik_layer_sublayer_toggle_visible, function in VikLayer -
-
-
-vik_layer_sublayer_tooltip, function in VikLayer -
-
-
-VIK_LAYER_TYPE, macro in VikLayer -
-
-
-vik_layer_typed_param_data_copy_from_data, function in VikLayer -
-
-
-vik_layer_typed_param_data_free, function in VikLayer -
-
-
-vik_layer_type_from_string, function in VikLayer -
-
-
-vik_layer_unmarshall, function in VikLayer -
-
-
-vik_layer_unmarshall_params, function in VikLayer -
-
-
-LIBCURL_FEATURE_ASYNCHDNS, macro in config -
-
-
-LIBCURL_FEATURE_IDN, macro in config -
-
-
-LIBCURL_FEATURE_IPV6, macro in config -
-
-
-LIBCURL_FEATURE_LIBZ, macro in config -
-
-
-LIBCURL_FEATURE_NTLM, macro in config -
-
-
-LIBCURL_FEATURE_SSL, macro in config -
-
-
-LIBCURL_PROTOCOL_DICT, macro in config -
-
-
-LIBCURL_PROTOCOL_FILE, macro in config -
-
-
-LIBCURL_PROTOCOL_FTP, macro in config -
-
-
-LIBCURL_PROTOCOL_FTPS, macro in config -
-
-
-LIBCURL_PROTOCOL_HTTP, macro in config -
-
-
-LIBCURL_PROTOCOL_HTTPS, macro in config -
-
-
-LIBCURL_PROTOCOL_LDAP, macro in config -
-
-
-LIBCURL_PROTOCOL_TELNET, macro in config -
-
-
-LIBCURL_PROTOCOL_TFTP, macro in config -
-
-
-VikLoadType_t, enum in file -
-
-
-LOCALEDIR, macro in config -
-
-
-vik_location_t, enum in globals -
-
-
-VIK_LPD_BOOLEAN, macro in uibuilder -
-
-
-VIK_LPD_COLOR, macro in uibuilder -
-
-
-VIK_LPD_DOUBLE, macro in uibuilder -
-
-
-vik_lpd_false_default, function in uibuilder -
-
-
-VIK_LPD_INT, macro in uibuilder -
-
-
-vik_lpd_true_default, function in uibuilder -
-
-
-VIK_LPD_UINT, macro in uibuilder -
-
-
-LSTAT_FOLLOWS_SLASHED_SYMLINK, macro in config -
-
-

M

-
-mapcache_extra_t, struct in mapcache -
-
-
-MapCoord, struct in mapcoord -
-
-
-mapdl_18_pixbuf, variable in mapdl_18_pixmap -
-
-
-MapnikInterface, struct in mapnik_interface -
-
-
-vikmapniklayer_pixbuf, variable in vikmapniklayer_pixmap -
-
-
-mapnik_interface_about, function in mapnik_interface -
-
-
-mapnik_interface_free, function in mapnik_interface -
-
-
-mapnik_interface_get_copyright, function in mapnik_interface -
-
-
-mapnik_interface_get_parameters, function in mapnik_interface -
-
-
-mapnik_interface_initialize, function in mapnik_interface -
-
-
-mapnik_interface_load_map_file, function in mapnik_interface -
-
-
-mapnik_interface_new, function in mapnik_interface -
-
-
-mapnik_interface_render, function in mapnik_interface -
-
-
-vik_mapnik_layer_init, function in vikmapniklayer -
-
-
-vik_mapnik_layer_post_init, function in vikmapniklayer -
-
-
-VIK_MAPNIK_LAYER_TYPE, macro in vikmapniklayer -
-
-
-vik_mapnik_layer_uninit, function in vikmapniklayer -
-
-
-VikMapsCacheLayout, enum in VikMapsLayer -
-
-
-VikMapsLayer_MapType, struct in vikmapslayer_compat -
-
-
-vikmapslayer_pixbuf, variable in vikmapslayer_pixmap -
-
-
-VikMapSourceDefault:copyright, object property in VikMapSourceDefault -
-
-
-VikMapSourceDefault:drawmode, object property in VikMapSourceDefault -
-
-
-VikMapSourceDefault:file-extension, object property in VikMapSourceDefault -
-
-
-VikMapSourceDefault:id, object property in VikMapSourceDefault -
-
-
-VikMapSourceDefault:label, object property in VikMapSourceDefault -
-
-
-VikMapSourceDefault:license, object property in VikMapSourceDefault -
-
-
-VikMapSourceDefault:license-url, object property in VikMapSourceDefault -
-
-
-VikMapSourceDefault:name, object property in VikMapSourceDefault -
-
-
-VikMapSourceDefault:tilesize-x, object property in VikMapSourceDefault -
-
-
-VikMapSourceDefault:tilesize-y, object property in VikMapSourceDefault -
-
-
-maps_layer_default_dir, function in VikMapsLayer -
-
-
-vik_maps_layer_download, function in VikMapsLayer -
-
-
-vik_maps_layer_download_section, function in VikMapsLayer -
-
-
-vik_maps_layer_get_default_map_type, function in VikMapsLayer -
-
-
-vik_maps_layer_get_map_label, function in VikMapsLayer -
-
-
-vik_maps_layer_get_map_type, function in VikMapsLayer -
-
-
-maps_layer_init, function in VikMapsLayer -
-
-
-maps_layer_register_map_source, function in VikMapsLayer -
-
-
-maps_layer_register_type, function in vikmapslayer_compat -
-
-
-maps_layer_set_autodownload_default, function in VikMapsLayer -
-
-
-maps_layer_set_cache_default, function in VikMapsLayer -
-
-
-vik_maps_layer_set_map_type, function in VikMapsLayer -
-
-
-VIK_MAPS_LAYER_TYPE, macro in VikMapsLayer -
-
-
-MAP_ID_BING_AERIAL, macro in map_ids -
-
-
-MAP_ID_BLUE_MARBLE, macro in map_ids -
-
-
-MAP_ID_EXPEDIA, macro in map_ids -
-
-
-MAP_ID_MAPNIK_RENDER, macro in map_ids -
-
-
-MAP_ID_MAPQUEST_OSM, macro in map_ids -
-
-
-MAP_ID_MBTILES, macro in map_ids -
-
-
-MAP_ID_OSM_CYCLE, macro in map_ids -
-
-
-MAP_ID_OSM_HUMANITARIAN, macro in map_ids -
-
-
-MAP_ID_OSM_MAPNIK, macro in map_ids -
-
-
-MAP_ID_OSM_METATILES, macro in map_ids -
-
-
-MAP_ID_OSM_ON_DISK, macro in map_ids -
-
-
-MAP_ID_OSM_TRANSPORT, macro in map_ids -
-
-
-MAP_ID_TERRASERVER_AERIAL, macro in map_ids -
-
-
-MAP_ID_TERRASERVER_TOPO, macro in map_ids -
-
-
-MAP_ID_TERRASERVER_URBAN, macro in map_ids -
-
-
-vik_map_source_coord_to_mapcoord, function in VikMapSource -
-
-
-vik_map_source_default_get_download_options, function in VikMapSourceDefault -
-
-
-vik_map_source_default_get_hostname, function in VikMapSourceDefault -
-
-
-vik_map_source_default_get_uri, function in VikMapSourceDefault -
-
-
-vik_map_source_download, function in VikMapSource -
-
-
-vik_map_source_download_handle_cleanup, function in VikMapSource -
-
-
-vik_map_source_download_handle_init, function in VikMapSource -
-
-
-vik_map_source_get_copyright, function in VikMapSource -
-
-
-vik_map_source_get_drawmode, function in VikMapSource -
-
-
-vik_map_source_get_file_extension, function in VikMapSource -
-
-
-vik_map_source_get_label, function in VikMapSource -
-
-
-vik_map_source_get_lat_max, function in VikMapSource -
-
-
-vik_map_source_get_lat_min, function in VikMapSource -
-
-
-vik_map_source_get_license, function in VikMapSource -
-
-
-vik_map_source_get_license_url, function in VikMapSource -
-
-
-vik_map_source_get_logo, function in VikMapSource -
-
-
-vik_map_source_get_lon_max, function in VikMapSource -
-
-
-vik_map_source_get_lon_min, function in VikMapSource -
-
-
-vik_map_source_get_name, function in VikMapSource -
-
-
-vik_map_source_get_tilesize_x, function in VikMapSource -
-
-
-vik_map_source_get_tilesize_y, function in VikMapSource -
-
-
-vik_map_source_get_uniq_id, function in VikMapSource -
-
-
-vik_map_source_get_zoom_max, function in VikMapSource -
-
-
-vik_map_source_get_zoom_min, function in VikMapSource -
-
-
-vik_map_source_is_direct_file_access, function in VikMapSource -
-
-
-vik_map_source_is_mbtiles, function in VikMapSource -
-
-
-vik_map_source_is_osm_meta_tiles, function in VikMapSource -
-
-
-vik_map_source_mapcoord_to_center_coord, function in VikMapSource -
-
-
-vik_map_source_supports_download_only_new, function in VikMapSource -
-
-
-vik_map_type_new_with_id, function in VikMapType -
-
-
-map_utils_iTMS_to_center_vikcoord, function in maputils -
-
-
-map_utils_iTMS_to_vikcoord, function in maputils -
-
-
-map_utils_mpp_to_scale, function in maputils -
-
-
-map_utils_mpp_to_zoom_level, function in maputils -
-
-
-map_utils_vikcoord_to_iTMS, function in maputils -
-
-
-MERCLAT, macro in globals -
-
-
-METATILE_MAX_SIZE, macro in metatile -
-
-
-metatile_read, function in metatile -
-
-
-VIK_METERS_TO_FEET, macro in globals -
-
-
-VIK_METERS_TO_MILES, macro in globals -
-
-
-VIK_METERS_TO_NAUTICAL_MILES, macro in globals -
-
-
-VIK_MILES_IN_METER, macro in globals -
-
-
-VIK_MILES_TO_METERS, macro in globals -
-
-
-modules_init, function in modules -
-
-
-modules_post_init, function in modules -
-
-
-modules_uninit, function in modules -
-
-
-mover_22_pixbuf, variable in mover_22_pixmap -
-
-
-VIK_MPH_IN_MPS, macro in globals -
-
-
-VIK_MPH_TO_MPS, macro in globals -
-
-
-MPP_TO_ALTI, macro in globals -
-
-
-VIK_MPS_TO_KNOTS, macro in globals -
-
-
-VIK_MPS_TO_KPH, macro in globals -
-
-
-VIK_MPS_TO_MPH, macro in globals -
-
-
-vik_mutex_free, function in vik_compat -
-
-
-vik_mutex_new, function in vik_compat -
-
-

N

-
-VIK_NAUTICAL_MILES_IN_METER, macro in globals -
-
-
-VIK_NAUTICAL_MILES_TO_METERS, macro in globals -
-
-
-new_email, function in ui_util -
-
-
-vik_new_route_18_pixbuf, variable in vik_new_route_18_pixmap -
-
-

O

-
-open_url, function in ui_util -
-
-
-osm_get_login, function in osm-traces -
-
-
-osm_init, function in osm -
-
-
-osm_login_widgets, function in osm-traces -
-
-
-osm_set_login, function in osm-traces -
-
-
-osm_traces_init, function in osm-traces -
-
-
-osm_traces_uninit, function in osm-traces -
-
-
-osm_traces_upload_viktrwlayer, function in osm-traces -
-
-

P

-
-PACKAGE, macro in config -
-
-
-PACKAGE_BUGREPORT, macro in config -
-
-
-PACKAGE_NAME, macro in config -
-
-
-PACKAGE_STRING, macro in config -
-
-
-PACKAGE_TARNAME, macro in config -
-
-
-PACKAGE_URL, macro in config -
-
-
-PACKAGE_VERSION, macro in config -
-
-
-Predicate, user_function in vikrouting -
-
-
-VikPrintPreview::offsets-changed, object signal in VikPrintPreview -
-
-
-vik_print_preview_new, function in VikPrintPreview -
-
-
-vik_print_preview_set_image_dpi, function in VikPrintPreview -
-
-
-vik_print_preview_set_image_offsets, function in VikPrintPreview -
-
-
-vik_print_preview_set_image_offsets_max, function in VikPrintPreview -
-
-
-vik_print_preview_set_page_setup, function in VikPrintPreview -
-
-
-vik_print_preview_set_use_full_page, function in VikPrintPreview -
-
-
-ProcessOptions, struct in babel -
-
-
-PROJECT, macro in globals -
-
-

R

-
-RAD2DEG, macro in globals -
-
-
-vik_radio_group_get_selected, function in VikRadioGroup -
-
-
-vik_radio_group_new, function in VikRadioGroup -
-
-
-vik_radio_group_new_static, function in VikRadioGroup -
-
-
-vik_radio_group_set_selected, function in VikRadioGroup -
-
-
-VIK_RADIO_GROUP_TYPE, macro in VikRadioGroup -
-
-
-route_finder_18_pixbuf, variable in route_finder_18_pixmap -
-
-
-VikRoutingEngine:format, object property in VikRoutingEngine -
-
-
-VikRoutingEngine:id, object property in VikRoutingEngine -
-
-
-VikRoutingEngine:label, object property in VikRoutingEngine -
-
-
-VikRoutingWebEngine:follow-location, object property in VikRoutingWebEngine -
-
-
-VikRoutingWebEngine:referer, object property in VikRoutingWebEngine -
-
-
-VikRoutingWebEngine:url-base, object property in VikRoutingWebEngine -
-
-
-VikRoutingWebEngine:url-start-dir, object property in VikRoutingWebEngine -
-
-
-VikRoutingWebEngine:url-start-ll, object property in VikRoutingWebEngine -
-
-
-VikRoutingWebEngine:url-stop-dir, object property in VikRoutingWebEngine -
-
-
-VikRoutingWebEngine:url-stop-ll, object property in VikRoutingWebEngine -
-
-
-VikRoutingWebEngine:url-via-ll, object property in VikRoutingWebEngine -
-
-
-vik_routing_default_engine, function in vikrouting -
-
-
-vik_routing_default_find, function in vikrouting -
-
-
-vik_routing_engine_find, function in VikRoutingEngine -
-
-
-vik_routing_engine_get_format, function in VikRoutingEngine -
-
-
-vik_routing_engine_get_id, function in VikRoutingEngine -
-
-
-vik_routing_engine_get_label, function in VikRoutingEngine -
-
-
-vik_routing_engine_get_url_from_directions, function in VikRoutingEngine -
-
-
-vik_routing_engine_refine, function in VikRoutingEngine -
-
-
-vik_routing_engine_supports_direction, function in VikRoutingEngine -
-
-
-vik_routing_engine_supports_refine, function in VikRoutingEngine -
-
-
-VIK_ROUTING_ENGINE_TYPE, macro in VikRoutingEngine -
-
-
-vik_routing_foreach_engine, function in vikrouting -
-
-
-vik_routing_prefs_init, function in vikrouting -
-
-
-vik_routing_register, function in vikrouting -
-
-
-vik_routing_ui_selector_get_nth, function in vikrouting -
-
-
-vik_routing_ui_selector_new, function in vikrouting -
-
-
-vik_routing_unregister_all, function in vikrouting -
-
-
-VIK_ROUTING_WEB_ENGINE_TYPE, macro in VikRoutingWebEngine -
-
-
-ruler_18_pixbuf, variable in ruler_18_pixmap -
-
-

S

-
-select_18_pixbuf, variable in select_18_pixmap -
-
-
-showpic_18_pixbuf, variable in showpic_18_pixmap -
-
-
-VikSlippyMapSource:check-file-server-time, object property in VikSlippyMapSource -
-
-
-VikSlippyMapSource:follow-location, object property in VikSlippyMapSource -
-
-
-VikSlippyMapSource:hostname, object property in VikSlippyMapSource -
-
-
-VikSlippyMapSource:is-mbtiles, object property in VikSlippyMapSource -
-
-
-VikSlippyMapSource:is-osm-meta-tiles, object property in VikSlippyMapSource -
-
-
-VikSlippyMapSource:lat-max, object property in VikSlippyMapSource -
-
-
-VikSlippyMapSource:lat-min, object property in VikSlippyMapSource -
-
-
-VikSlippyMapSource:lon-max, object property in VikSlippyMapSource -
-
-
-VikSlippyMapSource:lon-min, object property in VikSlippyMapSource -
-
-
-VikSlippyMapSource:referer, object property in VikSlippyMapSource -
-
-
-VikSlippyMapSource:switch-xy, object property in VikSlippyMapSource -
-
-
-VikSlippyMapSource:url, object property in VikSlippyMapSource -
-
-
-VikSlippyMapSource:use-direct-file-access, object property in VikSlippyMapSource -
-
-
-VikSlippyMapSource:use-etag, object property in VikSlippyMapSource -
-
-
-VikSlippyMapSource:zoom-max, object property in VikSlippyMapSource -
-
-
-VikSlippyMapSource:zoom-min, object property in VikSlippyMapSource -
-
-
-vik_slippy_map_source_new_with_id, function in VikSlippyMapSource -
-
-
-split_string_from_file_on_equals, function in util -
-
-
-vik_startup_method_t, enum in globals -
-
-
-VikStatusbar::clicked, object signal in VikStatusbar -
-
-
-vik_statusbar_new, function in VikStatusbar -
-
-
-vik_statusbar_set_message, function in VikStatusbar -
-
-
-VIK_STATUSBAR_TYPE, macro in VikStatusbar -
-
-
-vik_statusbar_type_t, enum in VikStatusbar -
-
-
-STDC_HEADERS, macro in config -
-
-
-VikStdLayerMenuItem, enum in VikLayer -
-
-
-strtod_i8n, function in strtod -
-
-
-strtof_i8n, function in strtod -
-
-
-strtold_i8n, function in strtod -
-
-
-str_array_to_glist, function in util -
-
-

T

-
-vik_thr_free_func, user_function in background -
-
-
-vik_thr_func, user_function in background -
-
-
-thumbnails_pixbuf, variable in thumbnails_pixmap -
-
-
-vik_time_ref_frame_t, enum in globals -
-
-
-VikTmsMapSource:check-file-server-time, object property in VikTmsMapSource -
-
-
-VikTmsMapSource:follow-location, object property in VikTmsMapSource -
-
-
-VikTmsMapSource:hostname, object property in VikTmsMapSource -
-
-
-VikTmsMapSource:lat-max, object property in VikTmsMapSource -
-
-
-VikTmsMapSource:lat-min, object property in VikTmsMapSource -
-
-
-VikTmsMapSource:lon-max, object property in VikTmsMapSource -
-
-
-VikTmsMapSource:lon-min, object property in VikTmsMapSource -
-
-
-VikTmsMapSource:referer, object property in VikTmsMapSource -
-
-
-VikTmsMapSource:url, object property in VikTmsMapSource -
-
-
-VikTmsMapSource:zoom-max, object property in VikTmsMapSource -
-
-
-VikTmsMapSource:zoom-min, object property in VikTmsMapSource -
-
-
-vik_tms_map_source_new_with_id, function in VikTmsMapSource -
-
-
-VikToolActivationFunc, user_function in VikLayer -
-
-
-toolbar_action_entry_register, function in toolbar -
-
-
-toolbar_action_mode_entry_register, function in toolbar -
-
-
-toolbar_action_set_sensitive, function in toolbar -
-
-
-toolbar_action_toggle_entry_register, function in toolbar -
-
-
-toolbar_action_tool_entry_register, function in toolbar -
-
-
-toolbar_apply_settings, function in toolbar -
-
-
-vik_toolbar_finalize, function in toolbar -
-
-
-toolbar_get_action_by_name, function in toolbar -
-
-
-toolbar_get_widget, function in toolbar -
-
-
-toolbar_get_widget_by_name, function in toolbar -
-
-
-toolbar_init, function in toolbar -
-
-
-vik_toolbar_new, function in toolbar -
-
-
-VIK_TOOLBAR_TYPE, macro in toolbar -
-
-
-VikToolConstructorFunc, user_function in VikLayer -
-
-
-VikToolDestructorFunc, user_function in VikLayer -
-
-
-VikToolInterface, struct in VikLayer -
-
-
-VikToolKeyFunc, user_function in VikLayer -
-
-
-VikToolMouseFunc, user_function in VikLayer -
-
-
-VikToolMouseMoveFunc, user_function in VikLayer -
-
-
-tool_ed_t, struct in VikWindow -
-
-
-VIK_TRACK, macro in viktrack -
-
-
-VikTrack, struct in viktrack -
-
-
-VikTrackDrawnameType, enum in viktrack -
-
-
-VIK_TRACKPOINT, macro in viktrack -
-
-
-VikTrackpoint, struct in viktrack -
-
-
-vik_trackpoint_copy, function in viktrack -
-
-
-vik_trackpoint_free, function in viktrack -
-
-
-vik_trackpoint_new, function in viktrack -
-
-
-vik_trackpoint_set_name, function in viktrack -
-
-
-vik_track_add_trackpoint, function in viktrack -
-
-
-vik_track_anonymize_times, function in viktrack -
-
-
-vik_track_apply_dem_data, function in viktrack -
-
-
-vik_track_apply_dem_data_last_trackpoint, function in viktrack -
-
-
-vik_track_calculate_bounds, function in viktrack -
-
-
-vik_track_clear_property_dialog, function in viktrack -
-
-
-vik_track_compare_timestamp, function in viktrack -
-
-
-vik_track_convert, function in viktrack -
-
-
-vik_track_copy, function in viktrack -
-
-
-vik_track_cut_back_to_double_point, function in viktrack -
-
-
-vik_track_free, function in viktrack -
-
-
-vik_track_get_average_speed, function in viktrack -
-
-
-vik_track_get_average_speed_moving, function in viktrack -
-
-
-vik_track_get_closest_tp_by_percentage_dist, function in viktrack -
-
-
-vik_track_get_closest_tp_by_percentage_time, function in viktrack -
-
-
-vik_track_get_dup_point_count, function in viktrack -
-
-
-vik_track_get_duration, function in viktrack -
-
-
-vik_track_get_length, function in viktrack -
-
-
-vik_track_get_length_including_gaps, function in viktrack -
-
-
-vik_track_get_length_to_trackpoint, function in viktrack -
-
-
-vik_track_get_max_speed, function in viktrack -
-
-
-vik_track_get_minmax_alt, function in viktrack -
-
-
-vik_track_get_same_time_point_count, function in viktrack -
-
-
-vik_track_get_segment_count, function in viktrack -
-
-
-vik_track_get_total_elevation_gain, function in viktrack -
-
-
-vik_track_get_tp_by_dist, function in viktrack -
-
-
-vik_track_get_tp_by_max_alt, function in viktrack -
-
-
-vik_track_get_tp_by_max_speed, function in viktrack -
-
-
-vik_track_get_tp_by_min_alt, function in viktrack -
-
-
-vik_track_get_tp_count, function in viktrack -
-
-
-vik_track_get_tp_first, function in viktrack -
-
-
-vik_track_get_tp_last, function in viktrack -
-
-
-vik_track_get_tp_prev, function in viktrack -
-
-
-vik_track_interpolate_times, function in viktrack -
-
-
-vik_track_make_distance_map, function in viktrack -
-
-
-vik_track_make_elevation_map, function in viktrack -
-
-
-vik_track_make_elevation_time_map, function in viktrack -
-
-
-vik_track_make_gradient_map, function in viktrack -
-
-
-vik_track_make_speed_dist_map, function in viktrack -
-
-
-vik_track_make_speed_map, function in viktrack -
-
-
-vik_track_marshall, function in viktrack -
-
-
-vik_track_merge_segments, function in viktrack -
-
-
-vik_track_new, function in viktrack -
-
-
-vik_track_ref, function in viktrack -
-
-
-vik_track_remove_dup_points, function in viktrack -
-
-
-vik_track_remove_same_time_points, function in viktrack -
-
-
-vik_track_reverse, function in viktrack -
-
-
-vik_track_set_comment, function in viktrack -
-
-
-vik_track_set_comment_no_copy, function in viktrack -
-
-
-vik_track_set_defaults, function in viktrack -
-
-
-vik_track_set_description, function in viktrack -
-
-
-vik_track_set_name, function in viktrack -
-
-
-vik_track_set_property_dialog, function in viktrack -
-
-
-vik_track_smooth_missing_elevation_data, function in viktrack -
-
-
-vik_track_split_into_segments, function in viktrack -
-
-
-vik_track_steal_and_append_trackpoints, function in viktrack -
-
-
-vik_track_to_routepoints, function in viktrack -
-
-
-vik_track_unmarshall, function in viktrack -
-
-
-VikTreeview::item-edited, object signal in VikTreeview -
-
-
-VikTreeview::item-toggled, object signal in VikTreeview -
-
-
-vik_treeview_add_layer, function in VikTreeview -
-
-
-vik_treeview_add_sublayer, function in VikTreeview -
-
-
-vik_treeview_expand, function in VikTreeview -
-
-
-vik_treeview_expand_toplevel, function in VikTreeview -
-
-
-vik_treeview_get_editing, function in VikTreeview -
-
-
-vik_treeview_get_iter_at_pos, function in VikTreeview -
-
-
-vik_treeview_get_iter_from_path_str, function in VikTreeview -
-
-
-vik_treeview_get_iter_with_name, function in VikTreeview -
-
-
-vik_treeview_get_selected_iter, function in VikTreeview -
-
-
-vik_treeview_get_widget, function in VikTreeview -
-
-
-vik_treeview_insert_layer, function in VikTreeview -
-
-
-vik_treeview_item_delete, function in VikTreeview -
-
-
-vik_treeview_item_get_data, function in VikTreeview -
-
-
-vik_treeview_item_get_name, function in VikTreeview -
-
-
-vik_treeview_item_get_parent, function in VikTreeview -
-
-
-vik_treeview_item_get_parent_iter, function in VikTreeview -
-
-
-vik_treeview_item_get_pointer, function in VikTreeview -
-
-
-vik_treeview_item_get_visible_tree, function in VikTreeview -
-
-
-vik_treeview_item_select, function in VikTreeview -
-
-
-vik_treeview_item_set_icon, function in VikTreeview -
-
-
-vik_treeview_item_set_name, function in VikTreeview -
-
-
-vik_treeview_item_set_pointer, function in VikTreeview -
-
-
-vik_treeview_item_set_timestamp, function in VikTreeview -
-
-
-vik_treeview_item_set_visible, function in VikTreeview -
-
-
-vik_treeview_item_toggle_visible, function in VikTreeview -
-
-
-vik_treeview_item_unselect, function in VikTreeview -
-
-
-vik_treeview_move_item, function in VikTreeview -
-
-
-vik_treeview_new, function in VikTreeview -
-
-
-vik_treeview_select_iter, function in VikTreeview -
-
-
-vik_treeview_sort_children, function in VikTreeview -
-
-
-VIK_TREEVIEW_TYPE, macro in VikTreeview -
-
-
-trku_udata, struct in VikTrwLayer -
-
-
-VikTrwlayerAnalyseCloseFunc, user_function in viktrwlayer_analysis -
-
-
-VikTrwlayerGetTracksAndLayersFunc, user_function in VikTrwLayer -
-
-
-VikTrwlayerGetWaypointsAndLayersFunc, user_function in VikTrwLayer -
-
-
-viktrwlayer_pixbuf, variable in viktrwlayer_pixmap -
-
-
-VikTRWMetadata, struct in VikTrwLayer -
-
-
-vik_trw_layer_add_route, function in VikTrwLayer -
-
-
-vik_trw_layer_add_track, function in VikTrwLayer -
-
-
-vik_trw_layer_add_waypoint, function in VikTrwLayer -
-
-
-vik_trw_layer_analyse_this, function in viktrwlayer_analysis -
-
-
-vik_trw_layer_auto_set_view, function in VikTrwLayer -
-
-
-vik_trw_layer_build_track_list_t, function in VikTrwLayer -
-
-
-vik_trw_layer_build_waypoint_list_t, function in VikTrwLayer -
-
-
-trw_layer_calculate_bounds_waypoints, function in VikTrwLayer -
-
-
-trw_layer_cancel_tps_of_track, function in VikTrwLayer -
-
-
-vik_trw_layer_delete_all_routes, function in VikTrwLayer -
-
-
-vik_trw_layer_delete_all_tracks, function in VikTrwLayer -
-
-
-vik_trw_layer_delete_all_waypoints, function in VikTrwLayer -
-
-
-vik_trw_layer_delete_route, function in VikTrwLayer -
-
-
-vik_trw_layer_delete_track, function in VikTrwLayer -
-
-
-trw_layer_dialog_shift, function in VikTrwLayer -
-
-
-vik_trw_layer_draw_highlight, function in VikTrwLayer -
-
-
-vik_trw_layer_draw_highlight_item, function in VikTrwLayer -
-
-
-vik_trw_layer_draw_highlight_items, function in VikTrwLayer -
-
-
-vik_trw_layer_export, function in viktrwlayer_export -
-
-
-vik_trw_layer_export_external_gpx, function in viktrwlayer_export -
-
-
-vik_trw_layer_export_gpsbabel, function in viktrwlayer_export -
-
-
-vik_trw_layer_filein_add_track, function in VikTrwLayer -
-
-
-vik_trw_layer_filein_add_waypoint, function in VikTrwLayer -
-
-
-vik_trw_layer_find_center, function in VikTrwLayer -
-
-
-vik_trw_layer_find_date, function in VikTrwLayer -
-
-
-trw_layer_geotag_dialog, function in viktrwlayer_geotag -
-
-
-vik_trw_layer_get_coord_mode, function in VikTrwLayer -
-
-
-vik_trw_layer_get_metadata, function in VikTrwLayer -
-
-
-vik_trw_layer_get_property_tracks_line_thickness, function in VikTrwLayer -
-
-
-vik_trw_layer_get_routes, function in VikTrwLayer -
-
-
-vik_trw_layer_get_routes_iters, function in VikTrwLayer -
-
-
-vik_trw_layer_get_routes_visibility, function in VikTrwLayer -
-
-
-vik_trw_layer_get_track, function in VikTrwLayer -
-
-
-vik_trw_layer_get_tracks, function in VikTrwLayer -
-
-
-vik_trw_layer_get_tracks_iters, function in VikTrwLayer -
-
-
-vik_trw_layer_get_tracks_visibility, function in VikTrwLayer -
-
-
-vik_trw_layer_get_waypoint, function in VikTrwLayer -
-
-
-vik_trw_layer_get_waypoints, function in VikTrwLayer -
-
-
-vik_trw_layer_get_waypoints_iters, function in VikTrwLayer -
-
-
-vik_trw_layer_get_waypoints_visibility, function in VikTrwLayer -
-
-
-vik_trw_layer_is_empty, function in VikTrwLayer -
-
-
-trw_layer_new_unique_sublayer_name, function in VikTrwLayer -
-
-
-vik_trw_layer_new_waypoint, function in VikTrwLayer -
-
-
-VIK_TRW_LAYER_PROPWIN_DEL_DUP, macro in viktrwlayer_propwin -
-
-
-VIK_TRW_LAYER_PROPWIN_REVERSE, macro in viktrwlayer_propwin -
-
-
-vik_trw_layer_propwin_run, function in viktrwlayer_propwin -
-
-
-VIK_TRW_LAYER_PROPWIN_SPLIT, macro in viktrwlayer_propwin -
-
-
-VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER, macro in viktrwlayer_propwin -
-
-
-vik_trw_layer_propwin_update, function in viktrwlayer_propwin -
-
-
-vik_trw_layer_reset_waypoints, function in VikTrwLayer -
-
-
-vik_trw_layer_set_metadata, function in VikTrwLayer -
-
-
-VIK_TRW_LAYER_TPWIN_BACK, macro in VikTrwLayerTpwin -
-
-
-VIK_TRW_LAYER_TPWIN_CLOSE, macro in VikTrwLayerTpwin -
-
-
-VIK_TRW_LAYER_TPWIN_DATA_CHANGED, macro in VikTrwLayerTpwin -
-
-
-VIK_TRW_LAYER_TPWIN_DELETE, macro in VikTrwLayerTpwin -
-
-
-vik_trw_layer_tpwin_disable_join, function in VikTrwLayerTpwin -
-
-
-VIK_TRW_LAYER_TPWIN_FORWARD, macro in VikTrwLayerTpwin -
-
-
-VIK_TRW_LAYER_TPWIN_INSERT, macro in VikTrwLayerTpwin -
-
-
-vik_trw_layer_tpwin_new, function in VikTrwLayerTpwin -
-
-
-vik_trw_layer_tpwin_set_empty, function in VikTrwLayerTpwin -
-
-
-vik_trw_layer_tpwin_set_tp, function in VikTrwLayerTpwin -
-
-
-vik_trw_layer_tpwin_set_track_name, function in VikTrwLayerTpwin -
-
-
-VIK_TRW_LAYER_TPWIN_SPLIT, macro in VikTrwLayerTpwin -
-
-
-VIK_TRW_LAYER_TPWIN_TYPE, macro in VikTrwLayerTpwin -
-
-
-trw_layer_track_find_uuid, function in VikTrwLayer -
-
-
-vik_trw_layer_track_list_show_dialog, function in viktrwlayer_tracklist -
-
-
-VIK_TRW_LAYER_TYPE, macro in VikTrwLayer -
-
-
-vik_trw_layer_uniquify, function in VikTrwLayer -
-
-
-trw_layer_update_treeview, function in VikTrwLayer -
-
-
-trw_layer_verify_thumbnails, function in VikTrwLayer -
-
-
-trw_layer_waypoint_find_uuid, function in VikTrwLayer -
-
-
-vik_trw_layer_waypoint_list_show_dialog, function in viktrwlayer_waypointlist -
-
-
-trw_layer_waypoint_rename, function in VikTrwLayer -
-
-
-trw_layer_waypoint_reset_icon, function in VikTrwLayer -
-
-
-trw_layer_zoom_to_show_latlons, function in VikTrwLayer -
-
-
-vik_trw_metadata_free, function in VikTrwLayer -
-
-
-vik_trw_metadata_new, function in VikTrwLayer -
-
-
-vik_trw_track_list_t, struct in VikTrwLayer -
-
-
-vik_trw_waypoint_list_t, struct in VikTrwLayer -
-
-

U

-
-ui_add_recent_file, function in ui_util -
-
-
-ui_button_new_with_image, function in ui_util -
-
-
-ui_change_index, enum in uibuilder -
-
-
-ui_change_values, typedef in uibuilder -
-
-
-ui_get_gtk_settings_integer, function in ui_util -
-
-
-ui_label_new_selectable, function in ui_util -
-
-
-ui_lookup_widget, function in ui_util -
-
-
-ui_pixbuf_scale_alpha, function in ui_util -
-
-
-ui_pixbuf_set_alpha, function in ui_util -
-
-
-uncompress_bzip2, function in compression -
-
-
-vik_units_distance_t, enum in globals -
-
-
-vik_units_height_t, enum in globals -
-
-
-vik_units_speed_t, enum in globals -
-
-
-unzip_file, function in compression -
-
-
-uri_escape, function in util -
-
-
-util_add_to_deletion_list, function in util -
-
-
-util_get_number_of_cpus, function in util -
-
-
-util_remove, function in util -
-
-
-util_remove_all_in_deletion_list, function in util -
-
-
-util_str_remove_chars, function in util -
-
-
-UTM, struct in coords -
-
-
-VIK_UTM, macro in vikcoord -
-
-

V

-
-vik_verbose, variable in globals -
-
-
-VERSION, macro in config -
-
-
-vik_version, variable in globals -
-
-
-vf_filter_type, enum in VikFileEntry -
-
-
-VikViewport::updated-center, object signal in VikViewport -
-
-
-VikViewportDrawMode, enum in VikViewport -
-
-
-vik_viewport_add_copyright, function in VikViewport -
-
-
-vik_viewport_add_logo, function in VikViewport -
-
-
-vik_viewport_back_available, function in VikViewport -
-
-
-vik_viewport_center_for_zonen, function in VikViewport -
-
-
-vik_viewport_clear, function in VikViewport -
-
-
-vik_viewport_compute_bearing, function in VikViewport -
-
-
-vik_viewport_configure, function in VikViewport -
-
-
-vik_viewport_configure_manually, function in VikViewport -
-
-
-vik_viewport_coord_to_screen, function in VikViewport -
-
-
-vik_viewport_corners_for_zonen, function in VikViewport -
-
-
-vik_viewport_draw_arc, function in VikViewport -
-
-
-vik_viewport_draw_centermark, function in VikViewport -
-
-
-vik_viewport_draw_copyright, function in VikViewport -
-
-
-vik_viewport_draw_layout, function in VikViewport -
-
-
-vik_viewport_draw_line, function in VikViewport -
-
-
-vik_viewport_draw_logo, function in VikViewport -
-
-
-vik_viewport_draw_pixbuf, function in VikViewport -
-
-
-vik_viewport_draw_pixbuf_with_alpha, function in VikViewport -
-
-
-vik_viewport_draw_polygon, function in VikViewport -
-
-
-vik_viewport_draw_rectangle, function in VikViewport -
-
-
-vik_viewport_draw_scale, function in VikViewport -
-
-
-vik_viewport_draw_string, function in VikViewport -
-
-
-vik_viewport_forward_available, function in VikViewport -
-
-
-vik_viewport_get_background_color, function in VikViewport -
-
-
-vik_viewport_get_background_gdkcolor, function in VikViewport -
-
-
-vik_viewport_get_center, function in VikViewport -
-
-
-vik_viewport_get_coord_mode, function in VikViewport -
-
-
-vik_viewport_get_drawmode, function in VikViewport -
-
-
-vik_viewport_get_drawmode_name, function in VikViewport -
-
-
-vik_viewport_get_draw_centermark, function in VikViewport -
-
-
-vik_viewport_get_draw_highlight, function in VikViewport -
-
-
-vik_viewport_get_draw_scale, function in VikViewport -
-
-
-vik_viewport_get_gc_highlight, function in VikViewport -
-
-
-vik_viewport_get_half_drawn, function in VikViewport -
-
-
-vik_viewport_get_height, function in VikViewport -
-
-
-vik_viewport_get_highlight_color, function in VikViewport -
-
-
-vik_viewport_get_highlight_gdkcolor, function in VikViewport -
-
-
-vik_viewport_get_min_max_lat_lon, function in VikViewport -
-
-
-vik_viewport_get_pixmap, function in VikViewport -
-
-
-vik_viewport_get_trigger, function in VikViewport -
-
-
-vik_viewport_get_width, function in VikViewport -
-
-
-vik_viewport_get_xmpp, function in VikViewport -
-
-
-vik_viewport_get_ympp, function in VikViewport -
-
-
-vik_viewport_get_zoom, function in VikViewport -
-
-
-vik_viewport_go_back, function in VikViewport -
-
-
-vik_viewport_go_forward, function in VikViewport -
-
-
-vik_viewport_is_one_zone, function in VikViewport -
-
-
-vik_viewport_leftmost_zone, function in VikViewport -
-
-
-VIK_VIEWPORT_MAX_ZOOM, macro in VikViewport -
-
-
-VIK_VIEWPORT_MIN_ZOOM, macro in VikViewport -
-
-
-vik_viewport_new, function in VikViewport -
-
-
-vik_viewport_new_gc, function in VikViewport -
-
-
-vik_viewport_new_gc_from_color, function in VikViewport -
-
-
-VIK_VIEWPORT_OFF_SCREEN_DOUBLE, macro in VikViewport -
-
-
-vik_viewport_pan_sync, function in VikViewport -
-
-
-vik_viewport_reset_copyrights, function in VikViewport -
-
-
-vik_viewport_reset_logos, function in VikViewport -
-
-
-vik_viewport_rightmost_zone, function in VikViewport -
-
-
-vik_viewport_screen_to_coord, function in VikViewport -
-
-
-vik_viewport_set_background_color, function in VikViewport -
-
-
-vik_viewport_set_background_gdkcolor, function in VikViewport -
-
-
-vik_viewport_set_center_coord, function in VikViewport -
-
-
-vik_viewport_set_center_latlon, function in VikViewport -
-
-
-vik_viewport_set_center_screen, function in VikViewport -
-
-
-vik_viewport_set_center_utm, function in VikViewport -
-
-
-vik_viewport_set_drawmode, function in VikViewport -
-
-
-vik_viewport_set_draw_centermark, function in VikViewport -
-
-
-vik_viewport_set_draw_highlight, function in VikViewport -
-
-
-vik_viewport_set_draw_scale, function in VikViewport -
-
-
-vik_viewport_set_half_drawn, function in VikViewport -
-
-
-vik_viewport_set_highlight_color, function in VikViewport -
-
-
-vik_viewport_set_highlight_gdkcolor, function in VikViewport -
-
-
-vik_viewport_set_highlight_thickness, function in VikViewport -
-
-
-vik_viewport_set_trigger, function in VikViewport -
-
-
-vik_viewport_set_xmpp, function in VikViewport -
-
-
-vik_viewport_set_ympp, function in VikViewport -
-
-
-vik_viewport_set_zoom, function in VikViewport -
-
-
-vik_viewport_show_centers, function in VikViewport -
-
-
-vik_viewport_snapshot_load, function in VikViewport -
-
-
-vik_viewport_snapshot_save, function in VikViewport -
-
-
-vik_viewport_sync, function in VikViewport -
-
-
-VIK_VIEWPORT_TYPE, macro in VikViewport -
-
-
-VIK_VIEWPORT_UTM_WRONG_ZONE, macro in VikViewport -
-
-
-vik_viewport_zoom_in, function in VikViewport -
-
-
-vik_viewport_zoom_out, function in VikViewport -
-
-
-vu_check_latest_version, function in vikutils -
-
-
-vu_command_line, function in vikutils -
-
-
-vu_copy_label_menu, function in vikutils -
-
-
-vu_finalize_lat_lon_tz_lookup, function in vikutils -
-
-
-vu_get_canonical_filename, function in vikutils -
-
-
-vu_get_time_string, function in vikutils -
-
-
-vu_get_tz_at_location, function in vikutils -
-
-
-vu_setup_lat_lon_tz_lookup, function in vikutils -
-
-
-vu_set_auto_features_on_first_run, function in vikutils -
-
-
-vu_trackpoint_formatted_message, function in vikutils -
-
-

W

-
-VIK_WAYPOINT, macro in vikwaypoint -
-
-
-VikWaypoint, struct in vikwaypoint -
-
-
-vik_waypoint_apply_dem_data, function in vikwaypoint -
-
-
-vik_waypoint_copy, function in vikwaypoint -
-
-
-vik_waypoint_free, function in vikwaypoint -
-
-
-vik_waypoint_marshall, function in vikwaypoint -
-
-
-vik_waypoint_new, function in vikwaypoint -
-
-
-vik_waypoint_set_comment, function in vikwaypoint -
-
-
-vik_waypoint_set_comment_no_copy, function in vikwaypoint -
-
-
-vik_waypoint_set_description, function in vikwaypoint -
-
-
-vik_waypoint_set_image, function in vikwaypoint -
-
-
-vik_waypoint_set_name, function in vikwaypoint -
-
-
-vik_waypoint_set_symbol, function in vikwaypoint -
-
-
-vik_waypoint_set_url, function in vikwaypoint -
-
-
-vik_waypoint_unmarshall, function in vikwaypoint -
-
-
-VikWebtoolBounds:url, object property in VikWebtoolBounds -
-
-
-VikWebtoolCenter:url, object property in VikWebtoolCenter -
-
-
-VikWebtoolDatasource:babel-filter-args, object property in VikWebtoolDatasource -
-
-
-VikWebtoolDatasource:file-type, object property in VikWebtoolDatasource -
-
-
-VikWebtoolDatasource:input-label, object property in VikWebtoolDatasource -
-
-
-VikWebtoolDatasource:url, object property in VikWebtoolDatasource -
-
-
-VikWebtoolDatasource:url-format-code, object property in VikWebtoolDatasource -
-
-
-VikWebtoolFormat:url, object property in VikWebtoolFormat -
-
-
-VikWebtoolFormat:url-format-code, object property in VikWebtoolFormat -
-
-
-vik_webtool_bounds_new, function in VikWebtoolBounds -
-
-
-vik_webtool_bounds_new_with_members, function in VikWebtoolBounds -
-
-
-VIK_WEBTOOL_BOUNDS_TYPE, macro in VikWebtoolBounds -
-
-
-vik_webtool_center_mpp_to_zoom, function in VikWebtoolCenter -
-
-
-vik_webtool_center_new, function in VikWebtoolCenter -
-
-
-vik_webtool_center_new_with_members, function in VikWebtoolCenter -
-
-
-VIK_WEBTOOL_CENTER_TYPE, macro in VikWebtoolCenter -
-
-
-vik_webtool_datasource_new, function in VikWebtoolDatasource -
-
-
-vik_webtool_datasource_new_with_members, function in VikWebtoolDatasource -
-
-
-VIK_WEBTOOL_DATASOURCE_TYPE, macro in VikWebtoolDatasource -
-
-
-vik_webtool_format_mpp_to_zoom, function in VikWebtoolFormat -
-
-
-vik_webtool_format_new, function in VikWebtoolFormat -
-
-
-vik_webtool_format_new_with_members, function in VikWebtoolFormat -
-
-
-VIK_WEBTOOL_FORMAT_TYPE, macro in VikWebtoolFormat -
-
-
-vik_webtool_get_url, function in VikWebtool -
-
-
-vik_webtool_get_url_at_position, function in VikWebtool -
-
-
-VIK_WEBTOOL_TYPE, macro in VikWebtool -
-
-
-VikWindow::newwindow, object signal in VikWindow -
-
-
-VikWindow::openwindow, object signal in VikWindow -
-
-
-vik_window_clear_busy_cursor, function in VikWindow -
-
-
-vik_window_clear_highlight, function in VikWindow -
-
-
-vik_window_enable_layer_tool, function in VikWindow -
-
-
-VIK_WINDOW_FROM_WIDGET, macro in VikWindow -
-
-
-vik_window_get_containing_trw_layer, function in VikWindow -
-
-
-vik_window_get_drawmode_button, function in VikWindow -
-
-
-vik_window_get_filename, function in VikWindow -
-
-
-vik_window_get_pan_move, function in VikWindow -
-
-
-vik_window_get_selected_track, function in VikWindow -
-
-
-vik_window_get_selected_tracks, function in VikWindow -
-
-
-vik_window_get_selected_trw_layer, function in VikWindow -
-
-
-vik_window_get_selected_waypoint, function in VikWindow -
-
-
-vik_window_get_selected_waypoints, function in VikWindow -
-
-
-vik_window_get_statusbar, function in VikWindow -
-
-
-vik_window_get_thread, function in VikWindow -
-
-
-vik_window_layers_panel, function in VikWindow -
-
-
-vik_window_new_window, function in VikWindow -
-
-
-vik_window_new_window_finish, function in VikWindow -
-
-
-vik_window_open_file, function in VikWindow -
-
-
-vik_window_selected_layer, function in VikWindow -
-
-
-vik_window_set_busy_cursor, function in VikWindow -
-
-
-vik_window_set_redraw_trigger, function in VikWindow -
-
-
-vik_window_set_selected_track, function in VikWindow -
-
-
-vik_window_set_selected_tracks, function in VikWindow -
-
-
-vik_window_set_selected_trw_layer, function in VikWindow -
-
-
-vik_window_set_selected_waypoint, function in VikWindow -
-
-
-vik_window_set_selected_waypoints, function in VikWindow -
-
-
-vik_window_statusbar_update, function in VikWindow -
-
-
-VIK_WINDOW_TYPE, macro in VikWindow -
-
-
-vik_window_viewport, function in VikWindow -
-
-
-VikWmscMapSource:check-file-server-time, object property in VikWmscMapSource -
-
-
-VikWmscMapSource:follow-location, object property in VikWmscMapSource -
-
-
-VikWmscMapSource:hostname, object property in VikWmscMapSource -
-
-
-VikWmscMapSource:lat-max, object property in VikWmscMapSource -
-
-
-VikWmscMapSource:lat-min, object property in VikWmscMapSource -
-
-
-VikWmscMapSource:lon-max, object property in VikWmscMapSource -
-
-
-VikWmscMapSource:lon-min, object property in VikWmscMapSource -
-
-
-VikWmscMapSource:referer, object property in VikWmscMapSource -
-
-
-VikWmscMapSource:url, object property in VikWmscMapSource -
-
-
-VikWmscMapSource:zoom-max, object property in VikWmscMapSource -
-
-
-VikWmscMapSource:zoom-min, object property in VikWmscMapSource -
-
-
-vik_wmsc_map_source_new_with_id, function in VikWmscMapSource -
-
-
-wpu_udata, struct in VikTrwLayer -
-
-
-wp_1st_aid_large_pixbuf, variable in wp_1st_aid_large_pixmap -
-
-
-wp_1st_aid_pixbuf, variable in wp_1st_aid_pixmap -
-
-
-wp_airplane_large_pixbuf, variable in wp_airplane_large_pixmap -
-
-
-wp_airplane_pixbuf, variable in wp_airplane_pixmap -
-
-
-wp_amuse_pk_large_pixbuf, variable in wp_amuse_pk_large_pixmap -
-
-
-wp_anchor_large_pixbuf, variable in wp_anchor_large_pixmap -
-
-
-wp_anchor_pixbuf, variable in wp_anchor_pixmap -
-
-
-wp_ball_large_pixbuf, variable in wp_ball_large_pixmap -
-
-
-wp_ball_pixbuf, variable in wp_ball_pixmap -
-
-
-wp_beach_large_pixbuf, variable in wp_beach_large_pixmap -
-
-
-wp_beach_pixbuf, variable in wp_beach_pixmap -
-
-
-wp_bell_large_pixbuf, variable in wp_bell_large_pixmap -
-
-
-wp_bell_pixbuf, variable in wp_bell_pixmap -
-
-
-wp_bike_trail_large_pixbuf, variable in wp_bike_trail_large_pixmap -
-
-
-wp_block_blue_large_pixbuf, variable in wp_block_blue_large_pixmap -
-
-
-wp_block_green_large_pixbuf, variable in wp_block_green_large_pixmap -
-
-
-wp_block_red_large_pixbuf, variable in wp_block_red_large_pixmap -
-
-
-wp_boat_ramp_large_pixbuf, variable in wp_boat_ramp_large_pixmap -
-
-
-wp_boat_ramp_pixbuf, variable in wp_boat_ramp_pixmap -
-
-
-wp_bowling_large_pixbuf, variable in wp_bowling_large_pixmap -
-
-
-wp_bridge_large_pixbuf, variable in wp_bridge_large_pixmap -
-
-
-wp_bridge_pixbuf, variable in wp_bridge_pixmap -
-
-
-wp_building_large_pixbuf, variable in wp_building_large_pixmap -
-
-
-wp_building_pixbuf, variable in wp_building_pixmap -
-
-
-wp_buoy_ambr_large_pixbuf, variable in wp_buoy_ambr_large_pixmap -
-
-
-wp_buoy_ambr_pixbuf, variable in wp_buoy_ambr_pixmap -
-
-
-wp_buoy_blck_large_pixbuf, variable in wp_buoy_blck_large_pixmap -
-
-
-wp_buoy_blck_pixbuf, variable in wp_buoy_blck_pixmap -
-
-
-wp_buoy_blue_large_pixbuf, variable in wp_buoy_blue_large_pixmap -
-
-
-wp_buoy_blue_pixbuf, variable in wp_buoy_blue_pixmap -
-
-
-wp_buoy_grn_large_pixbuf, variable in wp_buoy_grn_large_pixmap -
-
-
-wp_buoy_grn_pixbuf, variable in wp_buoy_grn_pixmap -
-
-
-wp_buoy_grn_red_large_pixbuf, variable in wp_buoy_grn_red_large_pixmap -
-
-
-wp_buoy_grn_red_pixbuf, variable in wp_buoy_grn_red_pixmap -
-
-
-wp_buoy_grn_wht_large_pixbuf, variable in wp_buoy_grn_wht_large_pixmap -
-
-
-wp_buoy_grn_wht_pixbuf, variable in wp_buoy_grn_wht_pixmap -
-
-
-wp_buoy_orng_large_pixbuf, variable in wp_buoy_orng_large_pixmap -
-
-
-wp_buoy_orng_pixbuf, variable in wp_buoy_orng_pixmap -
-
-
-wp_buoy_red_grn_large_pixbuf, variable in wp_buoy_red_grn_large_pixmap -
-
-
-wp_buoy_red_grn_pixbuf, variable in wp_buoy_red_grn_pixmap -
-
-
-wp_buoy_red_large_pixbuf, variable in wp_buoy_red_large_pixmap -
-
-
-wp_buoy_red_pixbuf, variable in wp_buoy_red_pixmap -
-
-
-wp_buoy_red_wht_large_pixbuf, variable in wp_buoy_red_wht_large_pixmap -
-
-
-wp_buoy_red_wht_pixbuf, variable in wp_buoy_red_wht_pixmap -
-
-
-wp_buoy_violet_large_pixbuf, variable in wp_buoy_violet_large_pixmap -
-
-
-wp_buoy_violet_pixbuf, variable in wp_buoy_violet_pixmap -
-
-
-wp_buoy_wht_grn_large_pixbuf, variable in wp_buoy_wht_grn_large_pixmap -
-
-
-wp_buoy_wht_grn_pixbuf, variable in wp_buoy_wht_grn_pixmap -
-
-
-wp_buoy_wht_large_pixbuf, variable in wp_buoy_wht_large_pixmap -
-
-
-wp_buoy_wht_pixbuf, variable in wp_buoy_wht_pixmap -
-
-
-wp_buoy_wht_red_large_pixbuf, variable in wp_buoy_wht_red_large_pixmap -
-
-
-wp_buoy_wht_red_pixbuf, variable in wp_buoy_wht_red_pixmap -
-
-
-wp_camp_large_pixbuf, variable in wp_camp_large_pixmap -
-
-
-wp_camp_pixbuf, variable in wp_camp_pixmap -
-
-
-wp_cap_cty_pixbuf, variable in wp_cap_cty_pixmap -
-
-
-wp_car_large_pixbuf, variable in wp_car_large_pixmap -
-
-
-wp_car_pixbuf, variable in wp_car_pixmap -
-
-
-wp_car_rental_large_pixbuf, variable in wp_car_rental_large_pixmap -
-
-
-wp_car_repair_large_pixbuf, variable in wp_car_repair_large_pixmap -
-
-
-wp_cemetery_large_pixbuf, variable in wp_cemetery_large_pixmap -
-
-
-wp_cemetery_pixbuf, variable in wp_cemetery_pixmap -
-
-
-wp_church_large_pixbuf, variable in wp_church_large_pixmap -
-
-
-wp_church_pixbuf, variable in wp_church_pixmap -
-
-
-wp_civil_large_pixbuf, variable in wp_civil_large_pixmap -
-
-
-wp_controlled_large_pixbuf, variable in wp_controlled_large_pixmap -
-
-
-wp_controlled_pixbuf, variable in wp_controlled_pixmap -
-
-
-wp_conv_store_large_pixbuf, variable in wp_conv_store_large_pixmap -
-
-
-wp_crossing_large_pixbuf, variable in wp_crossing_large_pixmap -
-
-
-wp_dam_large_pixbuf, variable in wp_dam_large_pixmap -
-
-
-wp_dam_pixbuf, variable in wp_dam_pixmap -
-
-
-wp_danger_large_pixbuf, variable in wp_danger_large_pixmap -
-
-
-wp_danger_pixbuf, variable in wp_danger_pixmap -
-
-
-wp_deer_large_pixbuf, variable in wp_deer_large_pixmap -
-
-
-wp_deer_pixbuf, variable in wp_deer_pixmap -
-
-
-wp_diamond_grn_pixbuf, variable in wp_diamond_grn_pixmap -
-
-
-wp_diamond_red_pixbuf, variable in wp_diamond_red_pixmap -
-
-
-wp_dive1_large_pixbuf, variable in wp_dive1_large_pixmap -
-
-
-wp_dive1_pixbuf, variable in wp_dive1_pixmap -
-
-
-wp_dive2_large_pixbuf, variable in wp_dive2_large_pixmap -
-
-
-wp_dive2_pixbuf, variable in wp_dive2_pixmap -
-
-
-wp_dollar_large_pixbuf, variable in wp_dollar_large_pixmap -
-
-
-wp_dollar_pixbuf, variable in wp_dollar_pixmap -
-
-
-wp_dot_pixbuf, variable in wp_dot_pixmap -
-
-
-wp_drinking_wtr_large_pixbuf, variable in wp_drinking_wtr_large_pixmap -
-
-
-wp_drinking_wtr_pixbuf, variable in wp_drinking_wtr_pixmap -
-
-
-wp_exit_large_pixbuf, variable in wp_exit_large_pixmap -
-
-
-wp_fastfood_large_pixbuf, variable in wp_fastfood_large_pixmap -
-
-
-wp_fhs_facility_large_pixbuf, variable in wp_fhs_facility_large_pixmap -
-
-
-wp_fish_large_pixbuf, variable in wp_fish_large_pixmap -
-
-
-wp_fish_pixbuf, variable in wp_fish_pixmap -
-
-
-wp_fitness_large_pixbuf, variable in wp_fitness_large_pixmap -
-
-
-wp_flag_blue_large_pixbuf, variable in wp_flag_blue_large_pixmap -
-
-
-wp_flag_green_large_pixbuf, variable in wp_flag_green_large_pixmap -
-
-
-wp_flag_pixbuf, variable in wp_flag_pixmap -
-
-
-wp_flag_red_large_pixbuf, variable in wp_flag_red_large_pixmap -
-
-
-wp_forest_large_pixbuf, variable in wp_forest_large_pixmap -
-
-
-wp_forest_pixbuf, variable in wp_forest_pixmap -
-
-
-wp_fuel_large_pixbuf, variable in wp_fuel_large_pixmap -
-
-
-wp_fuel_pixbuf, variable in wp_fuel_pixmap -
-
-
-wp_geocache_fnd_large_pixbuf, variable in wp_geocache_fnd_large_pixmap -
-
-
-wp_geocache_fnd_pixbuf, variable in wp_geocache_fnd_pixmap -
-
-
-wp_geocache_large_pixbuf, variable in wp_geocache_large_pixmap -
-
-
-wp_geocache_pixbuf, variable in wp_geocache_pixmap -
-
-
-wp_glider_large_pixbuf, variable in wp_glider_large_pixmap -
-
-
-wp_golf_large_pixbuf, variable in wp_golf_large_pixmap -
-
-
-wp_golf_pixbuf, variable in wp_golf_pixmap -
-
-
-wp_grnd_trans_large_pixbuf, variable in wp_grnd_trans_large_pixmap -
-
-
-wp_helipad_large_pixbuf, variable in wp_helipad_large_pixmap -
-
-
-wp_horn_large_pixbuf, variable in wp_horn_large_pixmap -
-
-
-wp_horn_pixbuf, variable in wp_horn_pixmap -
-
-
-wp_house_large_pixbuf, variable in wp_house_large_pixmap -
-
-
-wp_house_pixbuf, variable in wp_house_pixmap -
-
-
-wp_ice_skating_large_pixbuf, variable in wp_ice_skating_large_pixmap -
-
-
-wp_ice_skating_pixbuf, variable in wp_ice_skating_pixmap -
-
-
-wp_info_large_pixbuf, variable in wp_info_large_pixmap -
-
-
-wp_info_pixbuf, variable in wp_info_pixmap -
-
-
-wp_knife_large_pixbuf, variable in wp_knife_large_pixmap -
-
-
-wp_knife_pixbuf, variable in wp_knife_pixmap -
-
-
-wp_light_large_pixbuf, variable in wp_light_large_pixmap -
-
-
-wp_light_pixbuf, variable in wp_light_pixmap -
-
-
-wp_lodging_large_pixbuf, variable in wp_lodging_large_pixmap -
-
-
-wp_lrg_cty_large_pixbuf, variable in wp_lrg_cty_large_pixmap -
-
-
-wp_lrg_cty_pixbuf, variable in wp_lrg_cty_pixmap -
-
-
-wp_med_cty_large_pixbuf, variable in wp_med_cty_large_pixmap -
-
-
-wp_med_cty_pixbuf, variable in wp_med_cty_pixmap -
-
-
-wp_military_pixbuf, variable in wp_military_pixmap -
-
-
-wp_mine_large_pixbuf, variable in wp_mine_large_pixmap -
-
-
-wp_mine_pixbuf, variable in wp_mine_pixmap -
-
-
-wp_mob_large_pixbuf, variable in wp_mob_large_pixmap -
-
-
-wp_mob_pixbuf, variable in wp_mob_pixmap -
-
-
-wp_movie_large_pixbuf, variable in wp_movie_large_pixmap -
-
-
-wp_mug_large_pixbuf, variable in wp_mug_large_pixmap -
-
-
-wp_mug_pixbuf, variable in wp_mug_pixmap -
-
-
-wp_museum_large_pixbuf, variable in wp_museum_large_pixmap -
-
-
-wp_null_pixbuf, variable in wp_null_pixmap -
-
-
-wp_oil_field_large_pixbuf, variable in wp_oil_field_large_pixmap -
-
-
-wp_parachute_large_pixbuf, variable in wp_parachute_large_pixmap -
-
-
-wp_parking_large_pixbuf, variable in wp_parking_large_pixmap -
-
-
-wp_parking_pixbuf, variable in wp_parking_pixmap -
-
-
-wp_park_large_pixbuf, variable in wp_park_large_pixmap -
-
-
-wp_park_pixbuf, variable in wp_park_pixmap -
-
-
-wp_pharmacy_large_pixbuf, variable in wp_pharmacy_large_pixmap -
-
-
-wp_phone_large_pixbuf, variable in wp_phone_large_pixmap -
-
-
-wp_phone_pixbuf, variable in wp_phone_pixmap -
-
-
-wp_picnic_large_pixbuf, variable in wp_picnic_large_pixmap -
-
-
-wp_picnic_pixbuf, variable in wp_picnic_pixmap -
-
-
-wp_pin_blue_large_pixbuf, variable in wp_pin_blue_large_pixmap -
-
-
-wp_pin_green_large_pixbuf, variable in wp_pin_green_large_pixmap -
-
-
-wp_pin_red_large_pixbuf, variable in wp_pin_red_large_pixmap -
-
-
-wp_pizza_large_pixbuf, variable in wp_pizza_large_pixmap -
-
-
-wp_police_large_pixbuf, variable in wp_police_large_pixmap -
-
-
-wp_post_ofc_large_pixbuf, variable in wp_post_ofc_large_pixmap -
-
-
-wp_rbcn_large_pixbuf, variable in wp_rbcn_large_pixmap -
-
-
-wp_rbcn_pixbuf, variable in wp_rbcn_pixmap -
-
-
-wp_restricted_large_pixbuf, variable in wp_restricted_large_pixmap -
-
-
-wp_restricted_pixbuf, variable in wp_restricted_pixmap -
-
-
-wp_restroom_large_pixbuf, variable in wp_restroom_large_pixmap -
-
-
-wp_restroom_pixbuf, variable in wp_restroom_pixmap -
-
-
-wp_rv_park_large_pixbuf, variable in wp_rv_park_large_pixmap -
-
-
-wp_rv_park_pixbuf, variable in wp_rv_park_pixmap -
-
-
-wp_scenic_large_pixbuf, variable in wp_scenic_large_pixmap -
-
-
-wp_scenic_pixbuf, variable in wp_scenic_pixmap -
-
-
-wp_school_large_pixbuf, variable in wp_school_large_pixmap -
-
-
-wp_school_pixbuf, variable in wp_school_pixmap -
-
-
-wp_shopping_large_pixbuf, variable in wp_shopping_large_pixmap -
-
-
-wp_short_tower_large_pixbuf, variable in wp_short_tower_large_pixmap -
-
-
-wp_shower_large_pixbuf, variable in wp_shower_large_pixmap -
-
-
-wp_shower_pixbuf, variable in wp_shower_pixmap -
-
-
-wp_skiing_large_pixbuf, variable in wp_skiing_large_pixmap -
-
-
-wp_skiing_pixbuf, variable in wp_skiing_pixmap -
-
-
-wp_ski_resort_large_pixbuf, variable in wp_ski_resort_large_pixmap -
-
-
-wp_skull_large_pixbuf, variable in wp_skull_large_pixmap -
-
-
-wp_skull_pixbuf, variable in wp_skull_pixmap -
-
-
-wp_sml_cty_large_pixbuf, variable in wp_sml_cty_large_pixmap -
-
-
-wp_sml_cty_pixbuf, variable in wp_sml_cty_pixmap -
-
-
-wp_square_grn_pixbuf, variable in wp_square_grn_pixmap -
-
-
-wp_square_red_pixbuf, variable in wp_square_red_pixmap -
-
-
-wp_stadium_large_pixbuf, variable in wp_stadium_large_pixmap -
-
-
-wp_store_large_pixbuf, variable in wp_store_large_pixmap -
-
-
-wp_summit_large_pixbuf, variable in wp_summit_large_pixmap -
-
-
-wp_summit_pixbuf, variable in wp_summit_pixmap -
-
-
-wp_swimming_large_pixbuf, variable in wp_swimming_large_pixmap -
-
-
-wp_swimming_pixbuf, variable in wp_swimming_pixmap -
-
-
-wp_tall_tower_large_pixbuf, variable in wp_tall_tower_large_pixmap -
-
-
-wp_theater_large_pixbuf, variable in wp_theater_large_pixmap -
-
-
-wp_toll_booth_large_pixbuf, variable in wp_toll_booth_large_pixmap -
-
-
-wp_trail_head_large_pixbuf, variable in wp_trail_head_large_pixmap -
-
-
-wp_truck_stop_large_pixbuf, variable in wp_truck_stop_large_pixmap -
-
-
-wp_tunnel_large_pixbuf, variable in wp_tunnel_large_pixmap -
-
-
-wp_tunnel_pixbuf, variable in wp_tunnel_pixmap -
-
-
-wp_ultralight_large_pixbuf, variable in wp_ultralight_large_pixmap -
-
-
-wp_wbuoy_large_pixbuf, variable in wp_wbuoy_large_pixmap -
-
-
-wp_wbuoy_pixbuf, variable in wp_wbuoy_pixmap -
-
-
-wp_weigh_station_large_pixbuf, variable in wp_weigh_station_large_pixmap -
-
-
-wp_wpt_dot_pixbuf, variable in wp_wpt_dot_pixmap -
-
-
-wp_wrecker_large_pixbuf, variable in wp_wrecker_large_pixmap -
-
-
-wp_wreck_large_pixbuf, variable in wp_wreck_large_pixmap -
-
-
-wp_wreck_pixbuf, variable in wp_wreck_pixmap -
-
-
-wp_zoo_large_pixbuf, variable in wp_zoo_large_pixmap -
-
-

X

-
-xyz_to_meta, function in metatile -
-
-

Z

-
-zoom_18_pixbuf, variable in zoom_18_pixmap -
-
-
-
-
Generated by GTK-Doc V1.24
- - \ No newline at end of file diff -Nru viking-1.6.2/doc/reference/html/BingMapSource.html viking-1.7/doc/reference/html/BingMapSource.html --- viking-1.6.2/doc/reference/html/BingMapSource.html 2015-12-21 12:13:48.000000000 +0000 +++ viking-1.7/doc/reference/html/BingMapSource.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,175 +0,0 @@ - - - - -BingMapSource: viking Reference Manual - - - - - - - - - - - - - - - - -
-
-
- - -
-

BingMapSource

-

BingMapSource — the class for Bing Maps

-
-
-

Functions

-
---- - - - - -
-BingMapSource * - -bing_map_source_new_with_id () -
-
-
-

Properties

-
----- - - - - - - - - - - - - - - - - - -
-gchar *api-keyRead / Write / Construct Only
-gchar *hostnameRead / Write / Construct Only
-gchar *urlRead / Write / Construct Only
-
-
-

Object Hierarchy

-
    GObject
-    ╰── VikMapSource
-        ╰── VikMapSourceDefault
-            ╰── VikSlippyMapSource
-                ╰── BingMapSource
-
-
-
-

Description

-

The BingMapSource class handles Bing map source.

-

License and term of use are available here: -http://wiki.openstreetmap.org/wiki/File:Bing_license.pdf

-

Technical details are available here: -http://msdn.microsoft.com/en-us/library/dd877180.aspx

-
-
-

Functions

-
-

bing_map_source_new_with_id ()

-
BingMapSource *
-bing_map_source_new_with_id (guint16 id,
-                             const gchar *label,
-                             const gchar *key);
-

Constructor for Bing map source.

-
-

Parameters

-
----- - - - - - - - - - - - - - - - - - -

id

internal identifier.

 

label

the label to display in map provider selector.

 

key

the API key to access Bing's services.

 
-
-
-

Returns

-

a newly allocated BingMapSource GObject.

-
-
-
-
-

Types and Values

-
-
-

Property Details

-
-

The “api-key†property

-
  “api-key†                 gchar *
-

The API key to access Bing.

-

Flags: Read / Write / Construct Only

-

Default value: "<no-set>"

-
-
-
-

The “hostname†property

-
  “hostname†                gchar *
-

The hostname of the map server.

-

Flags: Read / Write / Construct Only

-

Default value: "<no-set>"

-
-
-
-

The “url†property

-
  “url†                     gchar *
-

The template of the tiles' URL.

-

Flags: Read / Write / Construct Only

-

Default value: "<no-set>"

-
-
-
-
-
Generated by GTK-Doc V1.24
- - \ No newline at end of file diff -Nru viking-1.6.2/doc/reference/html/ch01.html viking-1.7/doc/reference/html/ch01.html --- viking-1.6.2/doc/reference/html/ch01.html 2015-12-21 12:13:48.000000000 +0000 +++ viking-1.7/doc/reference/html/ch01.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,1105 +0,0 @@ - - - - -[Insert title here]: viking Reference Manual - - - - - - - - - - - - - - - - -
-

-[Insert title here]

-
-
-VikDataSource -
-
-addtr_18_pixmap -
-
-addwp_18_pixmap -
-
-babel — running external programs and redirecting to TRWLayers. -
-
-babel_ui -
-
-background -
-
-bbox -
-
-begintr_18_pixmap -
-
-bing -
-
-bing_maps_pixmap -
-
-BingMapSource — the class for Bing Maps -
-
-bluemarble -
-
-clipboard -
-
-compression -
-
-config -
-
-coords -
-
-curl_download -
-
-cursor_addtr_pixmap -
-
-cursor_addwp_pixmap -
-
-cursor_begintr_pixmap -
-
-cursor_demdl_pixmap -
-
-cursor_edtr_pixmap -
-
-cursor_edwp_pixmap -
-
-cursor_geomove_pixmap -
-
-cursor_geozoom_pixmap -
-
-cursor_mapdl_pixmap -
-
-cursor_new_route_pixmap -
-
-cursor_route_finder_pixmap -
-
-cursor_ruler_pixmap -
-
-cursor_showpic_pixmap -
-
-cursor_zoom_pixmap -
-
-datasource_gps -
-
-datasources -
-
-degrees_converters -
-
-dem -
-
-demdl_18_pixmap -
-
-dems -
-
-dialog -
-
-dir -
-
-download -
-
-edtr_18_pixmap -
-
-edwp_18_pixmap -
-
-expedia -
-
-file -
-
-fileutils -
-
-garminsymbols -
-
-geojson -
-
-geomove_18_pixmap -
-
-geonames -
-
-geonamessearch -
-
-geotag_exif -
-
-geozoom_18_pixmap -
-
-glibcurl -
-
-globals -
-
-google -
-
-GoogleGotoTool -
-
-gpsmapper -
-
-gpspoint -
-
-gpx -
-
-icons -
-
-jpeg-data -
-
-jpeg-marker -
-
-jpg -
-
-kdtree -
-
-map_ids -
-
-mapcache -
-
-mapcoord -
-
-mapdl_18_pixmap -
-
-mapnik_interface -
-
-maputils — Notes about TMS / Spherical Mercator conversion -
-
-metatile -
-
-modules -
-
-mover_22_pixmap -
-
-osm -
-
-osm-traces -
-
-preferences -
-
-print -
-
-VikPrintPreview -
-
-route_finder_18_pixmap -
-
-ruler_18_pixmap -
-
-select_18_pixmap -
-
-settings -
-
-showpic_18_pixmap -
-
-strtod -
-
-terraserver -
-
-TerraserverMapSource -
-
-thumbnails -
-
-thumbnails_pixmap -
-
-toolbar -
-
-ui_util -
-
-uibuilder -
-
-util -
-
-vik_compat -
-
-vik_new_route_18_pixmap -
-
-VikAggregateLayer -
-
-vikaggregatelayer_pixmap -
-
-vikcoord -
-
-VikCoordLayer -
-
-vikcoordlayer_pixmap -
-
-vikdatetime_edit_dialog -
-
-VikDEMLayer -
-
-vikdemlayer_pixmap -
-
-GeanyEntryAction -
-
-vikenumtypes -
-
-VikExtTool -
-
-vikexttool_datasources -
-
-vikexttools -
-
-VikFileEntry -
-
-VikFileList -
-
-VikGeorefLayer -
-
-vikgeoreflayer_pixmap -
-
-VikGobjectBuilder -
-
-vikgoto -
-
-VikGotoTool -
-
-VikGotoXmlTool -
-
-VikGpsLayer -
-
-vikgpslayer_pixmap -
-
-viking_pixmap -
-
-VikLayer -
-
-viklayer_defaults -
-
-VikLayersPanel -
-
-vikmapniklayer -
-
-vikmapniklayer_pixmap -
-
-VikMapsLayer -
-
-vikmapslayer_compat -
-
-vikmapslayer_pixmap -
-
-VikMapSource — the base class to describe map source -
-
-VikMapSourceDefault — the base class implementing most of generic features -
-
-VikMapType — the adapter class to support old map source declaration -
-
-VikRadioGroup -
-
-vikrouting — the routing framework -
-
-VikRoutingEngine — the base class to describe routing engine -
-
-VikRoutingWebEngine — A generic class for WEB based routing engine -
-
-VikSlippyMapSource — the class for SlippyMap oriented map sources -
-
-VikStatusbar -
-
-VikTmsMapSource — the class for TMS oriented map sources -
-
-viktrack -
-
-VikTreeview -
-
-VikTrwLayer -
-
-viktrwlayer_analysis -
-
-viktrwlayer_export -
-
-viktrwlayer_geotag -
-
-viktrwlayer_pixmap -
-
-viktrwlayer_propwin -
-
-VikTrwLayerTpwin -
-
-viktrwlayer_tracklist -
-
-viktrwlayer_waypointlist -
-
-viktrwlayer_wpwin -
-
-vikutils -
-
-VikViewport -
-
-vikwaypoint -
-
-VikWebtool -
-
-VikWebtoolDatasource -
-
-VikWebtoolBounds -
-
-VikWebtoolCenter -
-
-VikWebtoolFormat -
-
-VikWindow -
-
-VikWmscMapSource — the class for WMS/WMS-C oriented map sources -
-
-wp_1st_aid_large_pixmap -
-
-wp_1st_aid_pixmap -
-
-wp_airplane_large_pixmap -
-
-wp_airplane_pixmap -
-
-wp_amuse_pk_large_pixmap -
-
-wp_anchor_large_pixmap -
-
-wp_anchor_pixmap -
-
-wp_ball_large_pixmap -
-
-wp_ball_pixmap -
-
-wp_beach_large_pixmap -
-
-wp_beach_pixmap -
-
-wp_bell_large_pixmap -
-
-wp_bell_pixmap -
-
-wp_bike_trail_large_pixmap -
-
-wp_block_blue_large_pixmap -
-
-wp_block_green_large_pixmap -
-
-wp_block_red_large_pixmap -
-
-wp_boat_ramp_large_pixmap -
-
-wp_boat_ramp_pixmap -
-
-wp_bowling_large_pixmap -
-
-wp_bridge_large_pixmap -
-
-wp_bridge_pixmap -
-
-wp_building_large_pixmap -
-
-wp_building_pixmap -
-
-wp_buoy_ambr_large_pixmap -
-
-wp_buoy_ambr_pixmap -
-
-wp_buoy_blck_large_pixmap -
-
-wp_buoy_blck_pixmap -
-
-wp_buoy_blue_large_pixmap -
-
-wp_buoy_blue_pixmap -
-
-wp_buoy_grn_large_pixmap -
-
-wp_buoy_grn_pixmap -
-
-wp_buoy_grn_red_large_pixmap -
-
-wp_buoy_grn_red_pixmap -
-
-wp_buoy_grn_wht_large_pixmap -
-
-wp_buoy_grn_wht_pixmap -
-
-wp_buoy_orng_large_pixmap -
-
-wp_buoy_orng_pixmap -
-
-wp_buoy_red_grn_large_pixmap -
-
-wp_buoy_red_grn_pixmap -
-
-wp_buoy_red_large_pixmap -
-
-wp_buoy_red_pixmap -
-
-wp_buoy_red_wht_large_pixmap -
-
-wp_buoy_red_wht_pixmap -
-
-wp_buoy_violet_large_pixmap -
-
-wp_buoy_violet_pixmap -
-
-wp_buoy_wht_grn_large_pixmap -
-
-wp_buoy_wht_grn_pixmap -
-
-wp_buoy_wht_large_pixmap -
-
-wp_buoy_wht_pixmap -
-
-wp_buoy_wht_red_large_pixmap -
-
-wp_buoy_wht_red_pixmap -
-
-wp_camp_large_pixmap -
-
-wp_camp_pixmap -
-
-wp_cap_cty_pixmap -
-
-wp_car_large_pixmap -
-
-wp_car_pixmap -
-
-wp_car_rental_large_pixmap -
-
-wp_car_repair_large_pixmap -
-
-wp_cemetery_large_pixmap -
-
-wp_cemetery_pixmap -
-
-wp_church_large_pixmap -
-
-wp_church_pixmap -
-
-wp_civil_large_pixmap -
-
-wp_controlled_large_pixmap -
-
-wp_controlled_pixmap -
-
-wp_conv_store_large_pixmap -
-
-wp_crossing_large_pixmap -
-
-wp_dam_large_pixmap -
-
-wp_dam_pixmap -
-
-wp_danger_large_pixmap -
-
-wp_danger_pixmap -
-
-wp_deer_large_pixmap -
-
-wp_deer_pixmap -
-
-wp_diamond_grn_pixmap -
-
-wp_diamond_red_pixmap -
-
-wp_dive1_large_pixmap -
-
-wp_dive1_pixmap -
-
-wp_dive2_large_pixmap -
-
-wp_dive2_pixmap -
-
-wp_dollar_large_pixmap -
-
-wp_dollar_pixmap -
-
-wp_dot_pixmap -
-
-wp_drinking_wtr_large_pixmap -
-
-wp_drinking_wtr_pixmap -
-
-wp_exit_large_pixmap -
-
-wp_fastfood_large_pixmap -
-
-wp_fhs_facility_large_pixmap -
-
-wp_fish_large_pixmap -
-
-wp_fish_pixmap -
-
-wp_fitness_large_pixmap -
-
-wp_flag_blue_large_pixmap -
-
-wp_flag_green_large_pixmap -
-
-wp_flag_pixmap -
-
-wp_flag_red_large_pixmap -
-
-wp_forest_large_pixmap -
-
-wp_forest_pixmap -
-
-wp_fuel_large_pixmap -
-
-wp_fuel_pixmap -
-
-wp_geocache_fnd_large_pixmap -
-
-wp_geocache_fnd_pixmap -
-
-wp_geocache_large_pixmap -
-
-wp_geocache_pixmap -
-
-wp_glider_large_pixmap -
-
-wp_golf_large_pixmap -
-
-wp_golf_pixmap -
-
-wp_grnd_trans_large_pixmap -
-
-wp_helipad_large_pixmap -
-
-wp_horn_large_pixmap -
-
-wp_horn_pixmap -
-
-wp_house_large_pixmap -
-
-wp_house_pixmap -
-
-wp_ice_skating_large_pixmap -
-
-wp_ice_skating_pixmap -
-
-wp_info_large_pixmap -
-
-wp_info_pixmap -
-
-wp_knife_large_pixmap -
-
-wp_knife_pixmap -
-
-wp_light_large_pixmap -
-
-wp_light_pixmap -
-
-wp_lodging_large_pixmap -
-
-wp_lrg_cty_large_pixmap -
-
-wp_lrg_cty_pixmap -
-
-wp_med_cty_large_pixmap -
-
-wp_med_cty_pixmap -
-
-wp_military_pixmap -
-
-wp_mine_large_pixmap -
-
-wp_mine_pixmap -
-
-wp_mob_large_pixmap -
-
-wp_mob_pixmap -
-
-wp_movie_large_pixmap -
-
-wp_mug_large_pixmap -
-
-wp_mug_pixmap -
-
-wp_museum_large_pixmap -
-
-wp_null_pixmap -
-
-wp_oil_field_large_pixmap -
-
-wp_parachute_large_pixmap -
-
-wp_park_large_pixmap -
-
-wp_park_pixmap -
-
-wp_parking_large_pixmap -
-
-wp_parking_pixmap -
-
-wp_pharmacy_large_pixmap -
-
-wp_phone_large_pixmap -
-
-wp_phone_pixmap -
-
-wp_picnic_large_pixmap -
-
-wp_picnic_pixmap -
-
-wp_pin_blue_large_pixmap -
-
-wp_pin_green_large_pixmap -
-
-wp_pin_red_large_pixmap -
-
-wp_pizza_large_pixmap -
-
-wp_police_large_pixmap -
-
-wp_post_ofc_large_pixmap -
-
-wp_rbcn_large_pixmap -
-
-wp_rbcn_pixmap -
-
-wp_restricted_large_pixmap -
-
-wp_restricted_pixmap -
-
-wp_restroom_large_pixmap -
-
-wp_restroom_pixmap -
-
-wp_rv_park_large_pixmap -
-
-wp_rv_park_pixmap -
-
-wp_scenic_large_pixmap -
-
-wp_scenic_pixmap -
-
-wp_school_large_pixmap -
-
-wp_school_pixmap -
-
-wp_shopping_large_pixmap -
-
-wp_short_tower_large_pixmap -
-
-wp_shower_large_pixmap -
-
-wp_shower_pixmap -
-
-wp_ski_resort_large_pixmap -
-
-wp_skiing_large_pixmap -
-
-wp_skiing_pixmap -
-
-wp_skull_large_pixmap -
-
-wp_skull_pixmap -
-
-wp_sml_cty_large_pixmap -
-
-wp_sml_cty_pixmap -
-
-wp_square_grn_pixmap -
-
-wp_square_red_pixmap -
-
-wp_stadium_large_pixmap -
-
-wp_store_large_pixmap -
-
-wp_summit_large_pixmap -
-
-wp_summit_pixmap -
-
-wp_swimming_large_pixmap -
-
-wp_swimming_pixmap -
-
-wp_tall_tower_large_pixmap -
-
-wp_theater_large_pixmap -
-
-wp_toll_booth_large_pixmap -
-
-wp_trail_head_large_pixmap -
-
-wp_truck_stop_large_pixmap -
-
-wp_tunnel_large_pixmap -
-
-wp_tunnel_pixmap -
-
-wp_ultralight_large_pixmap -
-
-wp_wbuoy_large_pixmap -
-
-wp_wbuoy_pixmap -
-
-wp_weigh_station_large_pixmap -
-
-wp_wpt_dot_pixmap -
-
-wp_wreck_large_pixmap -
-
-wp_wreck_pixmap -
-
-wp_wrecker_large_pixmap -
-
-wp_zoo_large_pixmap -
-
-zoom_18_pixmap -
-
-
-
-
Generated by GTK-Doc V1.24
- - \ No newline at end of file diff -Nru viking-1.6.2/doc/reference/html/deprecated-api-index.html viking-1.7/doc/reference/html/deprecated-api-index.html --- viking-1.6.2/doc/reference/html/deprecated-api-index.html 2015-12-21 12:13:48.000000000 +0000 +++ viking-1.7/doc/reference/html/deprecated-api-index.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ - - - - -Index of deprecated API: viking Reference Manual - - - - - - - - - - - - - - - -
-

-Index of deprecated API

- -
-
-
Generated by GTK-Doc V1.24
- - \ No newline at end of file diff -Nru viking-1.6.2/doc/reference/html/GoogleGotoTool.html viking-1.7/doc/reference/html/GoogleGotoTool.html --- viking-1.6.2/doc/reference/html/GoogleGotoTool.html 2015-12-21 12:13:48.000000000 +0000 +++ viking-1.7/doc/reference/html/GoogleGotoTool.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ - - - - -GoogleGotoTool: viking Reference Manual - - - - - - - - - - - - - - - - -
-
-
- - -
-

GoogleGotoTool

-

GoogleGotoTool

-
-
-

Functions

-
---- - - - - - - - - - - -
#defineGOOGLE_GOTO_TOOL_TYPE
-GoogleGotoTool * - -google_goto_tool_new () -
-
-
-

Object Hierarchy

-
    GObject
-    ╰── VikGotoTool
-        ╰── GoogleGotoTool
-
-
-
-

Description

-
-
-

Functions

-
-

GOOGLE_GOTO_TOOL_TYPE

-
#define GOOGLE_GOTO_TOOL_TYPE            (google_goto_tool_get_type ())
-
-
-
-
-

google_goto_tool_new ()

-
GoogleGotoTool *
-google_goto_tool_new ();
-
-
-
-

Types and Values

-
-
-
-
Generated by GTK-Doc V1.24
- - \ No newline at end of file Binary files /tmp/tmpt9hw1b/4g3fviQqai/viking-1.6.2/doc/reference/html/home.png and /tmp/tmpt9hw1b/iyFeQNfcF2/viking-1.7/doc/reference/html/home.png differ diff -Nru viking-1.6.2/doc/reference/html/index.html viking-1.7/doc/reference/html/index.html --- viking-1.6.2/doc/reference/html/index.html 2015-12-21 12:13:48.000000000 +0000 +++ viking-1.7/doc/reference/html/index.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,1111 +0,0 @@ - - - - -viking Reference Manual: viking Reference Manual - - - - - - - -
-
-
-
-

- for viking [VERSION]. - The latest version of this documentation can be found on-line at - http://[SERVER]/viking/. -

-
-
-
-
-
[Insert title here]
-
-
-VikDataSource -
-
-addtr_18_pixmap -
-
-addwp_18_pixmap -
-
-babel — running external programs and redirecting to TRWLayers. -
-
-babel_ui -
-
-background -
-
-bbox -
-
-begintr_18_pixmap -
-
-bing -
-
-bing_maps_pixmap -
-
-BingMapSource — the class for Bing Maps -
-
-bluemarble -
-
-clipboard -
-
-compression -
-
-config -
-
-coords -
-
-curl_download -
-
-cursor_addtr_pixmap -
-
-cursor_addwp_pixmap -
-
-cursor_begintr_pixmap -
-
-cursor_demdl_pixmap -
-
-cursor_edtr_pixmap -
-
-cursor_edwp_pixmap -
-
-cursor_geomove_pixmap -
-
-cursor_geozoom_pixmap -
-
-cursor_mapdl_pixmap -
-
-cursor_new_route_pixmap -
-
-cursor_route_finder_pixmap -
-
-cursor_ruler_pixmap -
-
-cursor_showpic_pixmap -
-
-cursor_zoom_pixmap -
-
-datasource_gps -
-
-datasources -
-
-degrees_converters -
-
-dem -
-
-demdl_18_pixmap -
-
-dems -
-
-dialog -
-
-dir -
-
-download -
-
-edtr_18_pixmap -
-
-edwp_18_pixmap -
-
-expedia -
-
-file -
-
-fileutils -
-
-garminsymbols -
-
-geojson -
-
-geomove_18_pixmap -
-
-geonames -
-
-geonamessearch -
-
-geotag_exif -
-
-geozoom_18_pixmap -
-
-glibcurl -
-
-globals -
-
-google -
-
-GoogleGotoTool -
-
-gpsmapper -
-
-gpspoint -
-
-gpx -
-
-icons -
-
-jpeg-data -
-
-jpeg-marker -
-
-jpg -
-
-kdtree -
-
-map_ids -
-
-mapcache -
-
-mapcoord -
-
-mapdl_18_pixmap -
-
-mapnik_interface -
-
-maputils — Notes about TMS / Spherical Mercator conversion -
-
-metatile -
-
-modules -
-
-mover_22_pixmap -
-
-osm -
-
-osm-traces -
-
-preferences -
-
-print -
-
-VikPrintPreview -
-
-route_finder_18_pixmap -
-
-ruler_18_pixmap -
-
-select_18_pixmap -
-
-settings -
-
-showpic_18_pixmap -
-
-strtod -
-
-terraserver -
-
-TerraserverMapSource -
-
-thumbnails -
-
-thumbnails_pixmap -
-
-toolbar -
-
-ui_util -
-
-uibuilder -
-
-util -
-
-vik_compat -
-
-vik_new_route_18_pixmap -
-
-VikAggregateLayer -
-
-vikaggregatelayer_pixmap -
-
-vikcoord -
-
-VikCoordLayer -
-
-vikcoordlayer_pixmap -
-
-vikdatetime_edit_dialog -
-
-VikDEMLayer -
-
-vikdemlayer_pixmap -
-
-GeanyEntryAction -
-
-vikenumtypes -
-
-VikExtTool -
-
-vikexttool_datasources -
-
-vikexttools -
-
-VikFileEntry -
-
-VikFileList -
-
-VikGeorefLayer -
-
-vikgeoreflayer_pixmap -
-
-VikGobjectBuilder -
-
-vikgoto -
-
-VikGotoTool -
-
-VikGotoXmlTool -
-
-VikGpsLayer -
-
-vikgpslayer_pixmap -
-
-viking_pixmap -
-
-VikLayer -
-
-viklayer_defaults -
-
-VikLayersPanel -
-
-vikmapniklayer -
-
-vikmapniklayer_pixmap -
-
-VikMapsLayer -
-
-vikmapslayer_compat -
-
-vikmapslayer_pixmap -
-
-VikMapSource — the base class to describe map source -
-
-VikMapSourceDefault — the base class implementing most of generic features -
-
-VikMapType — the adapter class to support old map source declaration -
-
-VikRadioGroup -
-
-vikrouting — the routing framework -
-
-VikRoutingEngine — the base class to describe routing engine -
-
-VikRoutingWebEngine — A generic class for WEB based routing engine -
-
-VikSlippyMapSource — the class for SlippyMap oriented map sources -
-
-VikStatusbar -
-
-VikTmsMapSource — the class for TMS oriented map sources -
-
-viktrack -
-
-VikTreeview -
-
-VikTrwLayer -
-
-viktrwlayer_analysis -
-
-viktrwlayer_export -
-
-viktrwlayer_geotag -
-
-viktrwlayer_pixmap -
-
-viktrwlayer_propwin -
-
-VikTrwLayerTpwin -
-
-viktrwlayer_tracklist -
-
-viktrwlayer_waypointlist -
-
-viktrwlayer_wpwin -
-
-vikutils -
-
-VikViewport -
-
-vikwaypoint -
-
-VikWebtool -
-
-VikWebtoolDatasource -
-
-VikWebtoolBounds -
-
-VikWebtoolCenter -
-
-VikWebtoolFormat -
-
-VikWindow -
-
-VikWmscMapSource — the class for WMS/WMS-C oriented map sources -
-
-wp_1st_aid_large_pixmap -
-
-wp_1st_aid_pixmap -
-
-wp_airplane_large_pixmap -
-
-wp_airplane_pixmap -
-
-wp_amuse_pk_large_pixmap -
-
-wp_anchor_large_pixmap -
-
-wp_anchor_pixmap -
-
-wp_ball_large_pixmap -
-
-wp_ball_pixmap -
-
-wp_beach_large_pixmap -
-
-wp_beach_pixmap -
-
-wp_bell_large_pixmap -
-
-wp_bell_pixmap -
-
-wp_bike_trail_large_pixmap -
-
-wp_block_blue_large_pixmap -
-
-wp_block_green_large_pixmap -
-
-wp_block_red_large_pixmap -
-
-wp_boat_ramp_large_pixmap -
-
-wp_boat_ramp_pixmap -
-
-wp_bowling_large_pixmap -
-
-wp_bridge_large_pixmap -
-
-wp_bridge_pixmap -
-
-wp_building_large_pixmap -
-
-wp_building_pixmap -
-
-wp_buoy_ambr_large_pixmap -
-
-wp_buoy_ambr_pixmap -
-
-wp_buoy_blck_large_pixmap -
-
-wp_buoy_blck_pixmap -
-
-wp_buoy_blue_large_pixmap -
-
-wp_buoy_blue_pixmap -
-
-wp_buoy_grn_large_pixmap -
-
-wp_buoy_grn_pixmap -
-
-wp_buoy_grn_red_large_pixmap -
-
-wp_buoy_grn_red_pixmap -
-
-wp_buoy_grn_wht_large_pixmap -
-
-wp_buoy_grn_wht_pixmap -
-
-wp_buoy_orng_large_pixmap -
-
-wp_buoy_orng_pixmap -
-
-wp_buoy_red_grn_large_pixmap -
-
-wp_buoy_red_grn_pixmap -
-
-wp_buoy_red_large_pixmap -
-
-wp_buoy_red_pixmap -
-
-wp_buoy_red_wht_large_pixmap -
-
-wp_buoy_red_wht_pixmap -
-
-wp_buoy_violet_large_pixmap -
-
-wp_buoy_violet_pixmap -
-
-wp_buoy_wht_grn_large_pixmap -
-
-wp_buoy_wht_grn_pixmap -
-
-wp_buoy_wht_large_pixmap -
-
-wp_buoy_wht_pixmap -
-
-wp_buoy_wht_red_large_pixmap -
-
-wp_buoy_wht_red_pixmap -
-
-wp_camp_large_pixmap -
-
-wp_camp_pixmap -
-
-wp_cap_cty_pixmap -
-
-wp_car_large_pixmap -
-
-wp_car_pixmap -
-
-wp_car_rental_large_pixmap -
-
-wp_car_repair_large_pixmap -
-
-wp_cemetery_large_pixmap -
-
-wp_cemetery_pixmap -
-
-wp_church_large_pixmap -
-
-wp_church_pixmap -
-
-wp_civil_large_pixmap -
-
-wp_controlled_large_pixmap -
-
-wp_controlled_pixmap -
-
-wp_conv_store_large_pixmap -
-
-wp_crossing_large_pixmap -
-
-wp_dam_large_pixmap -
-
-wp_dam_pixmap -
-
-wp_danger_large_pixmap -
-
-wp_danger_pixmap -
-
-wp_deer_large_pixmap -
-
-wp_deer_pixmap -
-
-wp_diamond_grn_pixmap -
-
-wp_diamond_red_pixmap -
-
-wp_dive1_large_pixmap -
-
-wp_dive1_pixmap -
-
-wp_dive2_large_pixmap -
-
-wp_dive2_pixmap -
-
-wp_dollar_large_pixmap -
-
-wp_dollar_pixmap -
-
-wp_dot_pixmap -
-
-wp_drinking_wtr_large_pixmap -
-
-wp_drinking_wtr_pixmap -
-
-wp_exit_large_pixmap -
-
-wp_fastfood_large_pixmap -
-
-wp_fhs_facility_large_pixmap -
-
-wp_fish_large_pixmap -
-
-wp_fish_pixmap -
-
-wp_fitness_large_pixmap -
-
-wp_flag_blue_large_pixmap -
-
-wp_flag_green_large_pixmap -
-
-wp_flag_pixmap -
-
-wp_flag_red_large_pixmap -
-
-wp_forest_large_pixmap -
-
-wp_forest_pixmap -
-
-wp_fuel_large_pixmap -
-
-wp_fuel_pixmap -
-
-wp_geocache_fnd_large_pixmap -
-
-wp_geocache_fnd_pixmap -
-
-wp_geocache_large_pixmap -
-
-wp_geocache_pixmap -
-
-wp_glider_large_pixmap -
-
-wp_golf_large_pixmap -
-
-wp_golf_pixmap -
-
-wp_grnd_trans_large_pixmap -
-
-wp_helipad_large_pixmap -
-
-wp_horn_large_pixmap -
-
-wp_horn_pixmap -
-
-wp_house_large_pixmap -
-
-wp_house_pixmap -
-
-wp_ice_skating_large_pixmap -
-
-wp_ice_skating_pixmap -
-
-wp_info_large_pixmap -
-
-wp_info_pixmap -
-
-wp_knife_large_pixmap -
-
-wp_knife_pixmap -
-
-wp_light_large_pixmap -
-
-wp_light_pixmap -
-
-wp_lodging_large_pixmap -
-
-wp_lrg_cty_large_pixmap -
-
-wp_lrg_cty_pixmap -
-
-wp_med_cty_large_pixmap -
-
-wp_med_cty_pixmap -
-
-wp_military_pixmap -
-
-wp_mine_large_pixmap -
-
-wp_mine_pixmap -
-
-wp_mob_large_pixmap -
-
-wp_mob_pixmap -
-
-wp_movie_large_pixmap -
-
-wp_mug_large_pixmap -
-
-wp_mug_pixmap -
-
-wp_museum_large_pixmap -
-
-wp_null_pixmap -
-
-wp_oil_field_large_pixmap -
-
-wp_parachute_large_pixmap -
-
-wp_park_large_pixmap -
-
-wp_park_pixmap -
-
-wp_parking_large_pixmap -
-
-wp_parking_pixmap -
-
-wp_pharmacy_large_pixmap -
-
-wp_phone_large_pixmap -
-
-wp_phone_pixmap -
-
-wp_picnic_large_pixmap -
-
-wp_picnic_pixmap -
-
-wp_pin_blue_large_pixmap -
-
-wp_pin_green_large_pixmap -
-
-wp_pin_red_large_pixmap -
-
-wp_pizza_large_pixmap -
-
-wp_police_large_pixmap -
-
-wp_post_ofc_large_pixmap -
-
-wp_rbcn_large_pixmap -
-
-wp_rbcn_pixmap -
-
-wp_restricted_large_pixmap -
-
-wp_restricted_pixmap -
-
-wp_restroom_large_pixmap -
-
-wp_restroom_pixmap -
-
-wp_rv_park_large_pixmap -
-
-wp_rv_park_pixmap -
-
-wp_scenic_large_pixmap -
-
-wp_scenic_pixmap -
-
-wp_school_large_pixmap -
-
-wp_school_pixmap -
-
-wp_shopping_large_pixmap -
-
-wp_short_tower_large_pixmap -
-
-wp_shower_large_pixmap -
-
-wp_shower_pixmap -
-
-wp_ski_resort_large_pixmap -
-
-wp_skiing_large_pixmap -
-
-wp_skiing_pixmap -
-
-wp_skull_large_pixmap -
-
-wp_skull_pixmap -
-
-wp_sml_cty_large_pixmap -
-
-wp_sml_cty_pixmap -
-
-wp_square_grn_pixmap -
-
-wp_square_red_pixmap -
-
-wp_stadium_large_pixmap -
-
-wp_store_large_pixmap -
-
-wp_summit_large_pixmap -
-
-wp_summit_pixmap -
-
-wp_swimming_large_pixmap -
-
-wp_swimming_pixmap -
-
-wp_tall_tower_large_pixmap -
-
-wp_theater_large_pixmap -
-
-wp_toll_booth_large_pixmap -
-
-wp_trail_head_large_pixmap -
-
-wp_truck_stop_large_pixmap -
-
-wp_tunnel_large_pixmap -
-
-wp_tunnel_pixmap -
-
-wp_ultralight_large_pixmap -
-
-wp_wbuoy_large_pixmap -
-
-wp_wbuoy_pixmap -
-
-wp_weigh_station_large_pixmap -
-
-wp_wpt_dot_pixmap -
-
-wp_wreck_large_pixmap -
-
-wp_wreck_pixmap -
-
-wp_wrecker_large_pixmap -
-
-wp_zoo_large_pixmap -
-
-zoom_18_pixmap -
-
-
Object Hierarchy
-
API Index
-
Index of deprecated API
-
-
-
-
Generated by GTK-Doc V1.24
- - \ No newline at end of file diff -Nru viking-1.6.2/doc/reference/html/index.sgml viking-1.7/doc/reference/html/index.sgml --- viking-1.6.2/doc/reference/html/index.sgml 2015-12-21 12:13:48.000000000 +0000 +++ viking-1.7/doc/reference/html/index.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,3837 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -