4 https://bugzilla.mozilla.org/show_bug.cgi?id=517655 |
4 https://bugzilla.mozilla.org/show_bug.cgi?id=517655 |
5 |
5 |
6 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
6 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
7 --- a/config/autoconf.mk.in |
7 --- a/config/autoconf.mk.in |
8 +++ b/config/autoconf.mk.in |
8 +++ b/config/autoconf.mk.in |
9 @@ -539,16 +539,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ |
9 @@ -538,16 +538,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ |
10 FT2_LIBS = @FT2_LIBS@ |
10 FT2_LIBS = @FT2_LIBS@ |
11 |
11 |
12 MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ |
12 MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ |
13 MOZ_PANGO_LIBS = @MOZ_PANGO_LIBS@ |
13 MOZ_PANGO_LIBS = @MOZ_PANGO_LIBS@ |
14 |
14 |
21 + |
21 + |
22 MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@ |
22 MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@ |
23 MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@ |
23 MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@ |
24 MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ |
24 MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ |
25 |
25 |
|
26 MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ |
|
27 |
26 GLIB_CFLAGS = @GLIB_CFLAGS@ |
28 GLIB_CFLAGS = @GLIB_CFLAGS@ |
27 GLIB_LIBS = @GLIB_LIBS@ |
29 GLIB_LIBS = @GLIB_LIBS@ |
28 GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
|
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 @@ -1013,8 +1013,11 @@ hunspell.hxx |
33 @@ -1028,8 +1028,12 @@ gio/gio.h |
34 #if MOZ_NATIVE_BZ2==1 |
34 #ifdef MOZ_ENABLE_LIBCONIC |
35 bzlib.h |
35 conic/conicconnection.h |
|
36 conic/conicconnectionevent.h |
|
37 conic/conicstatisticsevent.h |
36 #endif |
38 #endif |
37 #if MOZ_PLATFORM_MAEMO==5 |
39 #if MOZ_NATIVE_LIBEVENT==1 |
38 hildon-uri.h |
40 event.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 + |
45 diff --git a/configure.in b/configure.in |
46 diff --git a/configure.in b/configure.in |
46 --- a/configure.in |
47 --- a/configure.in |
47 +++ b/configure.in |
48 +++ b/configure.in |
48 @@ -5289,16 +5289,39 @@ then |
49 @@ -5564,16 +5564,39 @@ then |
49 AC_DEFINE(MOZ_ENABLE_DBUS) |
|
50 fi |
50 fi |
|
51 |
|
52 AC_SUBST(MOZ_ENABLE_GCONF) |
|
53 AC_SUBST(MOZ_GCONF_CFLAGS) |
|
54 AC_SUBST(MOZ_GCONF_LIBS) |
51 fi |
55 fi |
52 AC_SUBST(MOZ_ENABLE_DBUS) |
|
53 AC_SUBST(MOZ_DBUS_GLIB_CFLAGS) |
|
54 AC_SUBST(MOZ_DBUS_GLIB_LIBS) |
|
55 |
56 |
56 dnl ======================================================== |
57 dnl ======================================================== |
57 +dnl = libproxy support |
58 +dnl = libproxy support |
58 +dnl ======================================================== |
59 +dnl ======================================================== |
59 + |
60 + |
86 |
87 |
87 MOZ_ARG_DISABLE_BOOL(libnotify, |
88 MOZ_ARG_DISABLE_BOOL(libnotify, |
88 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
89 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
89 --- a/toolkit/library/Makefile.in |
90 --- a/toolkit/library/Makefile.in |
90 +++ b/toolkit/library/Makefile.in |
91 +++ b/toolkit/library/Makefile.in |
91 @@ -243,16 +243,20 @@ endif |
92 @@ -222,16 +222,20 @@ endif |
92 ifdef MOZ_TREE_FREETYPE |
93 ifdef MOZ_TREE_FREETYPE |
93 EXTRA_DSO_LDOPTS += $(FT2_LIBS) |
94 EXTRA_DSO_LDOPTS += $(FT2_LIBS) |
94 endif |
95 endif |
95 |
96 |
96 ifdef MOZ_ENABLE_STARTUP_NOTIFICATION |
97 ifdef MOZ_ENABLE_STARTUP_NOTIFICATION |
104 ifeq ($(OS_ARCH),BeOS) |
105 ifeq ($(OS_ARCH),BeOS) |
105 EXTRA_DSO_LDOPTS += -lbe -ltracker |
106 EXTRA_DSO_LDOPTS += -lbe -ltracker |
106 endif |
107 endif |
107 |
108 |
108 ifeq ($(OS_ARCH),SunOS) |
109 ifeq ($(OS_ARCH),SunOS) |
109 EXTRA_DSO_LDOPTS += -lelf -ldemangle -lCstd |
110 EXTRA_DSO_LDOPTS += -lelf -ldemangle |
110 endif |
111 endif |
111 |
112 |
112 diff --git a/toolkit/system/unixproxy/Makefile.in b/toolkit/system/unixproxy/Makefile.in |
113 diff --git a/toolkit/system/unixproxy/Makefile.in b/toolkit/system/unixproxy/Makefile.in |
113 --- a/toolkit/system/unixproxy/Makefile.in |
114 --- a/toolkit/system/unixproxy/Makefile.in |
114 +++ b/toolkit/system/unixproxy/Makefile.in |
115 +++ b/toolkit/system/unixproxy/Makefile.in |
128 # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
129 # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
129 # in which case the provisions of the GPL or the LGPL are applicable instead |
130 # in which case the provisions of the GPL or the LGPL are applicable instead |
130 # of those above. If you wish to allow use of your version of this file only |
131 # of those above. If you wish to allow use of your version of this file only |
131 # under the terms of either the GPL or the LGPL, and not to allow others to |
132 # under the terms of either the GPL or the LGPL, and not to allow others to |
132 # use your version of this file under the terms of the MPL, indicate your |
133 # use your version of this file under the terms of the MPL, indicate your |
133 @@ -53,15 +54,30 @@ LIBXUL_LIBRARY = 1 |
134 @@ -46,16 +47,30 @@ MODULE = unixproxy |
134 |
135 LIBRARY_NAME = unixproxy |
135 REQUIRES = \ |
136 |
136 xpcom \ |
137 EXPORT_LIBRARY = 1 |
137 string \ |
138 IS_COMPONENT = 1 |
138 necko \ |
139 MODULE_NAME = nsUnixProxyModule |
139 mozgnome \ |
140 GRE_MODULE = 1 |
140 $(NULL) |
141 LIBXUL_LIBRARY = 1 |
|
142 |
|
143 +EXTRA_DSO_LDOPTS += \ |
|
144 + $(MOZ_LIBPROXY_LIBS) \ |
|
145 + $(MOZ_COMPONENT_LIBS) \ |
|
146 + $(NULL) |
141 |
147 |
142 -EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) |
148 -EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) |
143 +EXTRA_DSO_LDOPTS += \ |
|
144 + $(MOZ_LIBPROXY_LIBS) \ |
|
145 + $(MOZ_COMPONENT_LIBS) \ |
|
146 + $(NULL) |
|
147 + |
|
148 +ifdef MOZ_ENABLE_LIBPROXY |
149 +ifdef MOZ_ENABLE_LIBPROXY |
149 + |
150 + |
150 +CPPSRCS = \ |
151 +CPPSRCS = \ |
151 + nsLibProxySettings.cpp \ |
152 + nsLibProxySettings.cpp \ |
152 + $(NULL) |
153 + $(NULL) |