| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 1 | Use native pkg-config when looking for gtk-doc. |
| 2 | |
| 3 | Upstream-Status: Inappropriate |
| 4 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 5 | |
| 6 | diff --git a/gtk-doc.m4 b/gtk-doc.m4 |
| 7 | index 3675543..94881ae 100644 |
| 8 | --- a/gtk-doc.m4 |
| 9 | +++ b/gtk-doc.m4 |
| 10 | @@ -1,6 +1,6 @@ |
| 11 | dnl -*- mode: autoconf -*- |
| 12 | |
| 13 | -# serial 2 |
| 14 | +# serial 2.1 |
| 15 | |
| 16 | dnl Usage: |
| 17 | dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) |
| 18 | @@ -10,11 +10,16 @@ AC_DEFUN([GTK_DOC_CHECK], |
| 19 | AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first |
| 20 | AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first |
| 21 | |
| 22 | + gtkdoc_pkgconfig_save=$PKG_CONFIG |
| 23 | + PKG_CONFIG=pkg-config-native |
| 24 | + |
| 25 | ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) |
| 26 | AC_MSG_CHECKING([for gtk-doc]) |
| 27 | PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) |
| 28 | AC_MSG_RESULT($have_gtk_doc) |
| 29 | |
| 30 | + PKG_CONFIG=$gtkdoc_pkgconfig_save |
| 31 | + |
| 32 | if test "$have_gtk_doc" = "no"; then |
| 33 | AC_MSG_WARN([ |
| 34 | You will not be able to create source packages with 'make dist' |