← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/gnome-main-menu/gutsy

« back to all changes in this revision

Viewing changes to debian/patches/04_link_statically.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2007-07-05 13:57:57 UTC
  • Revision ID: james.westby@ubuntu.com-20070705135757-pnq3d3jl2dggx059
Tags: 0.9.8.svn.20070430-1ubuntu1
* Sync with Debian
* debian/control:
  - Suggests gnome-app-install before synaptic
  - the MOTU team is the Maintainer in Ubuntu
* debian/patches/01_fix_menu_path.patch:
  - patch specific to Debian
* debian/patches/03_fix_upgrade_packages.patch:
  - dropped, deprecated by the new upstream version
* debian/patches/04_link_statically.patch:
  - change not required
* debian/patches/05_binary_locations:
  - change not required
* debian/patches/06_fix_applet_conf_file.patch:
  - dropped, not required
* debian/patches/06_applet_category.patch:
  - list a category for the applet
* debian/patches/08_add_place_menu.patch:
  - dropped Debian change
* debian/patches/09_double_text.patch:
  - dropped Debian change
* debian/patches/10_default_commands.patch:
  - updated, list rhythmbox instead of banshee
*  debian/patches/11_fix_control_center.patch:
  - dropped Debian change

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_link_statically.patch
1
 
Index: slab/application-browser/src/Makefile.am
2
 
===================================================================
3
 
--- slab.orig/application-browser/src/Makefile.am       2006-06-26 16:11:48.000000000 +0200
4
 
+++ slab/application-browser/src/Makefile.am    2006-10-28 16:09:09.000000000 +0200
5
 
@@ -16,9 +16,9 @@
6
 
 
7
 
 application_browser_LDADD =                                    \
8
 
        $(APPLICATION_BROWSER_LIBS)                             \
9
 
-       $(top_builddir)/libtile/libtile.la                      \
10
 
-       $(top_builddir)/libslab/libslab.la                      \
11
 
-       $(top_builddir)/utils/libutils.la
12
 
+       $(top_builddir)/utils/.libs/libutils.a                  \
13
 
+       $(top_builddir)/libslab/.libs/libslab.a                 \
14
 
+       $(top_builddir)/libtile/.libs/libtile.a
15
 
 
16
 
 AM_CPPFLAGS =                                                  \
17
 
        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
18
 
Index: slab/control-center/src/Makefile.am
19
 
===================================================================
20
 
--- slab.orig/control-center/src/Makefile.am    2006-06-26 16:11:50.000000000 +0200
21
 
+++ slab/control-center/src/Makefile.am 2006-10-28 16:09:09.000000000 +0200
22
 
@@ -12,9 +12,9 @@
23
 
 
24
 
 control_center_LDADD =                                         \
25
 
        $(CONTROL_CENTER_LIBS)                                  \
26
 
-       $(top_builddir)/libtile/libtile.la                      \
27
 
-       $(top_builddir)/libslab/libslab.la                      \
28
 
-       $(top_builddir)/utils/libutils.la
29
 
+       $(top_builddir)/utils/.libs/libutils.a                  \
30
 
+       $(top_builddir)/libslab/.libs/libslab.a                 \
31
 
+       $(top_builddir)/libtile/.libs/libtile.a
32
 
 
33
 
 AM_CPPFLAGS =                                                  \
34
 
        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
35
 
Index: slab/main-menu/src/Makefile.am
36
 
===================================================================
37
 
--- slab.orig/main-menu/src/Makefile.am 2006-06-26 16:13:03.000000000 +0200
38
 
+++ slab/main-menu/src/Makefile.am      2006-10-28 16:09:09.000000000 +0200
39
 
@@ -33,6 +33,6 @@
40
 
 main_menu_LDADD =                                                      \
41
 
        $(MAIN_MENU_LIBS)                                               \
42
 
        $(GLADE_LIBS)                                                   \
43
 
-       $(top_builddir)/utils/libutils.la                               \
44
 
-       $(top_builddir)/libtile/libtile.la                              \
45
 
