blob: 1d260aa72b59da7ea5e6d906d6268296500dae13 [file] [log] [blame]
Andrew Geissler6ce62a22020-11-30 19:58:47 -06001From ebb0f7313a0931f646e86badce2627eff2fa37a8 Mon Sep 17 00:00:00 2001
Brad Bishop316dfdd2018-06-25 12:45:53 -04002From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 5 Sep 2016 22:25:44 +0100
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08004Subject: [PATCH] Use native pkg-config when looking for gtk-doc.
Patrick Williamsc0f7c042017-02-23 20:41:17 -06005
6Upstream-Status: Inappropriate
7Signed-off-by: Ross Burton <ross.burton@intel.com>
8
Brad Bishop316dfdd2018-06-25 12:45:53 -04009---
Brad Bishop15ae2502019-06-18 21:44:24 -040010 buildsystems/autotools/gtk-doc.m4 | 7 ++++++-
Brad Bishop316dfdd2018-06-25 12:45:53 -040011 1 file changed, 6 insertions(+), 1 deletion(-)
Patrick Williamsc0f7c042017-02-23 20:41:17 -060012
Brad Bishop15ae2502019-06-18 21:44:24 -040013diff --git a/buildsystems/autotools/gtk-doc.m4 b/buildsystems/autotools/gtk-doc.m4
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080014index 2d12f01..e5afc3f 100644
15--- a/buildsystems/autotools/gtk-doc.m4
16+++ b/buildsystems/autotools/gtk-doc.m4
Brad Bishop316dfdd2018-06-25 12:45:53 -040017@@ -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
Patrick Williamsc0f7c042017-02-23 20:41:17 -060021-# serial 2
22+# serial 2.1
Brad Bishop316dfdd2018-06-25 12:45:53 -040023
Patrick Williamsc0f7c042017-02-23 20:41:17 -060024 dnl Usage:
25 dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
Brad Bishop316dfdd2018-06-25 12:45:53 -040026@@ -35,11 +35,16 @@ AC_DEFUN([GTK_DOC_CHECK],
Patrick Williamsc0f7c042017-02-23 20:41:17 -060027 AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
28 AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
Brad Bishop316dfdd2018-06-25 12:45:53 -040029
Patrick Williamsc0f7c042017-02-23 20:41:17 -060030+ 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)
Brad Bishop316dfdd2018-06-25 12:45:53 -040037
Patrick Williamsc0f7c042017-02-23 20:41:17 -060038+ 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'