1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
|
From: Victor Seva <vseva@debian.org>
Date: Fri, 24 Aug 2018 13:08:51 +0200
Subject: fix autotools-pkg-config-macro-not-cross-compilation-safe
See https://bugs.debian.org/884798 for details
---
configure.ac | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index e1d4415..544f20e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,11 +27,7 @@ AC_SUBST(ASSEMBLY_COMPANY)
AC_SUBST(ASSEMBLY_COPYRIGHT)
AC_SUBST(ASSEMBLY_PC)
-dnl Check for pkg-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "x$PKG_CONFIG" = "xno"; then
- AC_MSG_ERROR(['pkg-config' is not in your PATH.])
-fi
+PKG_PROG_PKG_CONFIG
dnl Check for Mono
PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= 1.0, has_mono=true, has_mono=false)
@@ -89,7 +85,7 @@ dnl Check for gtk-sharp
PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0)
AC_SUBST(GTK_SHARP_CFLAGS)
AC_SUBST(GTK_SHARP_LIBS)
-gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp-2.0`
+gtksharp_prefix=`$PKG_CONFIG --variable=prefix gtk-sharp-2.0`
AC_SUBST(gtksharp_prefix)
dnl Check for gio-sharp
@@ -142,7 +138,7 @@ if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then
doc_sources_dir=
else
enable_monodoc=yes
- doc_sources_dir="`pkg-config --variable=sourcesdir monodoc`"
+ doc_sources_dir="`$PKG_CONFIG --variable=sourcesdir monodoc`"
fi
AC_SUBST(MDASSEMBLER)
AC_SUBST(MONODOCER)
|