-       $(top_builddir)/libslab/libslab.la
46
 
+       $(top_builddir)/utils/.libs/libutils.a                          \
47
 
+       $(top_builddir)/libslab/.libs/libslab.a                         \
48
 
+       $(top_builddir)/libtile/.libs/libtile.a
49
 
Index: slab/application-browser/src/Makefile.in
50
 
===================================================================
51
 
--- slab.orig/application-browser/src/Makefile.in       2006-10-28 14:23:49.000000000 +0200
52
 
+++ slab/application-browser/src/Makefile.in    2006-10-28 16:09:09.000000000 +0200
53
 
@@ -54,9 +54,9 @@
54
 
 application_browser_OBJECTS = $(am_application_browser_OBJECTS)
55
 
 am__DEPENDENCIES_1 =
56
 
 application_browser_DEPENDENCIES = $(am__DEPENDENCIES_1) \
57
 
-       $(top_builddir)/libtile/libtile.la \
58
 
-       $(top_builddir)/libslab/libslab.la \
59
 
-       $(top_builddir)/utils/libutils.la
60
 
+       $(top_builddir)/utils/.libs/libutils.a \
61
 
+       $(top_builddir)/libslab/.libs/libslab.a \
62
 
+       $(top_builddir)/libtile/.libs/libtile.a
63
 
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
64
 
 depcomp = $(SHELL) $(top_srcdir)/depcomp
65
 
 am__depfiles_maybe = depfiles
66
 
@@ -268,9 +268,9 @@
67
 
 
68
 
 application_browser_LDADD = \
69
 
        $(APPLICATION_BROWSER_LIBS)                             \
70
 
-       $(top_builddir)/libtile/libtile.la                      \
71
 
-       $(top_builddir)/libslab/libslab.la                      \
72
 
-       $(top_builddir)/utils/libutils.la
73
 
+       $(top_builddir)/utils/.libs/libutils.a                  \
74
 
+       $(top_builddir)/libslab/.libs/libslab.a                 \
75
 
+       $(top_builddir)/libtile/.libs/libtile.a
76
 
 
77
 
 AM_CPPFLAGS = \
78
 
        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
79
 
Index: slab/control-center/src/Makefile.in
80
 
===================================================================
81
 
--- slab.orig/control-center/src/Makefile.in    2006-10-28 14:23:49.000000000 +0200
82
 
+++ slab/control-center/src/Makefile.in 2006-10-28 16:09:09.000000000 +0200
83
 
@@ -53,9 +53,9 @@
84
 
 control_center_OBJECTS = $(am_control_center_OBJECTS)
85
 
 am__DEPENDENCIES_1 =
86
 
 control_center_DEPENDENCIES = $(am__DEPENDENCIES_1) \
87
 
-       $(top_builddir)/libtile/libtile.la \
88
 
-       $(top_builddir)/libslab/libslab.la \
89
 
-       $(top_builddir)/utils/libutils.la
90
 
+       $(top_builddir)/utils/.libs/libutils.a \
91
 
+       $(top_builddir)/libslab/.libs/libslab.a \
92
 
+       $(top_builddir)/libtile/.libs/libtile.a
93
 
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
94
 
 depcomp = $(SHELL) $(top_srcdir)/depcomp
95
 
 am__depfiles_maybe = depfiles
96
 
@@ -263,9 +263,9 @@
97
 
 
98
 
 control_center_LDADD = \
99
 
        $(CONTROL_CENTER_LIBS)                                  \
100
 
-       $(top_builddir)/libtile/libtile.la                      \
101
 
-       $(top_builddir)/libslab/libslab.la                      \
102
 
-       $(top_builddir)/utils/libutils.la
103
 
+       $(top_builddir)/utils/.libs/libutils.a                  \
104
 
+       $(top_builddir)/libslab/.libs/libslab.a                 \
105
 
+       $(top_builddir)/libtile/.libs/libtile.a
106
 
 
107
 
 AM_CPPFLAGS = \
