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