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 @@ -542,16 +542,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ |
9 @@ -545,16 +545,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 |
46 event.h |
46 event.h |
47 #endif |
47 #endif |
48 diff --git a/configure.in b/configure.in |
48 diff --git a/configure.in b/configure.in |
49 --- a/configure.in |
49 --- a/configure.in |
50 +++ b/configure.in |
50 +++ b/configure.in |
51 @@ -5325,16 +5325,39 @@ then |
51 @@ -5327,16 +5327,38 @@ then |
52 AC_DEFINE(MOZ_ENABLE_DBUS) |
|
53 fi |
52 fi |
54 fi |
53 fi |
55 AC_SUBST(MOZ_ENABLE_DBUS) |
54 AC_SUBST(MOZ_ENABLE_DBUS) |
|
55 AC_SUBST(MOZ_DBUS_CFLAGS) |
|
56 AC_SUBST(MOZ_DBUS_LIBS) |
56 AC_SUBST(MOZ_DBUS_GLIB_CFLAGS) |
57 AC_SUBST(MOZ_DBUS_GLIB_CFLAGS) |
57 AC_SUBST(MOZ_DBUS_GLIB_LIBS) |
58 AC_SUBST(MOZ_DBUS_GLIB_LIBS) |
58 |
59 |
59 dnl ======================================================== |
|
60 +dnl = libproxy support |
60 +dnl = libproxy support |
61 +dnl ======================================================== |
61 +dnl ======================================================== |
62 + |
62 + |
63 +if test "$MOZ_ENABLE_GTK2" |
63 +if test "$MOZ_ENABLE_GTK2" |
64 +then |
64 +then |
77 +fi |
77 +fi |
78 +AC_SUBST(MOZ_ENABLE_LIBPROXY) |
78 +AC_SUBST(MOZ_ENABLE_LIBPROXY) |
79 +AC_SUBST(MOZ_LIBPROXY_CFLAGS) |
79 +AC_SUBST(MOZ_LIBPROXY_CFLAGS) |
80 +AC_SUBST(MOZ_LIBPROXY_LIBS) |
80 +AC_SUBST(MOZ_LIBPROXY_LIBS) |
81 + |
81 + |
82 +dnl ======================================================== |
82 dnl ======================================================== |
83 dnl = libnotify support |
83 dnl = libnotify support |
84 dnl ======================================================== |
84 dnl ======================================================== |
85 |
85 |
86 if test "$MOZ_ENABLE_GTK2" |
86 if test "$MOZ_ENABLE_GTK2" |
87 then |
87 then |
88 MOZ_ENABLE_LIBNOTIFY=1 |
88 MOZ_ENABLE_LIBNOTIFY=1 |
89 |
89 |
90 MOZ_ARG_DISABLE_BOOL(libnotify, |
|
91 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
90 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
92 --- a/toolkit/library/Makefile.in |
91 --- a/toolkit/library/Makefile.in |
93 +++ b/toolkit/library/Makefile.in |
92 +++ b/toolkit/library/Makefile.in |
94 @@ -243,16 +243,20 @@ endif |
93 @@ -243,16 +243,20 @@ endif |
95 ifdef MOZ_TREE_FREETYPE |
94 ifdef MOZ_TREE_FREETYPE |