oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

configure.ac: fail if libid3tag was enabled explicitly, but not found

Browse Source 
Add M4 function MPD_AUTO_PKG_LIB for pkg-config with AC_CHECK_LIB
fallback.
This commit is contained in:
Max Kellermann 2011-09-01 09:18:16 +02:00
parent e635d47912
commit a1b8806422
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -196,9 +196,9 @@ AC_ARG_ENABLE(httpd-output,
[enable_httpd_output=auto]) [enable_httpd_output=auto])
AC_ARG_ENABLE(id3, AC_ARG_ENABLE(id3,
AS_HELP_STRING([--disable-id3], AS_HELP_STRING([--enable-id3],
[disable id3 support (default: enable)]),, [disable id3 support]),,
enable_id3=yes) enable_id3=auto)
AC_ARG_ENABLE(inotify, AC_ARG_ENABLE(inotify,
AS_HELP_STRING([--disable-inotify], AS_HELP_STRING([--disable-inotify],
@ -510,13 +510,8 @@ fi
AM_CONDITIONAL(HAVE_CUE, test x$enable_cue = xyes) AM_CONDITIONAL(HAVE_CUE, test x$enable_cue = xyes)
dnl -------------------------------- libid3tag -------------------------------- dnl -------------------------------- libid3tag --------------------------------
if test x$enable_id3 = xyes; then MPD_AUTO_PKG_LIB(id3, ID3TAG, id3tag, id3tag, id3_file_open, [-lid3tag -lz], [],
PKG_CHECK_MODULES([ID3TAG], [id3tag],, [id3tag], [libid3tag not found])
AC_CHECK_LIB(id3tag, id3_file_open,
[ID3TAG_LIBS="-lid3tag -lz" ID3TAG_CFLAGS=""],
enable_id3=no))
fi
if test x$enable_id3 = xyes; then if test x$enable_id3 = xyes; then
AC_DEFINE(HAVE_ID3TAG, 1, [Define to use id3tag]) AC_DEFINE(HAVE_ID3TAG, 1, [Define to use id3tag])
fi fi

15
m4/mpd_auto.m4
View File

@ -63,3 +63,18 @@ AC_DEFUN([MPD_AUTO_PKG], [
MPD_AUTO_RESULT([$1], [$4], [$5]) MPD_AUTO_RESULT([$1], [$4], [$5])
]) ])
dnl Check with pkg-config first, fall back to AC_CHECK_LIB.
dnl
dnl Parameters: varname1, varname2, pkgname, libname, symname, libs, cflags, description, errmsg
AC_DEFUN([MPD_AUTO_PKG_LIB], [
if eval "test x`echo '$'enable_$1` != xno"; then
PKG_CHECK_MODULES([$2], [$3],
[eval "found_$1=yes"],
AC_CHECK_LIB($4, $5,
[eval "found_$1=yes $2_LIBS='$6' $2_CFLAGS='$7'"],
[eval "found_$1=no"]))
fi
MPD_AUTO_RESULT([$1], [$8], [$9])
])