[totem-pl-parser] build: Check for optional libgcrypt
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem-pl-parser] build: Check for optional libgcrypt
- Date: Mon, 20 Feb 2012 00:37:45 +0000 (UTC)
commit 145065a0edfb4821844100f5f1ebcf8f0f591152
Author: Bastien Nocera <hadess hadess net>
Date: Mon Feb 20 01:30:16 2012 +0100
build: Check for optional libgcrypt
configure.in | 27 +++++++++++++++++++++++++++
totem-plparser-uninstalled.pc.in | 3 ++-
totem-plparser.pc.in | 3 ++-
3 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/configure.in b/configure.in
index ce233c1..1b8dc04 100644
--- a/configure.in
+++ b/configure.in
@@ -152,6 +152,28 @@ if test "x$enable_libarchive" != "xno" ; then
fi
AC_SUBST(ARCHIVE, $ARCHIVE)
+################################
+# Checking libgcrypt dependency
+################################
+
+AM_PATH_LIBGCRYPT([],[have_libgcrypt=yes],[have_libgcrypt=no])
+
+ARCHIVE=""
+AC_ARG_ENABLE(libgcrypt,
+ AS_HELP_STRING([--enable-libgcrypt],
+ [Enable libgcrypt support (default is auto).]),
+ [],
+ [enable_libgcrypt=auto])
+if test "x$enable_libgcrypt" != "xno" ; then
+ if test "x$enable_libgcrypt" = "xyes" -a "x$have_libgcrypt" = "xno" ; then
+ AC_MSG_ERROR([Libgcrypt support requested but not available.])
+ fi
+ if test "x$have_libgcrypt" = "xyes" ; then
+ AC_DEFINE(HAVE_LIBGCRYPT, 1, [libgcrypt available in the system])
+ use_libgcrypt=yes
+ fi
+fi
+
dnl Check for packages for building libtotem-plparser.la
PKG_CHECK_MODULES(TOTEM_PLPARSER, [$pkg_modules])
AC_SUBST(TOTEM_PLPARSER_CFLAGS)
@@ -213,6 +235,11 @@ if test "x$have_libarchive" = "xyes"; then
else
AC_MSG_NOTICE([ ISO detection with libarchive disabled])
fi
+if test "x$use_libgcrypt" = "xyes"; then
+ AC_MSG_NOTICE([** AmazonAMZ decoding with libgcrypt enabled])
+else
+ AC_MSG_NOTICE([ AmazonAMZ decoding with libgcrypt disabled])
+fi
echo "
$gmime_message
diff --git a/totem-plparser-uninstalled.pc.in b/totem-plparser-uninstalled.pc.in
index ebb0618..021fab1 100644
--- a/totem-plparser-uninstalled.pc.in
+++ b/totem-plparser-uninstalled.pc.in
@@ -11,4 +11,5 @@ Version: @VERSION@
Requires: glib-2.0 gobject-2.0 gio-2.0
Requires.private: gthread-2.0 libxml-2.0 @GMIME@ @QUVI@
Libs: ${pc_top_builddir}/${pcfiledir}/plparse/libtotem-plparser.la
-Cflags: -I${pc_top_builddir}/${pcfiledir}/plparse
+Libs.private: @LIBGCRYPT_LIBS@
+Cflags: -I${pc_top_builddir}/${pcfiledir}/plparse @LIBGCRYPT_CFLAGS@
diff --git a/totem-plparser.pc.in b/totem-plparser.pc.in
index f789063..40eab7e 100644
--- a/totem-plparser.pc.in
+++ b/totem-plparser.pc.in
@@ -11,5 +11,6 @@ Version: @VERSION@
Requires: glib-2.0 gobject-2.0 gio-2.0
Requires.private: gthread-2.0 libxml-2.0 @GMIME@ @QUVI@ @ARCHIVE@
Libs: -L${libdir} -ltotem-plparser
-Cflags: -I${includedir}/totem-pl-parser/1/plparser
+Libs.private: @LIBGCRYPT_LIBS@
+Cflags: -I${includedir}/totem-pl-parser/1/plparser @LIBGCRYPT_CFLAGS@
uselibcamel= USEGMIME@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]