author | Wolfgang Rosenauer <wr@rosenauer.org> |
Wed, 09 Jun 2010 21:28:04 +0200 | |
changeset 83 | d06e40a1d7de |
parent 78 | e0271a18500f |
permissions | -rw-r--r-- |
78
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
diff --git a/configure.in b/configure.in |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
--- a/configure.in |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
+++ b/configure.in |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
@@ -5760,24 +5760,26 @@ fi |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
AC_SUBST(MOZ_IPDL_TESTS) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
dnl ======================================================== |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
dnl = Disable plugin support |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
dnl ======================================================== |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
MOZ_ARG_DISABLE_BOOL(plugins, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
[ --disable-plugins Disable plugins support], |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
- MOZ_PLUGINS=,) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
+ MOZ_PLUGINS=, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
+ MOZ_PLUGINS=1) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
dnl ======================================================== |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
dnl = Disable building dbm |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
dnl ======================================================== |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
MOZ_ARG_DISABLE_BOOL(dbm, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
[ --disable-dbm Disable building dbm], |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
- NSS_DISABLE_DBM=1,) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
+ NSS_DISABLE_DBM=1, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
+ NSS_DISABLE_DBM=) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
dnl bi-directional support always on |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
IBMBIDI=1 |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
AC_DEFINE(IBMBIDI) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
29 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
30 |
dnl ======================================================== |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
31 |
dnl view source support on by default |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
32 |
dnl ======================================================== |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
33 |
@@ -5817,17 +5819,18 @@ if test "$MOZ_JSLOADER"; then |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
34 |
AC_DEFINE(MOZ_JSLOADER) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
35 |
fi |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
36 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
37 |
dnl ======================================================== |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
38 |
dnl Disable printing |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
39 |
dnl ======================================================== |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
40 |
MOZ_ARG_DISABLE_BOOL(printing, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
41 |
[ --disable-printing Disable printing support], |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
42 |
- NS_PRINTING=,) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
43 |
+ NS_PRINTING=, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
44 |
+ NS_PRINTING=1) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
45 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
46 |
if test "$MOZ_WIDGET_TOOLKIT" = "qt"; then |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
47 |
AC_MSG_WARN([Printing does not work with Qt at this time. Omitting printing support.]) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
48 |
NS_PRINTING= |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
49 |
fi |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
50 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
51 |
if test "$NS_PRINTING"; then |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
52 |
AC_DEFINE(NS_PRINTING) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
53 |
@@ -5876,17 +5879,18 @@ if test -n "$MOZ_NO_FAST_LOAD"; then |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
54 |
AC_DEFINE(MOZ_NO_FAST_LOAD) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
55 |
fi |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
56 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
57 |
dnl ======================================================== |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
58 |
dnl = Disable Ogg Codecs |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
59 |
dnl ======================================================== |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
60 |
MOZ_ARG_DISABLE_BOOL(ogg, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
61 |
[ --disable-ogg Disable support for OGG media (Theora video and Vorbis audio)], |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
62 |
- MOZ_OGG=,) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
63 |
+ MOZ_OGG=, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
64 |
+ MOZ_OGG=1) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
65 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
66 |
if test -n "$MOZ_OGG"; then |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
67 |
AC_DEFINE(MOZ_OGG) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
68 |
MOZ_SYDNEYAUDIO=1 |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
69 |
MOZ_MEDIA=1 |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
70 |
MOZ_VORBIS=1 |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
71 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
72 |
dnl Checks for __attribute__(aligned()) directive |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
73 |
@@ -5967,17 +5971,18 @@ if test -n "$MOZ_WEBM"; then |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
74 |
fi |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
75 |
fi |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
76 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
77 |
dnl ======================================================== |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
78 |
dnl = Disable Wave decoder support |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
79 |
dnl ======================================================== |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
80 |
MOZ_ARG_DISABLE_BOOL(wave, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
81 |
[ --disable-wave Disable Wave decoder support], |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
82 |
- MOZ_WAVE=,) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
83 |
+ MOZ_WAVE=, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
84 |
+ MOZ_WAVE=1) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
85 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
86 |
if test -n "$MOZ_WAVE"; then |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
87 |
AC_DEFINE(MOZ_WAVE) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
88 |
MOZ_SYDNEYAUDIO=1 |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
89 |
MOZ_MEDIA=1 |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
90 |
fi |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
91 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
92 |
dnl ======================================================== |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
93 |
@@ -6077,17 +6082,18 @@ case "${target}" in |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
94 |
*-wince*) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
95 |
MOZ_JAVAXPCOM= |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
96 |
;; |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
97 |
esac |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
98 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
99 |
MOZ_ARG_ENABLE_BOOL(javaxpcom, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
100 |
[ --enable-javaxpcom |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
101 |
Enable Java-XPCOM bridge], |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
102 |
- MOZ_JAVAXPCOM=1,) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
103 |
+ MOZ_JAVAXPCOM=1, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
104 |
+ MOZ_JAVAXPCOM=) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
105 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
106 |
case "$host_os" in |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
107 |
cygwin*|msvc*|mks*) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
108 |
if test -n "$JAVA_HOME"; then |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
109 |
JAVA_HOME=`cygpath -u \`cygpath -m -s "$JAVA_HOME"\`` |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
110 |
fi |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
111 |
;; |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
112 |
*mingw*) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
113 |
@@ -6154,17 +6160,18 @@ i?86-*-linux*|x86_64-*-linux*|arm-*-linu |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
114 |
;; |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
115 |
*solaris*) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
116 |
MOZ_CRASHREPORTER=1 |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
117 |
;; |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
118 |
esac |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
119 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
120 |
MOZ_ARG_DISABLE_BOOL(crashreporter, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
121 |
[ --disable-crashreporter Disable breakpad crash reporting], |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
122 |
- MOZ_CRASHREPORTER=,) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
123 |
+ MOZ_CRASHREPORTER=, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
124 |
+ MOZ_CRASHREPORTER=1) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
125 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
126 |
if test -n "$MOZ_CRASHREPORTER"; then |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
127 |
AC_DEFINE(MOZ_CRASHREPORTER) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
128 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
129 |
if (test "$OS_ARCH" = "Linux" || test "$OS_ARCH" = "SunOS") && \ |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
130 |
test -z "$SKIP_LIBRARY_CHECKS"; then |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
131 |
PKG_CHECK_MODULES(MOZ_GTHREAD, gthread-2.0) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
132 |
AC_SUBST(MOZ_GTHREAD_CFLAGS) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
133 |
@@ -6431,17 +6438,18 @@ dnl ==================================== |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
134 |
case "$target_os" in |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
135 |
aix*|solaris*|linux*|msvc*|mks*|cygwin*|mingw*|os2*|wince*|winmo*) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
136 |
MOZ_INSTALLER=1 |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
137 |
;; |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
138 |
esac |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
139 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
140 |
MOZ_ARG_DISABLE_BOOL(installer, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
141 |
[ --disable-installer Disable building of installer], |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
142 |
- MOZ_INSTALLER=,) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
143 |
+ MOZ_INSTALLER=, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
144 |
+ MOZ_INSTALLER=1) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
145 |
if test -n "$MOZ_INSTALLER" -a "$OS_ARCH" = "WINNT"; then |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
146 |
# Disable installer for Windows builds that use the new toolkit if NSIS |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
147 |
# isn't in the path. |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
148 |
MOZ_PATH_PROGS(MAKENSIS, makensis) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
149 |
if test -z "$MAKENSIS" || test "$MAKENSIS" = ":"; then |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
150 |
AC_MSG_ERROR([To build the installer makensis is required in your path. To build without the installer reconfigure using --disable-installer.]) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
151 |
fi |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
152 |
# The Windows build for NSIS requires the iconv command line utility to |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
153 |
@@ -8482,17 +8490,18 @@ if test "$NECKO_DISK_CACHE"; then |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
154 |
AC_DEFINE(NECKO_DISK_CACHE) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
155 |
fi |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
156 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
157 |
dnl |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
158 |
dnl option to disable necko's wifi scanner |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
159 |
dnl |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
160 |
MOZ_ARG_DISABLE_BOOL(necko-wifi, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
161 |
[ --disable-necko-wifi Disable necko wifi scanner], |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
162 |
- NECKO_WIFI=,) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
163 |
+ NECKO_WIFI=, |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
164 |
+ NECKO_WIFI=1) |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
165 |
|
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
166 |
if test "$OS_ARCH" = "OS2"; then |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
167 |
dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566 |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
168 |
NECKO_WIFI= |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
169 |
fi |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
170 |
if test "$NECKO_WIFI" -a \ |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
171 |
"$OS_ARCH" != "Linux" -a \ |
e0271a18500f
mozilla-xulrunner193: initial compiling version (not all patches rebased yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
172 |
"$OS_ARCH" != "Darwin" -a \ |