108
 
        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
109
 
Index: slab/main-menu/src/Makefile.in
110
 
===================================================================
111
 
--- slab.orig/main-menu/src/Makefile.in 2006-10-28 14:23:50.000000000 +0200
112
 
+++ slab/main-menu/src/Makefile.in      2006-10-28 16:09:09.000000000 +0200
113
 
@@ -60,9 +60,9 @@
114
 
 main_menu_OBJECTS = $(am_main_menu_OBJECTS)
115
 
 am__DEPENDENCIES_1 =
116
 
 main_menu_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
117
 
-       $(top_builddir)/utils/libutils.la \
118
 
-       $(top_builddir)/libtile/libtile.la \
119
 
-       $(top_builddir)/libslab/libslab.la
120
 
+       $(top_builddir)/utils/.libs/libutils.a \
121
 
+       $(top_builddir)/libslab/.libs/libslab.a \
122
 
+       $(top_builddir)/libtile/.libs/libtile.a
123
 
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
124
 
 depcomp = $(SHELL) $(top_srcdir)/depcomp
125
 
 am__depfiles_maybe = depfiles
126
 
@@ -291,9 +291,9 @@
127
 
 main_menu_LDADD = \
128
 
        $(MAIN_MENU_LIBS)                                               \
129
 
        $(GLADE_LIBS)                                                   \
130
 
-       $(top_builddir)/utils/libutils.la                               \
131
 
-       $(top_builddir)/libtile/libtile.la                              \
132
 
-       $(top_builddir)/libslab/libslab.la
133
 
+       $(top_builddir)/utils/.libs/libutils.a                          \
134
 
+       $(top_builddir)/libslab/.libs/libslab.a                         \
135
 
+       $(top_builddir)/libtile/.libs/libtile.a
136
 
 
137
 
 all: all-am
138
 
 
139
 
Index: slab/configure.in
140
 
===================================================================
141
 
--- slab.orig/configure.in      2006-06-26 16:11:39.000000000 +0200
142
 
+++ slab/configure.in   2006-10-28 16:09:09.000000000 +0200
143
 
@@ -52,7 +52,7 @@
144
 
 AC_SUBST(LIBSLAB_CFLAGS)
145
 
 AC_SUBST(LIBSLAB_LIBS)
146
 
 
147
 
-PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage ])
148
 
+PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage librsvg-2.0 ])
149
 
 
150
 
 AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, have_iwlib=yes, have_iwlib=no)], have_iwlib=no)
151
 
 
152
 
@@ -66,12 +66,12 @@
153
 
 AC_SUBST(MAIN_MENU_CFLAGS)
154
 
 AC_SUBST(MAIN_MENU_LIBS)
155
 
 
156
 
-PKG_CHECK_MODULES(APPLICATION_BROWSER, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ])
157
 
+PKG_CHECK_MODULES(APPLICATION_BROWSER, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0])
158
 
 
159
 
 AC_SUBST(APPLICATION_BROWSER_CFLAGS)
160
 
 AC_SUBST(APPLICATION_BROWSER_LIBS)
161
 
 
162
 
-PKG_CHECK_MODULES(CONTROL_CENTER, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ])
163
 
+PKG_CHECK_MODULES(CONTROL_CENTER, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0])
164
 
 
165
 
 AC_SUBST(CONTROL_CENTER_CFLAGS)
166
 
 AC_SUBST(CONTROL_CENTER_LIBS)
167
 
Index: slab/configure
168
 
===================================================================
169
 
--- slab.orig/configure 2006-10-28 14:23:46.000000000 +0200
170
 
+++ slab/configure      2006-10-28 16:09:09.000000000 +0200
171
 
@@ -24172,12 +24172,12 @@
172
 
         pkg_cv_MAIN_MENU_CFLAGS="$MAIN_MENU_CFLAGS"
173
 
     else
174
 
         if test -n "$PKG_CONFIG" && \
175
 
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage \"") >&5
176
 
