From 69d2b69647564657625a6118ba911490d0cedcca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Sun, 8 Dec 2013 22:47:57 +0100 Subject: [PATCH] build: check if pkg-config is installed Also, don't check for a specific pkg-config version, since libuv doesn't use pkg-config itself --- configure.ac | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index d52be9800..af8d245c1 100644 --- a/configure.ac +++ b/configure.ac @@ -45,12 +45,11 @@ AM_CONDITIONAL([NETBSD], [AS_CASE([$host_os], [netbsd*], [true], [false])]) AM_CONDITIONAL([OPENBSD], [AS_CASE([$host_os], [openbsd*], [true], [false])]) AM_CONDITIONAL([SUNOS], [AS_CASE([$host_os], [solaris*], [true], [false])]) AM_CONDITIONAL([WINNT], [AS_CASE([$host_os], [mingw*], [true], [false])]) -PKG_PROG_PKG_CONFIG([0.20]) -AM_CONDITIONAL([HAVE_PKG_CONFIG], [test "x$PKG_CONFIG" != "x"]) -AC_SUBST(HAVE_PKG_CONFIG) PANDORA_ENABLE_DTRACE -AS_IF([test "x$PKG_CONFIG" != "x"], [ - AC_CONFIG_FILES([libuv.pc]) +AC_CHECK_PROG(PKG_CONFIG, pkg-config, yes) +AM_CONDITIONAL([HAVE_PKG_CONFIG], [test "x$PKG_CONFIG" = "xyes"]) +AS_IF([test "x$PKG_CONFIG" = "xyes"], [ + AC_CONFIG_FILES([libuv.pc]) ]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT