summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <markos.chandras@imgtec.com>2013-06-21 14:41:31 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-06-23 19:45:02 (GMT)
commit953430bc4dcf7e8691252b3a60d10d6ff72db5c9 (patch)
tree795aad73aab4a0280334764ee00b718aa40c1822
parent2e0aff3b5cf2f83a3ddd31dfd572b29a8288f6be (diff)
downloadbuildroot-953430bc4dcf7e8691252b3a60d10d6ff72db5c9.tar.gz
buildroot-953430bc4dcf7e8691252b3a60d10d6ff72db5c9.tar.bz2
gvfs: Depend on libgcrypt if it is selected
gvfs can make optional use of libgcrypt so it needs to depend on it if it is selected. It's also necessary to set the ac_cv_path_LIBGCRYPT_CONFIG variable to a known value in order to prevent the AM_PATH_LIBGCRYPT macro from searching the host paths for the libgcrypt-config script. Fixes the following build problem when libgcrypt is installed on the host system but the package is not selected in buildroot: gvfsbackendafpbrowse.c:31:20: fatal error: gcrypt.h: No such file or directory Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/gvfs/gvfs.mk8
1 files changed, 8 insertions, 0 deletions
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index d99c784..6e88f6e 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -12,6 +12,10 @@ GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
GVFS_INSTALL_STAGING = YES
GVFS_DEPENDENCIES = host-pkgconf host-libglib2 libglib2 dbus shared-mime-info
+# Export ac_cv_path_LIBGCRYPT_CONFIG unconditionally to prevent
+# build system from searching the host paths.
+GVFS_CONF_ENV = ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
+
GVFS_CONF_OPT = \
--disable-gconf \
--disable-cdda \
@@ -42,6 +46,10 @@ else
GVFS_CONF_OPT += --disable-fuse
endif
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+GVFS_DEPENDENCIES += libgcrypt
+endif
+
ifeq ($(BR2_PACKAGE_LIBSOUP),y)
GVFS_DEPENDENCIES += libsoup
GVFS_CONF_OPT += --enable-http