-  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage ") 2>&5
177
 
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage librsvg-2.0 \"") >&5
178
 
+  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage librsvg-2.0 ") 2>&5
179
 
   ac_status=$?
180
 
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
181
 
   (exit $ac_status); }; then
182
 
-  pkg_cv_MAIN_MENU_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage " 2>/dev/null`
183
 
+  pkg_cv_MAIN_MENU_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage librsvg-2.0 " 2>/dev/null`
184
 
 else
185
 
   pkg_failed=yes
186
 
 fi
187
 
@@ -24190,12 +24190,12 @@
188
 
         pkg_cv_MAIN_MENU_LIBS="$MAIN_MENU_LIBS"
189
 
     else
190
 
         if test -n "$PKG_CONFIG" && \
191
 
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage \"") >&5
192
 
-  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage ") 2>&5
193
 
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage librsvg-2.0 \"") >&5
194
 
+  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage librsvg-2.0 ") 2>&5
195
 
   ac_status=$?
196
 
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
197
 
   (exit $ac_status); }; then
198
 
-  pkg_cv_MAIN_MENU_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage " 2>/dev/null`
199
 
+  pkg_cv_MAIN_MENU_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage librsvg-2.0 " 2>/dev/null`
200
 
 else
201
 
   pkg_failed=yes
202
 
 fi
203
 
@@ -24214,14 +24214,14 @@
204
 
         _pkg_short_errors_supported=no
205
 
 fi
206
 
         if test $_pkg_short_errors_supported = yes; then
207
 
-               MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage "`
208
 
+               MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage librsvg-2.0 "`
209
 
         else
210
 
-               MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage "`
211
 
+               MAIN_MENU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage librsvg-2.0 "`
212
 
         fi
213
 
        # Put the nasty error message in config.log where it belongs
214
 
        echo "$MAIN_MENU_PKG_ERRORS" >&5
215
 
 
216
 
-       { { echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage ) were not met:
217
 
+       { { echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage librsvg-2.0 ) were not met:
218
 
 
219
 
 $MAIN_MENU_PKG_ERRORS
220
 
 
221
 
@@ -24232,7 +24232,7 @@
222
 
 and MAIN_MENU_LIBS to avoid the need to call pkg-config.
223
 
 See the pkg-config man page for more details.
224
 
 " >&5
225
 
-echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage ) were not met:
226
 
+echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager hal-storage librsvg-2.0 ) were not met:
227
 
 
228
 
 $MAIN_MENU_PKG_ERRORS
229
 
 
230
 
@@ -24545,12 +24545,12 @@
231
 
         pkg_cv_APPLICATION_BROWSER_CFLAGS="$APPLICATION_BROWSER_CFLAGS"
232
 
     else
233
 
         if test -n "$PKG_CONFIG" && \
234
 
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu \"") >&5
235
 
-  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ") 2>&5
236
 
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0\"") >&5
237
 
+  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0") 2>&5
238
 
   ac_status=$?
239
 
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
240
 
   (exit $ac_status); }; then
241
 
-  pkg_cv_APPLICATION_BROWSER_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu " 2>/dev/null`
242
 
+  pkg_cv_APPLICATION_BROWSER_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0" 2>/dev/null`
243
 
 else
244
 
   pkg_failed=yes
245
 
 fi
246
 
@@ -24563,12 +24563,12 @@
247
 
         pkg_cv_APPLICATION_BROWSER_LIBS="$APPLICATION_BROWSER_LIBS"
248
 
     else
249
 
         if test -n "$PKG_CONFIG" && \
250
 
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu \"") >&5
251
 
-  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ") 2>&5
252
 
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0\"") >&5
253
 
+  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0") 2>&5
254
 
   ac_status=$?
255
 
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
256
 
   (exit $ac_status); }; then
257
 
-  pkg_cv_APPLICATION_BROWSER_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu " 2>/dev/null`
258
 
+  pkg_cv_APPLICATION_BROWSER_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0" 2>/dev/null`
259
 
 else
