mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

acinclude: better fix for pkg-config 0.28 behaviour

Browse Source 
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.
This commit is contained in:
Stefan Seyfried
2013-04-27 22:02:02 +02:00
parent 8381f1a8cf
commit 79184569fc
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acinclude.m4
View File

@@ -268,6 +268,7 @@ if $PKG_CONFIG --exists "$2" ; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
$1_CFLAGS=$($PKG_CONFIG --cflags "$2") $1_CFLAGS=$($PKG_CONFIG --cflags "$2")
$1_LIBS=$($PKG_CONFIG --libs "$2") $1_LIBS=$($PKG_CONFIG --libs "$2")
$1_EXISTS=yes
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
@@ -278,7 +279,7 @@ AC_SUBST($1_LIBS)
AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG],[ AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG],[
_TUXBOX_APPS_LIB_PKGCONFIG($1,$2) _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
if test -z "$$1_CFLAGS" && test -z "$$1_LIBS"; then if test x"$$1_EXISTS" != xyes; then
AC_MSG_ERROR([could not find package $2]); AC_MSG_ERROR([could not find package $2]);
fi fi
]) ])

4
configure.ac
View File

@@ -46,11 +46,11 @@ TUXBOX_APPS_LIB_CONFIG(CURL,curl-config)
TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config) TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
# TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl) # TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl)
TUXBOX_APPS_LIB_PKGCONFIG_CHECK(ID3TAG,libid3tag) TUXBOX_APPS_LIB_PKGCONFIG_CHECK(ID3TAG,libid3tag)
if test -z "$ID3TAG_CFLAGS" ; then if test x"$ID3TAG_EXISTS" != xyes; then
TUXBOX_APPS_LIB_PKGCONFIG(ID3TAG,id3tag) TUXBOX_APPS_LIB_PKGCONFIG(ID3TAG,id3tag)
fi fi
TUXBOX_APPS_LIB_PKGCONFIG_CHECK(MAD,libmad) TUXBOX_APPS_LIB_PKGCONFIG_CHECK(MAD,libmad)
if test -z "$MAD_CFLAGS" ; then if test x"$MAD_EXISTS" != xyes; then
TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad) TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad)
fi fi
TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng) TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)