From 85859e33f3e0ec3d8efd49f8bfc26da35d94d621 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 27 Apr 2013 22:02:02 +0200 Subject: [PATCH] acinclude: better fix for pkg-config 0.28 behaviour Old pkg-config always retured a non-empty string for --cflags. It always contained at least one bogus space. New pkg-config does not do that. Do not rely on --cflags being non-empty. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4d4dad453603e6d4e9f098fa9164de43c66ee0f8 Author: Stefan Seyfried Date: 2013-04-27 (Sat, 27 Apr 2013) ------------------ This commit was generated by Migit --- acinclude.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 38323b1d9..664b0c8cd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -317,6 +317,7 @@ if $PKG_CONFIG --exists "$2" ; then AC_MSG_RESULT(yes) $1_CFLAGS=$($PKG_CONFIG --cflags "$2") $1_LIBS=$($PKG_CONFIG --libs "$2") + $1_EXISTS=yes else AC_MSG_RESULT(no) fi @@ -327,7 +328,7 @@ AC_SUBST($1_LIBS) AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG],[ _TUXBOX_APPS_LIB_PKGCONFIG($1,$2) -if test -z "$$1_CFLAGS" ; then +if test x"$$1_EXISTS" != xyes; then AC_MSG_ERROR([could not find package $2]); fi ])