28 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
28 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
29 LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ |
29 LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ |
30 diff --git a/config/system-headers b/config/system-headers |
30 diff --git a/config/system-headers b/config/system-headers |
31 --- a/config/system-headers |
31 --- a/config/system-headers |
32 +++ b/config/system-headers |
32 +++ b/config/system-headers |
33 @@ -1007,15 +1007,19 @@ libsn/sn-monitor.h |
33 @@ -1012,8 +1012,11 @@ hunspell.hxx |
34 libsn/sn-util.h |
|
35 #endif |
|
36 #if MOZ_NATIVE_HUNSPELL==1 |
|
37 hunspell.hxx |
|
38 #endif |
|
39 #if MOZ_NATIVE_BZ2==1 |
34 #if MOZ_NATIVE_BZ2==1 |
40 bzlib.h |
35 bzlib.h |
|
36 #endif |
|
37 #if MOZ_PLATFORM_MAEMO==5 |
|
38 hildon-uri.h |
|
39 hildon-mime.h |
|
40 libosso.h |
41 #endif |
41 #endif |
42 +#ifdef MOZ_ENABLE_LIBPROXY |
42 +#ifdef MOZ_ENABLE_LIBPROXY |
43 +proxy.h |
43 +proxy.h |
44 +#endif |
44 +#endif |
45 + |
|
46 #ifdef MOZ_PLATFORM_HILDON |
|
47 hildon-uri.h |
|
48 hildon-mime.h |
|
49 #endif |
|
50 #ifdef NS_OSSO |
|
51 libosso.h |
|
52 #endif |
|
53 diff --git a/configure.in b/configure.in |
45 diff --git a/configure.in b/configure.in |
54 --- a/configure.in |
46 --- a/configure.in |
55 +++ b/configure.in |
47 +++ b/configure.in |
56 @@ -5280,16 +5280,39 @@ then |
48 @@ -5289,16 +5289,39 @@ then |
57 AC_DEFINE(MOZ_ENABLE_DBUS) |
49 AC_DEFINE(MOZ_ENABLE_DBUS) |
58 fi |
50 fi |
59 fi |
51 fi |
60 AC_SUBST(MOZ_ENABLE_DBUS) |
52 AC_SUBST(MOZ_ENABLE_DBUS) |
61 AC_SUBST(MOZ_DBUS_GLIB_CFLAGS) |
53 AC_SUBST(MOZ_DBUS_GLIB_CFLAGS) |
94 |
86 |
95 MOZ_ARG_DISABLE_BOOL(libnotify, |
87 MOZ_ARG_DISABLE_BOOL(libnotify, |
96 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
88 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
97 --- a/toolkit/library/Makefile.in |
89 --- a/toolkit/library/Makefile.in |
98 +++ b/toolkit/library/Makefile.in |
90 +++ b/toolkit/library/Makefile.in |
99 @@ -247,16 +247,20 @@ endif |
91 @@ -243,16 +243,20 @@ endif |
100 ifdef MOZ_TREE_FREETYPE |
92 ifdef MOZ_TREE_FREETYPE |
101 EXTRA_DSO_LDOPTS += $(FT2_LIBS) |
93 EXTRA_DSO_LDOPTS += $(FT2_LIBS) |
102 endif |
94 endif |
103 |
95 |
104 ifdef MOZ_ENABLE_STARTUP_NOTIFICATION |
96 ifdef MOZ_ENABLE_STARTUP_NOTIFICATION |