8
|
1 |
From: Wolfgang Rosenauer <wr@rosenauer.org>
|
|
2 |
Subject: Do not build nkgnomevfs in xul app builds
|
|
3 |
References:
|
|
4 |
https://bugzilla.mozilla.org/show_bug.cgi?id=512671
|
|
5 |
|
1
|
6 |
diff --git a/configure.in b/configure.in
|
|
7 |
--- a/configure.in
|
|
8 |
+++ b/configure.in
|
|
9 |
@@ -5744,6 +5744,13 @@ if test -z "$MOZ_ENABLE_GNOMEVFS" && tes
|
|
10 |
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'`
|
|
11 |
fi
|
|
12 |
|
|
13 |
+if test ! -z "$LIBXUL_SDK_DIR" && test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then
|
|
14 |
+ if test -n "$MOZ_X11"; then
|
|
15 |
+ AC_MSG_WARN([nkgnomevfs is already part of xulrunner. Removing gnomevfs from MOZ_EXTENSIONS.])
|
|
16 |
+ fi
|
|
17 |
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'`
|
|
18 |
+fi
|
|
19 |
+
|
|
20 |
if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then
|
|
21 |
AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.])
|
|
22 |
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
|