[frogr] Added new dependency: libgcrypt (needed for OAuth)



commit d66d8be8df450ccefed35e35eeb567ec9a8ffe07
Author: Mario Sanchez Prada <msanchez igalia com>
Date:   Wed Apr 4 01:48:15 2012 +0200

    Added new dependency: libgcrypt (needed for OAuth)

 configure.ac              |    9 +++++++++
 debian/control            |    2 +-
 frogr.spec                |    1 +
 src/examples/Makefile.am  |    3 ++-
 src/flicksoup/Makefile.am |    5 +++--
 5 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1631a23..80abfe2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,15 @@ PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_MIN_VERSION)
 FROGR_CFLAGS="$FROGR_CFLAGS $LIBXML2_CFLAGS"
 FROGR_LIBS="$FROGR_LIBS $LIBXML2_LIBS"
 
+# libgcrypt does not provide a .pc file
+AM_PATH_LIBGCRYPT(,HAVE_GCRYPT=yes, HAVE_GCRYPT=no)
+if test "x$HAVE_GCRYPT" = "xno"; then
+   AC_MSG_ERROR([libgcrypt not found, please install it])
+else
+   FROGR_CFLAGS="$FROGR_CFLAGS $LIBGCRYPT_CFLAGS"
+   FROGR_LIBS="$FROGR_LIBS $LIBGCRYPT_LIBS"
+fi
+
 # Select target platform to make platform-dependant decisions
 
 if $PKG_CONFIG --exists ige-mac-integration; then
diff --git a/debian/control b/debian/control
index 6047965..badee45 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: frogr
 Section: graphics
 Priority: optional
 Maintainer: Mario Sanchez Prada <msanchez igalia com>
-Build-Depends: cdbs, intltool, debhelper (>= 5), gnome-doc-utils, libglib2.0-dev (>= 2.22), libgtk-3-dev | libgtk2.0-dev (>= 2.16), libsoup2.4-dev (>= 2.26), libsoup-gnome2.4-dev (>= 2.26), libxml2-dev (>= 2.6.8), libexif-dev (>= 0.6.14)
+Build-Depends: cdbs, intltool, debhelper (>= 5), gnome-doc-utils, libglib2.0-dev (>= 2.22), libgtk-3-dev | libgtk2.0-dev (>= 2.16), libsoup2.4-dev (>= 2.26), libsoup-gnome2.4-dev (>= 2.26), libxml2-dev (>= 2.6.8), libexif-dev (>= 0.6.14), libgcrypt-dev
 Standards-Version: 3.7.3
 Homepage: http://live.gnome.org/Frogr
 
diff --git a/frogr.spec b/frogr.spec
index 20ca271..e3bc246 100644
--- a/frogr.spec
+++ b/frogr.spec
@@ -16,6 +16,7 @@ BuildRequires:	glib2-devel > 2.22
 BuildRequires:	libsoup-devel > 2.26
 BuildRequires:	libxml2-devel > 2.6.8
 BuildRequires:	libexif-devel > 0.6.14
+BuildRequires:	libgcrypt-devel
 BuildRequires:	desktop-file-utils
 #Explicitly Requires: gvfs since we need to be able to open a web
 #browser when associating frogr with a flickr account (this is how
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 00ad6bc..6c413f9 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -20,7 +20,8 @@ example_CFLAGS = \
 example_LDADD = \
 	$(top_builddir)/src/flicksoup/libflicksoup.a \
 	$(LIBSOUP_LIBS) \
-	$(LIBXML2_LIBS)
+	$(LIBXML2_LIBS) \
+	$(LIBGCRYPT_LIBS)
 
 example_SOURCES = \
 	example.c
\ No newline at end of file
diff --git a/src/flicksoup/Makefile.am b/src/flicksoup/Makefile.am
index 044f8ba..7a8fd7d 100644
--- a/src/flicksoup/Makefile.am
+++ b/src/flicksoup/Makefile.am
@@ -13,7 +13,8 @@
 AM_CFLAGS =                      \
        -I$(top_srcdir)/src       \
        $(LIBSOUP_CFLAGS)         \
-       $(LIBXML2_CFLAGS)
+       $(LIBXML2_CFLAGS)	 \
+       $(LIBGCRYPT_CFLAGS)
 
 noinst_LIBRARIES = libflicksoup.a
 
@@ -26,4 +27,4 @@ libflicksoup_a_SOURCES =       \
        fsp-parser.c            \
        fsp-parser.h            \
        fsp-session.c           \
-       fsp-session.h
+       fsp-session.h
\ No newline at end of file



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]