From: Sami Kerola <kerolasa@iki.fi>
Date: Thu, 18 Aug 2016 19:30:15 +0000 (+0100)
Subject: build-sys: check pkg-config availability
X-Git-Tag: v0.88~30^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02cc68bd9d335a7e2d48316f6b094af6a1ffe9b7;p=thirdparty%2Fmtr.git

build-sys: check pkg-config availability
---

diff --git a/bootstrap.sh b/bootstrap.sh
index e05d84f..d75acc4 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-aclocal
+aclocal $ACLOCAL_OPTS
 autoheader
 automake --add-missing --copy --foreign
 autoconf
diff --git a/configure.ac b/configure.ac
index f3d2b6c..e737f54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,16 @@ CURSES_OBJ=curses.o
 
 AC_PROG_CC
 
+# Check pkg-config availability.
+m4_ifndef([PKG_PROG_PKG_CONFIG],
+  [m4_fatal(
+[Could not locate the pkg-config autoconf macros.  These are usually located
+in /usr/share/aclocal/pkg.m4.  If your macros are in a different location,
+try setting the environment variable ACLOCAL_OPTS="-I/other/macro/dir"
+before running ./bootstrap.sh again.])
+])
+PKG_PROG_PKG_CONFIG
+
 # Check bytes in types.
 AC_CHECK_SIZEOF([unsigned char], [1])
 AC_CHECK_SIZEOF([unsigned short], [2])