mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-02 12:07:52 +00:00
b=532621; Allow to build gnomevfs handler extension with --disable-gnomevfs
This commit is contained in:
parent
421096bdab
commit
58dbf1f774
@ -5122,6 +5122,12 @@ then
|
||||
fi
|
||||
MOZ_ENABLE_GNOMEVFS=
|
||||
])
|
||||
else
|
||||
if test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then
|
||||
PKG_CHECK_MODULES(MOZ_GNOMEVFS, gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION,[
|
||||
MOZ_GNOMEVFS_LIBS=`echo $MOZ_GNOMEVFS_LIBS | sed 's/-llinc\>//'`
|
||||
])
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_SUBST(MOZ_ENABLE_GNOMEVFS)
|
||||
@ -5755,7 +5761,7 @@ MOZ_ARG_ENABLE_STRING(extensions,
|
||||
done],
|
||||
MOZ_EXTENSIONS="$MOZ_EXTENSIONS_DEFAULT")
|
||||
|
||||
if test -z "$MOZ_ENABLE_GNOMEVFS" && test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then
|
||||
if test -z "$MOZ_ENABLE_GNOMEVFS" && test -z "$MOZ_GNOMEVFS_LIBS" && test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then
|
||||
# Suppress warning on non-X11 platforms
|
||||
if test -n "$MOZ_X11"; then
|
||||
AC_MSG_WARN([Cannot build gnomevfs without required libraries. Removing gnomevfs from MOZ_EXTENSIONS.])
|
||||
|
Loading…
x
Reference in New Issue
Block a user