From 9bfa78095f6090c377fb40970653d1105a343cb7 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Wed, 30 Aug 2017 11:33:58 +0200 Subject: [PATCH 3/3] Workaround autotools-utils detection of gtk-doc --- configure.ac | 3 +++ m4/guestfs_gobject.m4 | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 268e6a182..65f4231bc 100644 --- a/configure.ac +++ b/configure.ac @@ -121,6 +121,9 @@ m4_include([m4/guestfs_lua.m4]) m4_include([m4/guestfs_golang.m4]) m4_include([m4/guestfs_gobject.m4]) +dnl check for gtk-doc +GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) + dnl Bash completion. m4_include([m4/guestfs_bash_completion.m4]) diff --git a/m4/guestfs_gobject.m4 b/m4/guestfs_gobject.m4 index 4b4eab80d..4304f7b00 100644 --- a/m4/guestfs_gobject.m4 +++ b/m4/guestfs_gobject.m4 @@ -59,10 +59,3 @@ m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [ ],[ AM_CONDITIONAL([HAVE_INTROSPECTION], [false]) ]) - -# check for gtk-doc -m4_ifdef([GTK_DOC_CHECK], [ - GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) -],[ - AM_CONDITIONAL([ENABLE_GTK_DOC], false) -]) -- 2.14.1