From 11103240008c8f334d5b9fa8d35f3641686c51ba Mon Sep 17 00:00:00 2001 From: Julien BLACHE Date: Sun, 6 Feb 2011 17:25:26 +0100 Subject: [PATCH] Explicitely check for and link against libgpg-error We use gpg-error directly, so we need to check for it and link against it explicitely; so far it's been brought in by libgcrypt. Reported by Dominic Evans . --- configure.in | 3 ++- src/Makefile.am | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 9ccda61b..052a408b 100644 --- a/configure.in +++ b/configure.in @@ -144,7 +144,8 @@ AC_CHECK_HEADER(antlr3.h, , AC_MSG_ERROR([antlr3.h not found])) AC_CHECK_LIB([antlr3c], [antlr3BaseRecognizerNew], [ANTLR3C_LIBS="-lantlr3c"], AC_MSG_ERROR([ANTLR3 C runtime (libantlr3c) not found])) AC_SUBST(ANTLR3C_LIBS) -AM_PATH_LIBGCRYPT([], , AC_MSG_ERROR([libgcrypt not found])) +AM_PATH_LIBGCRYPT([1:1.2.0], , AC_MSG_ERROR([libgcrypt not found])) +AM_PATH_GPG_ERROR([1.6], , AC_MSG_ERROR([libgpg-error not found])) if test x$use_flac = xtrue; then PKG_CHECK_MODULES(FLAC, [ flac ]) diff --git a/src/Makefile.am b/src/Makefile.am index 590da865..6378d168 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,13 +41,13 @@ forked_daapd_CPPFLAGS = -D_GNU_SOURCE \ forked_daapd_CFLAGS = \ @ZLIB_CFLAGS@ @AVAHI_CFLAGS@ @SQLITE3_CFLAGS@ @FFMPEG_CFLAGS@ \ @CONFUSE_CFLAGS@ @TAGLIB_CFLAGS@ @MINIXML_CFLAGS@ @LIBPLIST_CFLAGS@ \ - @LIBGCRYPT_CFLAGS@ @ALSA_CFLAGS@ + @LIBGCRYPT_CFLAGS@ @GPG_ERROR_CFLAGS@ @ALSA_CFLAGS@ forked_daapd_LDADD = \ @ZLIB_LIBS@ @AVAHI_LIBS@ @SQLITE3_LIBS@ @FFMPEG_LIBS@ \ @CONFUSE_LIBS@ @FLAC_LIBS@ @TAGLIB_LIBS@ @LIBEVENT_LIBS@ \ @LIBAVL_LIBS@ @MINIXML_LIBS@ @ANTLR3C_LIBS@ @LIBPLIST_LIBS@ \ - @LIBGCRYPT_LIBS@ @ALSA_LIBS@ @LIBUNISTRING@ + @LIBGCRYPT_LIBS@ @GPG_ERROR_LIBS@ @ALSA_LIBS@ @LIBUNISTRING@ forked_daapd_SOURCES = main.c \ db.c db.h \