Преглед на файлове

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>
Markos Chandras преди 12 години
родител
ревизия
953430bc4d
променени са 1 файла, в които са добавени 8 реда и са изтрити 0 реда
  1. 8 0
      package/gvfs/gvfs.mk

+ 8 - 0
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_INSTALL_STAGING = YES
 GVFS_DEPENDENCIES = host-pkgconf host-libglib2 libglib2 dbus shared-mime-info
 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 = \
 GVFS_CONF_OPT = \
 	--disable-gconf			\
 	--disable-gconf			\
 	--disable-cdda			\
 	--disable-cdda			\
@@ -42,6 +46,10 @@ else
 GVFS_CONF_OPT += --disable-fuse
 GVFS_CONF_OPT += --disable-fuse
 endif
 endif
 
 
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+GVFS_DEPENDENCIES += libgcrypt
+endif
+
 ifeq ($(BR2_PACKAGE_LIBSOUP),y)
 ifeq ($(BR2_PACKAGE_LIBSOUP),y)
 GVFS_DEPENDENCIES += libsoup
 GVFS_DEPENDENCIES += libsoup
 GVFS_CONF_OPT += --enable-http
 GVFS_CONF_OPT += --enable-http