diff -Nru oath-toolkit-2.6.1/debian/changelog oath-toolkit-2.6.1/debian/changelog
--- oath-toolkit-2.6.1/debian/changelog	2015-08-01 00:10:44.000000000 +0300
+++ oath-toolkit-2.6.1/debian/changelog	2018-04-15 21:19:41.000000000 +0300
@@ -1,3 +1,11 @@
+oath-toolkit (2.6.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Update gtk-doc files, fixing FTBFS with gtk-doc-tools >= 1.26.
+    (Closes: #876120)
+
+ -- Adrian Bunk <address@hidden>  Sun, 15 Apr 2018 21:19:41 +0300
+
 oath-toolkit (2.6.1-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru oath-toolkit-2.6.1/debian/patches/gtkdocize.patch oath-toolkit-2.6.1/debian/patches/gtkdocize.patch
--- oath-toolkit-2.6.1/debian/patches/gtkdocize.patch	1970-01-01 02:00:00.000000000 +0200
+++ oath-toolkit-2.6.1/debian/patches/gtkdocize.patch	2018-04-15 21:19:41.000000000 +0300
@@ -0,0 +1,909 @@
+Description: "gtkdocize --copy" with gtk-doc-tools 1.28-1
+ Fixes FTBFS with gtk-doc-tools >= 1.26.
+Author: Adrian Bunk <address@hidden>
+Bug-Debian: https://bugs.debian.org/876120
+
+--- oath-toolkit-2.6.1.orig/liboath/gtk-doc.make
++++ oath-toolkit-2.6.1/liboath/gtk-doc.make
+@@ -1,4 +1,22 @@
+ # -*- mode: makefile -*-
++#
++# gtk-doc.make - make rules for gtk-doc
++# Copyright (C) 2003 James Henstridge
++#               2004-2007 Damon Chaplin
++#               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 <http://www.gnu.org/licenses/>.
+ 
+ ####################################
+ # Everything below here is generic #
+@@ -25,6 +43,7 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+ 
+ SETUP_FILES = \
+ 	$(content_files)		\
++	$(expand_content_files)		\
+ 	$(DOC_MAIN_SGML_FILE)		\
+ 	$(DOC_MODULE)-sections.txt	\
+ 	$(DOC_MODULE)-overrides.txt
+@@ -33,9 +52,9 @@ EXTRA_DIST = 				\
+ 	$(HTML_IMAGES)			\
+ 	$(SETUP_FILES)
+ 
+-DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
++DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
+ 	html-build.stamp pdf-build.stamp \
+-	tmpl.stamp sgml.stamp html.stamp pdf.stamp
++	sgml.stamp html.stamp pdf.stamp
+ 
+ SCANOBJ_FILES = 		 \
+ 	$(DOC_MODULE).args 	 \
+@@ -49,9 +68,13 @@ REPORT_FILES = \
+ 	$(DOC_MODULE)-undeclared.txt \
+ 	$(DOC_MODULE)-unused.txt
+ 
+-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
++gtkdoc-check.test: Makefile
++	$(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
++		echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
++		chmod +x $@
++
++CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
+ 
+-if ENABLE_GTK_DOC
+ if GTK_DOC_BUILD_HTML
+ HTML_BUILD_STAMP=html-build.stamp
+ else
+@@ -63,9 +86,11 @@ else
+ PDF_BUILD_STAMP=
+ endif
+ 
+-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+-else
+-all-local:
++all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
++.PHONY: all-gtk-doc
++
++if ENABLE_GTK_DOC
++all-local: all-gtk-doc
+ endif
+ 
+ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+@@ -74,124 +99,135 @@ $(REPORT_FILES): sgml-build.stamp
+ 
+ #### setup ####
+ 
++GTK_DOC_V_SETUP=$(address@hidden@)
++GTK_DOC_V_SETUP_=$(address@hidden@)
address@hidden "  DOC   Preparing build";
++
+ setup-build.stamp:
+-	address@hidden test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+-	    echo '  DOC   Preparing build'; \
+-	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+-	    if test "x$$files" != "x" ; then \
+-	        for file in $$files ; do \
+-	            test -f $(abs_srcdir)/$$file && \
+-	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+-	        done; \
+-	    fi; \
+-	    test -d $(abs_srcdir)/tmpl && \
+-	        { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+-	        chmod -R u+w $(abs_builddir)/tmpl; } \
++	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
++	  files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
++	  if test "x$$files" != "x" ; then \
++	    for file in $$files ; do \
++	      destdir=`dirname $(abs_builddir)/$$file`; \
++	      test -d "$$destdir" || mkdir -p "$$destdir"; \
++	      test -f $(abs_srcdir)/$$file && \
++	        cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
++	    done; \
++	  fi; \
+ 	fi
+-	@touch setup-build.stamp
++	$(AM_V_at)touch setup-build.stamp
+ 
+ #### scan ####
+ 
+-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+-	@echo '  DOC   Scanning header files'
+-	@_source_dir='' ; \
++GTK_DOC_V_SCAN=$(address@hidden@)
++GTK_DOC_V_SCAN_=$(address@hidden@)
address@hidden "  DOC   Scanning header files";
++
++GTK_DOC_V_INTROSPECT=$(address@hidden@)
++GTK_DOC_V_INTROSPECT_=$(address@hidden@)
address@hidden "  DOC   Introspecting gobjects";
++
++scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
++	$(GTK_DOC_V_SCAN)_source_dir='' ; \
+ 	for i in $(DOC_SOURCE_DIR) ; do \
+-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
++	  _source_dir="$${_source_dir} --source-dir=$$i" ; \
+ 	done ; \
+ 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+-	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+-	    echo "  DOC   Introspecting gobjects"; \
+-	    scanobj_options=""; \
+-	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+-	    if test "$(?)" = "0"; then \
+-	        if test "x$(V)" = "x1"; then \
+-	            scanobj_options="--verbose"; \
+-	        fi; \
++	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
++	  scanobj_options=""; \
++	  gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
++	  if test "$$?" = "0"; then \
++	    if test "x$(V)" = "x1"; then \
++	      scanobj_options="--verbose"; \
+ 	    fi; \
+-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+-	    gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
++	  fi; \
++	  CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
++	  gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
+ 	else \
+-	    for i in $(SCANOBJ_FILES) ; do \
+-	        test -f $$i || touch $$i ; \
+-	    done \
++	  for i in $(SCANOBJ_FILES) ; do \
++	    test -f $$i || touch $$i ; \
++	  done \
+ 	fi
+-	@touch scan-build.stamp
++	$(AM_V_at)touch scan-build.stamp
+ 
+ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+ 	@true
+ 
+-#### templates ####
+-
+-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+-	@echo '  DOC   Rebuilding template files'
+-	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+-	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+-	  if test -w $(abs_srcdir) ; then \
+-	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+-	  fi \
+-	fi
+-	@touch tmpl-build.stamp
+-
+-tmpl.stamp: tmpl-build.stamp
+-	@true
+-
+-$(srcdir)/tmpl/*.sgml:
+-	@true
+-
+ #### xml ####
+ 
+-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+-	@echo '  DOC   Building XML'
+-	@-chmod -R u+w $(srcdir)
+-	@_source_dir='' ; \
++GTK_DOC_V_XML=$(address@hidden@)
++GTK_DOC_V_XML_=$(address@hidden@)
address@hidden "  DOC   Building XML";
++
++sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
++	$(GTK_DOC_V_XML)_source_dir='' ; \
+ 	for i in $(DOC_SOURCE_DIR) ; do \
+-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
++	  _source_dir="$${_source_dir} --source-dir=$$i" ; \
+ 	done ; \
+ 	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+-	@touch sgml-build.stamp
++	$(AM_V_at)touch sgml-build.stamp
+ 
+ sgml.stamp: sgml-build.stamp
+ 	@true
+ 
++$(DOC_MAIN_SGML_FILE): sgml-build.stamp
++	@true
++
++xml/gtkdocentities.ent: Makefile
++	$(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
++		echo "<!ENTITY package \"$(PACKAGE)\">"; \
++		echo "<!ENTITY package_bugreport \"$(PACKAGE_BUGREPORT)\">"; \
++		echo "<!ENTITY package_name \"$(PACKAGE_NAME)\">"; \
++		echo "<!ENTITY package_string \"$(PACKAGE_STRING)\">"; \
++		echo "<!ENTITY package_tarname \"$(PACKAGE_TARNAME)\">"; \
++		echo "<!ENTITY package_url \"$(PACKAGE_URL)\">"; \
++		echo "<!ENTITY package_version \"$(PACKAGE_VERSION)\">"; \
++	) > $@
++
+ #### html ####
+ 
+-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+-	@echo '  DOC   Building HTML'
+-	@rm -rf html
+-	@mkdir html
+-	@mkhtml_options=""; \
++GTK_DOC_V_HTML=$(address@hidden@)
++GTK_DOC_V_HTML_=$(address@hidden@)
address@hidden "  DOC   Building HTML";
++
++GTK_DOC_V_XREF=$(address@hidden@)
++GTK_DOC_V_XREF_=$(address@hidden@)
address@hidden "  DOC   Fixing cross-references";
++
++html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
++	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
++	mkhtml_options=""; \
+ 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+-	if test "$(?)" = "0"; then \
++	if test "$$?" = "0"; then \
+ 	  if test "x$(V)" = "x1"; then \
+ 	    mkhtml_options="$$mkhtml_options --verbose"; \
+ 	  fi; \
+ 	fi; \
+ 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
+-	if test "$(?)" = "0"; then \
++	if test "$$?" = "0"; then \
+ 	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
+ 	fi; \
+ 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ 	address@hidden "x$(HTML_IMAGES)" = "x" || \
+ 	for file in $(HTML_IMAGES) ; do \
+-	  if test -f $(abs_srcdir)/$$file ; then \
+-	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+-	  fi; \
+-	  if test -f $(abs_builddir)/$$file ; then \
+-	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+-	  fi; \
++	  test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
++	  test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
++	  test -f $$file && cp $$file $(abs_builddir)/html; \
+ 	done;
+-	@echo '  DOC   Fixing cross-references'
+-	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+-	@touch html-build.stamp
++	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++	$(AM_V_at)touch html-build.stamp
+ 
+ #### pdf ####
+ 
+-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+-	@echo '  DOC   Building PDF'
+-	@rm -f $(DOC_MODULE).pdf
+-	@mkpdf_options=""; \
++GTK_DOC_V_PDF=$(address@hidden@)
++GTK_DOC_V_PDF_=$(address@hidden@)
address@hidden "  DOC   Building PDF";
++
++pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
++	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
++	mkpdf_options=""; \
+ 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+-	if test "$(?)" = "0"; then \
++	if test "$$?" = "0"; then \
+ 	  if test "x$(V)" = "x1"; then \
+ 	    mkpdf_options="$$mkpdf_options --verbose"; \
+ 	  fi; \
+@@ -206,23 +242,28 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_S
+ 	  done; \
+ 	fi; \
+ 	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+-	@touch pdf-build.stamp
++	$(AM_V_at)touch pdf-build.stamp
+ 
+ ##############
+ 
+ clean-local:
+ 	@rm -f *~ *.bak
+ 	@rm -rf .libs
++	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
++	  rm -f $(DOC_MODULE).types; \
++	fi
++	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
++	  rm -f $(DOC_MODULE)-sections.txt; \
++	fi
+ 
+ distclean-local:
+ 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+ 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ 	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+-	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+-	    rm -rf tmpl; \
++	    rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
+ 	fi
+ 
+-maintainer-clean-local: clean
++maintainer-clean-local:
+ 	@rm -rf xml html
+ 
+ install-data-local:
+@@ -258,18 +299,18 @@ uninstall-local:
+ #
+ # Require gtk-doc when making dist
+ #
+-if ENABLE_GTK_DOC
+-dist-check-gtkdoc:
++if HAVE_GTK_DOC
++dist-check-gtkdoc: docs
+ else
+ dist-check-gtkdoc:
+-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
++	@echo "*** gtk-doc is needed to run 'make dist'.         ***"
++	@echo "*** gtk-doc was not found when 'configure' ran.   ***"
++	@echo "*** please install gtk-doc and rerun 'configure'. ***"
+ 	@false
+ endif
+ 
+-dist-hook: dist-check-gtkdoc dist-hook-local
+-	@mkdir $(distdir)/tmpl
++dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
+ 	@mkdir $(distdir)/html
+-	@-cp ./tmpl/*.sgml $(distdir)/tmpl
+ 	@cp ./html/* $(distdir)/html
+ 	@-cp ./$(DOC_MODULE).pdf $(distdir)/
+ 	@-cp ./$(DOC_MODULE).types $(distdir)/
+--- oath-toolkit-2.6.1.orig/liboath/m4/gtk-doc.m4
++++ oath-toolkit-2.6.1/liboath/m4/gtk-doc.m4
+@@ -1,6 +1,31 @@
+-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 <http://www.gnu.org/licenses/>.
++#
++# 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 1
++# serial 2
+ 
+ dnl Usage:
+ dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
+@@ -10,8 +35,24 @@ AC_DEFUN([GTK_DOC_CHECK],
+   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+ 
++  ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"])
++  AC_MSG_CHECKING([for gtk-doc])
++  PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no])
++  AC_MSG_RESULT($have_gtk_doc)
++
++  if test "$have_gtk_doc" = "no"; then
++      AC_MSG_WARN([
++  You will not be able to create source packages with 'make dist'
++  because $gtk_doc_requires is not found.])
++  fi
++
+   dnl check for tools we added during development
+-  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
++  dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that
++  dnl may not be writable by the user. Currently, automake requires that the
++  dnl test name must end in '.test'.
++  dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638
++  AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test])
++  AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check])
+   AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
+   AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
+ 
+@@ -28,17 +69,22 @@ AC_DEFUN([GTK_DOC_CHECK],
+                    [use gtk-doc to build documentation [[default=no]]]),,
+     [enable_gtk_doc=no])
+ 
+-  if test x$enable_gtk_doc = xyes; then
+-    ifelse([$1],[],
+-      [PKG_CHECK_EXISTS([gtk-doc],,
+-                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
+-      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
+-                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+-  fi
+-
+   AC_MSG_CHECKING([whether to build gtk-doc documentation])
+   AC_MSG_RESULT($enable_gtk_doc)
+ 
++  if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
++    AC_MSG_ERROR([
++  You must have $gtk_doc_requires installed to build documentation for
++  $PACKAGE_NAME. Please install gtk-doc or disable building the
++  documentation by adding '--disable-gtk-doc' to '[$]0'.])
++  fi
++
++  dnl don't check for glib if we build glib
++  if test "x$PACKAGE_NAME" != "xglib"; then
++    dnl don't fail if someone does not have glib
++    PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,[:])
++  fi
++
+   dnl enable/disable output formats
+   AC_ARG_ENABLE([gtk-doc-html],
+     AS_HELP_STRING([--enable-gtk-doc-html],
+@@ -53,7 +99,12 @@ AC_DEFUN([GTK_DOC_CHECK],
+     enable_gtk_doc_pdf=no
+   fi
+ 
++  if test -z "$AM_DEFAULT_VERBOSITY"; then
++    AM_DEFAULT_VERBOSITY=1
++  fi
++  AC_SUBST([AM_DEFAULT_VERBOSITY])
+ 
++  AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes])
+   AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
+   AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
+   AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
+--- oath-toolkit-2.6.1.orig/libpskc/gtk-doc.make
++++ oath-toolkit-2.6.1/libpskc/gtk-doc.make
+@@ -1,4 +1,22 @@
+ # -*- mode: makefile -*-
++#
++# gtk-doc.make - make rules for gtk-doc
++# Copyright (C) 2003 James Henstridge
++#               2004-2007 Damon Chaplin
++#               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 <http://www.gnu.org/licenses/>.
+ 
+ ####################################
+ # Everything below here is generic #
+@@ -25,6 +43,7 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+ 
+ SETUP_FILES = \
+ 	$(content_files)		\
++	$(expand_content_files)		\
+ 	$(DOC_MAIN_SGML_FILE)		\
+ 	$(DOC_MODULE)-sections.txt	\
+ 	$(DOC_MODULE)-overrides.txt
+@@ -33,9 +52,9 @@ EXTRA_DIST = 				\
+ 	$(HTML_IMAGES)			\
+ 	$(SETUP_FILES)
+ 
+-DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
++DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
+ 	html-build.stamp pdf-build.stamp \
+-	tmpl.stamp sgml.stamp html.stamp pdf.stamp
++	sgml.stamp html.stamp pdf.stamp
+ 
+ SCANOBJ_FILES = 		 \
+ 	$(DOC_MODULE).args 	 \
+@@ -49,9 +68,13 @@ REPORT_FILES = \
+ 	$(DOC_MODULE)-undeclared.txt \
+ 	$(DOC_MODULE)-unused.txt
+ 
+-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
++gtkdoc-check.test: Makefile
++	$(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
++		echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
++		chmod +x $@
++
++CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
+ 
+-if ENABLE_GTK_DOC
+ if GTK_DOC_BUILD_HTML
+ HTML_BUILD_STAMP=html-build.stamp
+ else
+@@ -63,9 +86,11 @@ else
+ PDF_BUILD_STAMP=
+ endif
+ 
+-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+-else
+-all-local:
++all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
++.PHONY: all-gtk-doc
++
++if ENABLE_GTK_DOC
++all-local: all-gtk-doc
+ endif
+ 
+ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+@@ -74,124 +99,135 @@ $(REPORT_FILES): sgml-build.stamp
+ 
+ #### setup ####
+ 
++GTK_DOC_V_SETUP=$(address@hidden@)
++GTK_DOC_V_SETUP_=$(address@hidden@)
address@hidden "  DOC   Preparing build";
++
+ setup-build.stamp:
+-	address@hidden test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+-	    echo '  DOC   Preparing build'; \
+-	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+-	    if test "x$$files" != "x" ; then \
+-	        for file in $$files ; do \
+-	            test -f $(abs_srcdir)/$$file && \
+-	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+-	        done; \
+-	    fi; \
+-	    test -d $(abs_srcdir)/tmpl && \
+-	        { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+-	        chmod -R u+w $(abs_builddir)/tmpl; } \
++	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
++	  files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
++	  if test "x$$files" != "x" ; then \
++	    for file in $$files ; do \
++	      destdir=`dirname $(abs_builddir)/$$file`; \
++	      test -d "$$destdir" || mkdir -p "$$destdir"; \
++	      test -f $(abs_srcdir)/$$file && \
++	        cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
++	    done; \
++	  fi; \
+ 	fi
+-	@touch setup-build.stamp
++	$(AM_V_at)touch setup-build.stamp
+ 
+ #### scan ####
+ 
+-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+-	@echo '  DOC   Scanning header files'
+-	@_source_dir='' ; \
++GTK_DOC_V_SCAN=$(address@hidden@)
++GTK_DOC_V_SCAN_=$(address@hidden@)
address@hidden "  DOC   Scanning header files";
++
++GTK_DOC_V_INTROSPECT=$(address@hidden@)
++GTK_DOC_V_INTROSPECT_=$(address@hidden@)
address@hidden "  DOC   Introspecting gobjects";
++
++scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
++	$(GTK_DOC_V_SCAN)_source_dir='' ; \
+ 	for i in $(DOC_SOURCE_DIR) ; do \
+-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
++	  _source_dir="$${_source_dir} --source-dir=$$i" ; \
+ 	done ; \
+ 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+-	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+-	    echo "  DOC   Introspecting gobjects"; \
+-	    scanobj_options=""; \
+-	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+-	    if test "$(?)" = "0"; then \
+-	        if test "x$(V)" = "x1"; then \
+-	            scanobj_options="--verbose"; \
+-	        fi; \
++	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
++	  scanobj_options=""; \
++	  gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
++	  if test "$$?" = "0"; then \
++	    if test "x$(V)" = "x1"; then \
++	      scanobj_options="--verbose"; \
+ 	    fi; \
+-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+-	    gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
++	  fi; \
++	  CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
++	  gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
+ 	else \
+-	    for i in $(SCANOBJ_FILES) ; do \
+-	        test -f $$i || touch $$i ; \
+-	    done \
++	  for i in $(SCANOBJ_FILES) ; do \
++	    test -f $$i || touch $$i ; \
++	  done \
+ 	fi
+-	@touch scan-build.stamp
++	$(AM_V_at)touch scan-build.stamp
+ 
+ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+ 	@true
+ 
+-#### templates ####
+-
+-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+-	@echo '  DOC   Rebuilding template files'
+-	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+-	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+-	  if test -w $(abs_srcdir) ; then \
+-	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+-	  fi \
+-	fi
+-	@touch tmpl-build.stamp
+-
+-tmpl.stamp: tmpl-build.stamp
+-	@true
+-
+-$(srcdir)/tmpl/*.sgml:
+-	@true
+-
+ #### xml ####
+ 
+-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+-	@echo '  DOC   Building XML'
+-	@-chmod -R u+w $(srcdir)
+-	@_source_dir='' ; \
++GTK_DOC_V_XML=$(address@hidden@)
++GTK_DOC_V_XML_=$(address@hidden@)
address@hidden "  DOC   Building XML";
++
++sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
++	$(GTK_DOC_V_XML)_source_dir='' ; \
+ 	for i in $(DOC_SOURCE_DIR) ; do \
+-	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
++	  _source_dir="$${_source_dir} --source-dir=$$i" ; \
+ 	done ; \
+ 	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+-	@touch sgml-build.stamp
++	$(AM_V_at)touch sgml-build.stamp
+ 
+ sgml.stamp: sgml-build.stamp
+ 	@true
+ 
++$(DOC_MAIN_SGML_FILE): sgml-build.stamp
++	@true
++
++xml/gtkdocentities.ent: Makefile
++	$(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
++		echo "<!ENTITY package \"$(PACKAGE)\">"; \
++		echo "<!ENTITY package_bugreport \"$(PACKAGE_BUGREPORT)\">"; \
++		echo "<!ENTITY package_name \"$(PACKAGE_NAME)\">"; \
++		echo "<!ENTITY package_string \"$(PACKAGE_STRING)\">"; \
++		echo "<!ENTITY package_tarname \"$(PACKAGE_TARNAME)\">"; \
++		echo "<!ENTITY package_url \"$(PACKAGE_URL)\">"; \
++		echo "<!ENTITY package_version \"$(PACKAGE_VERSION)\">"; \
++	) > $@
++
+ #### html ####
+ 
+-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+-	@echo '  DOC   Building HTML'
+-	@rm -rf html
+-	@mkdir html
+-	@mkhtml_options=""; \
++GTK_DOC_V_HTML=$(address@hidden@)
++GTK_DOC_V_HTML_=$(address@hidden@)
address@hidden "  DOC   Building HTML";
++
++GTK_DOC_V_XREF=$(address@hidden@)
++GTK_DOC_V_XREF_=$(address@hidden@)
address@hidden "  DOC   Fixing cross-references";
++
++html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
++	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
++	mkhtml_options=""; \
+ 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+-	if test "$(?)" = "0"; then \
++	if test "$$?" = "0"; then \
+ 	  if test "x$(V)" = "x1"; then \
+ 	    mkhtml_options="$$mkhtml_options --verbose"; \
+ 	  fi; \
+ 	fi; \
+ 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
+-	if test "$(?)" = "0"; then \
++	if test "$$?" = "0"; then \
+ 	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
+ 	fi; \
+ 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ 	address@hidden "x$(HTML_IMAGES)" = "x" || \
+ 	for file in $(HTML_IMAGES) ; do \
+-	  if test -f $(abs_srcdir)/$$file ; then \
+-	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+-	  fi; \
+-	  if test -f $(abs_builddir)/$$file ; then \
+-	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+-	  fi; \
++	  test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
++	  test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
++	  test -f $$file && cp $$file $(abs_builddir)/html; \
+ 	done;
+-	@echo '  DOC   Fixing cross-references'
+-	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+-	@touch html-build.stamp
++	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++	$(AM_V_at)touch html-build.stamp
+ 
+ #### pdf ####
+ 
+-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+-	@echo '  DOC   Building PDF'
+-	@rm -f $(DOC_MODULE).pdf
+-	@mkpdf_options=""; \
++GTK_DOC_V_PDF=$(address@hidden@)
++GTK_DOC_V_PDF_=$(address@hidden@)
address@hidden "  DOC   Building PDF";
++
++pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
++	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
++	mkpdf_options=""; \
+ 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+-	if test "$(?)" = "0"; then \
++	if test "$$?" = "0"; then \
+ 	  if test "x$(V)" = "x1"; then \
+ 	    mkpdf_options="$$mkpdf_options --verbose"; \
+ 	  fi; \
+@@ -206,23 +242,28 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_S
+ 	  done; \
+ 	fi; \
+ 	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+-	@touch pdf-build.stamp
++	$(AM_V_at)touch pdf-build.stamp
+ 
+ ##############
+ 
+ clean-local:
+ 	@rm -f *~ *.bak
+ 	@rm -rf .libs
++	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
++	  rm -f $(DOC_MODULE).types; \
++	fi
++	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
++	  rm -f $(DOC_MODULE)-sections.txt; \
++	fi
+ 
+ distclean-local:
+ 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+ 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ 	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+-	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+-	    rm -rf tmpl; \
++	    rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
+ 	fi
+ 
+-maintainer-clean-local: clean
++maintainer-clean-local:
+ 	@rm -rf xml html
+ 
+ install-data-local:
+@@ -258,18 +299,18 @@ uninstall-local:
+ #
+ # Require gtk-doc when making dist
+ #
+-if ENABLE_GTK_DOC
+-dist-check-gtkdoc:
++if HAVE_GTK_DOC
++dist-check-gtkdoc: docs
+ else
+ dist-check-gtkdoc:
+-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
++	@echo "*** gtk-doc is needed to run 'make dist'.         ***"
++	@echo "*** gtk-doc was not found when 'configure' ran.   ***"
++	@echo "*** please install gtk-doc and rerun 'configure'. ***"
+ 	@false
+ endif
+ 
+-dist-hook: dist-check-gtkdoc dist-hook-local
+-	@mkdir $(distdir)/tmpl
++dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
+ 	@mkdir $(distdir)/html
+-	@-cp ./tmpl/*.sgml $(distdir)/tmpl
+ 	@cp ./html/* $(distdir)/html
+ 	@-cp ./$(DOC_MODULE).pdf $(distdir)/
+ 	@-cp ./$(DOC_MODULE).types $(distdir)/
+--- oath-toolkit-2.6.1.orig/libpskc/m4/gtk-doc.m4
++++ oath-toolkit-2.6.1/libpskc/m4/gtk-doc.m4
+@@ -1,6 +1,31 @@
+-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 <http://www.gnu.org/licenses/>.
++#
++# 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 1
++# serial 2
+ 
+ dnl Usage:
+ dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
+@@ -10,8 +35,24 @@ AC_DEFUN([GTK_DOC_CHECK],
+   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+ 
++  ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"])
++  AC_MSG_CHECKING([for gtk-doc])
++  PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no])
++  AC_MSG_RESULT($have_gtk_doc)
++
++  if test "$have_gtk_doc" = "no"; then
++      AC_MSG_WARN([
++  You will not be able to create source packages with 'make dist'
++  because $gtk_doc_requires is not found.])
++  fi
++
+   dnl check for tools we added during development
+-  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
++  dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that
++  dnl may not be writable by the user. Currently, automake requires that the
++  dnl test name must end in '.test'.
++  dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638
++  AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test])
++  AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check])
+   AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
+   AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
+ 
+@@ -28,17 +69,22 @@ AC_DEFUN([GTK_DOC_CHECK],
+                    [use gtk-doc to build documentation [[default=no]]]),,
+     [enable_gtk_doc=no])
+ 
+-  if test x$enable_gtk_doc = xyes; then
+-    ifelse([$1],[],
+-      [PKG_CHECK_EXISTS([gtk-doc],,
+-                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
+-      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
+-                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+-  fi
+-
+   AC_MSG_CHECKING([whether to build gtk-doc documentation])
+   AC_MSG_RESULT($enable_gtk_doc)
+ 
++  if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
++    AC_MSG_ERROR([
++  You must have $gtk_doc_requires installed to build documentation for
++  $PACKAGE_NAME. Please install gtk-doc or disable building the
++  documentation by adding '--disable-gtk-doc' to '[$]0'.])
++  fi
++
++  dnl don't check for glib if we build glib
++  if test "x$PACKAGE_NAME" != "xglib"; then
++    dnl don't fail if someone does not have glib
++    PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,[:])
++  fi
++
+   dnl enable/disable output formats
+   AC_ARG_ENABLE([gtk-doc-html],
+     AS_HELP_STRING([--enable-gtk-doc-html],
+@@ -53,7 +99,12 @@ AC_DEFUN([GTK_DOC_CHECK],
+     enable_gtk_doc_pdf=no
+   fi
+ 
++  if test -z "$AM_DEFAULT_VERBOSITY"; then
++    AM_DEFAULT_VERBOSITY=1
++  fi
++  AC_SUBST([AM_DEFAULT_VERBOSITY])
+ 
++  AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes])
+   AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
+   AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
+   AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
diff -Nru oath-toolkit-2.6.1/debian/patches/series oath-toolkit-2.6.1/debian/patches/series
--- oath-toolkit-2.6.1/debian/patches/series	1970-01-01 02:00:00.000000000 +0200
+++ oath-toolkit-2.6.1/debian/patches/series	2018-04-15 21:19:41.000000000 +0300
@@ -0,0 +1 @@
+gtkdocize.patch