| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 04af15322f677db42ecc2acc465334a04de9a871 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 2 | From: Ross Burton <ross.burton@intel.com> |
| 3 | Date: Mon, 5 Sep 2016 22:25:44 +0100 |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 4 | Subject: [PATCH] Use native pkg-config when looking for gtk-doc. |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Inappropriate |
| 7 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 8 | |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 9 | --- |
| 10 | gtk-doc.m4 | 7 ++++++- |
| 11 | 1 file changed, 6 insertions(+), 1 deletion(-) |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 12 | |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 13 | diff --git a/gtk-doc.m4 b/gtk-doc.m4 |
| 14 | index 2d12f01..e5afc3f 100644 |
| 15 | --- a/buildsystems/autotools/gtk-doc.m4 |
| 16 | +++ b/buildsystems/autotools/gtk-doc.m4 |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 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 | |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 21 | -# serial 2 |
| 22 | +# serial 2.1 |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 23 | |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 24 | dnl Usage: |
| 25 | dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 26 | @@ -35,11 +35,16 @@ AC_DEFUN([GTK_DOC_CHECK], |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 27 | AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first |
| 28 | AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 29 | |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 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) |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 37 | |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 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' |