1From a3f69f2ed45efbdaee47c2dde4df3d78323300e5 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 5 Sep 2016 22:25:44 +0100
4Subject: [PATCH] Use native pkg-config when looking for gtk-doc.
5
6Upstream-Status: Inappropriate
7Signed-off-by: Ross Burton <ross.burton@intel.com>
8
9---
10 buildsystems/autotools/gtk-doc.m4 | 7 ++++++-
11 1 file changed, 6 insertions(+), 1 deletion(-)
12
13diff --git a/buildsystems/autotools/gtk-doc.m4 b/buildsystems/autotools/gtk-doc.m4
14index 2d12f01..e5afc3f 100644
15--- a/buildsystems/autotools/gtk-doc.m4
16+++ b/buildsystems/autotools/gtk-doc.m4
17@@ -25,7 +25,7 @@
18 # Macro appear in them. The GNU General Public License (GPL) does govern
19 # all other use of the material that constitutes the Autoconf Macro.
20
21-# serial 2
22+# serial 2.1
23
24 dnl Usage:
25 dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
26@@ -35,11 +35,16 @@ AC_DEFUN([GTK_DOC_CHECK],
27   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
28   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
29
30+  gtkdoc_pkgconfig_save=$PKG_CONFIG
31+  PKG_CONFIG=pkg-config-native
32+
33   ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"])
34   AC_MSG_CHECKING([for gtk-doc])
35   PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no])
36   AC_MSG_RESULT($have_gtk_doc)
37
38+  PKG_CONFIG=$gtkdoc_pkgconfig_save
39+
40   if test "$have_gtk_doc" = "no"; then
41       AC_MSG_WARN([
42   You will not be able to create source packages with 'make dist'
43