260
 
   pkg_failed=yes
261
 
 fi
262
 
@@ -24587,14 +24587,14 @@
263
 
         _pkg_short_errors_supported=no
264
 
 fi
265
 
         if test $_pkg_short_errors_supported = yes; then
266
 
-               APPLICATION_BROWSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu "`
267
 
+               APPLICATION_BROWSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0"`
268
 
         else
269
 
-               APPLICATION_BROWSER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu "`
270
 
+               APPLICATION_BROWSER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0"`
271
 
         fi
272
 
        # Put the nasty error message in config.log where it belongs
273
 
        echo "$APPLICATION_BROWSER_PKG_ERRORS" >&5
274
 
 
275
 
-       { { echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ) were not met:
276
 
+       { { echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0) were not met:
277
 
 
278
 
 $APPLICATION_BROWSER_PKG_ERRORS
279
 
 
280
 
@@ -24605,7 +24605,7 @@
281
 
 and APPLICATION_BROWSER_LIBS to avoid the need to call pkg-config.
282
 
 See the pkg-config man page for more details.
283
 
 " >&5
284
 
-echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ) were not met:
285
 
+echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0) were not met:
286
 
 
287
 
 $APPLICATION_BROWSER_PKG_ERRORS
288
 
 
289
 
@@ -24660,12 +24660,12 @@
290
 
         pkg_cv_CONTROL_CENTER_CFLAGS="$CONTROL_CENTER_CFLAGS"
291
 
     else
292
 
         if test -n "$PKG_CONFIG" && \
293
 
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu \"") >&5
294
 
-  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ") 2>&5
295
 
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0\"") >&5
296
 
+  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0") 2>&5
297
 
   ac_status=$?
298
 
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
299
 
   (exit $ac_status); }; then
300
 
-  pkg_cv_CONTROL_CENTER_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu " 2>/dev/null`
301
 
+  pkg_cv_CONTROL_CENTER_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0" 2>/dev/null`
302
 
 else
303
 
   pkg_failed=yes
304
 
 fi
305
 
@@ -24678,12 +24678,12 @@
306
 
         pkg_cv_CONTROL_CENTER_LIBS="$CONTROL_CENTER_LIBS"
307
 
     else
308
 
         if test -n "$PKG_CONFIG" && \
309
 
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu \"") >&5
310
 
-  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ") 2>&5
311
 
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0\"") >&5
312
 
+  ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0") 2>&5
313
 
   ac_status=$?
314
 
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
315
 
   (exit $ac_status); }; then
316
 
-  pkg_cv_CONTROL_CENTER_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu " 2>/dev/null`
317
 
+  pkg_cv_CONTROL_CENTER_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0" 2>/dev/null`
318
 
 else
319
 
   pkg_failed=yes
320
 
 fi
321
 
@@ -24702,14 +24702,14 @@
322
 
         _pkg_short_errors_supported=no
323
 
 fi
324
 
         if test $_pkg_short_errors_supported = yes; then
325
 
-               CONTROL_CENTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu "`
326
 
+               CONTROL_CENTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0"`
327
 
         else
328
 
-               CONTROL_CENTER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu "`
329
 
+               CONTROL_CENTER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0"`
330
 
         fi
331
 
        # Put the nasty error message in config.log where it belongs
332
 
        echo "$CONTROL_CENTER_PKG_ERRORS" >&5
333
 
 
334
 
-       { { echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ) were not met:
335
 
+       { { echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0) were not met:
336
 
 
337
 
 $CONTROL_CENTER_PKG_ERRORS
338
 
 
339
 
@@ -24720,7 +24720,7 @@
340
 
 and CONTROL_CENTER_LIBS to avoid the need to call pkg-config.
341
 
 See the pkg-config man page for more details.
342
 
 " >&5
343
 
-echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu ) were not met:
344
 
+echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 libgnomeui-2.0 libgnome-menu librsvg-2.0) were not met:
345
 
 
346
 
 $CONTROL_CENTER_PKG_ERRORS
347