summaryrefslogtreecommitdiff
blob: 004d4e65b4888ecf02467c5bc0c32ba44ed81ae6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
diff -ru gnome-python-desktop-2.20.0.orig/configure.ac gnome-python-desktop-2.20.0/configure.ac
--- gnome-python-desktop-2.20.0.orig/configure.ac	2007-09-16 08:35:54.000000000 -0400
+++ gnome-python-desktop-2.20.0/configure.ac	2008-01-16 13:18:33.000000000 -0500
@@ -45,6 +45,18 @@
 AC_DEFINE(GNOME_PYTHON_DESKTOP_MICRO_VERSION, gnome_python_desktop_micro_version,
                                             [Gnome-Python-Desktop macro version])
 
+dnl AC_ARG_BINDING(NAME, DEFAULT [, MODULENAME])
+AC_DEFUN(AC_ARG_BINDING,
+[AC_ARG_ENABLE([$1],
+             AC_HELP_STRING([--ifelse([$2], [YES], dis, en)able-[$1]],
+                            [build ifelse([$3], , [$1], [$3]) bindings (default is [$2])]),
+             [if test "$enable_[$1]" = "yes"; then 
+	     	build_[$1]=true
+	      else
+	      	build_[$1]=false
+	      fi])
+])
+
 GNOME_COMMON_INIT
 
 AC_DISABLE_STATIC
@@ -104,29 +116,60 @@
   GTK_LIBS=`echo $GTK_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
+AC_ARG_ENABLE([gtk-doc],
+             AC_HELP_STRING([--disable-gtk-doc],
+                            [Disables gtk-doc documentation generation]),,
+		[enable_gtk_doc="yes"])
+AM_CONDITIONAL(BUILD_DOCS, [test "$enable_gtk_doc" = "yes"])
+
+dnl default bindings to build:
+default_bindings_on="applet gnomeprint gnomeprintui gtksourceview wnck totem_plparser gtop nautilusburn mediaprofiles rsvg gnomekeyring gnomedesktop bugbuddy metacity"
+default_bindings_off="metacity"
+default_bindings_all="$default_bindings_on $default_bindings_off"
+
+AC_ARG_ENABLE([allbindings],
+             AC_HELP_STRING([--disable-allbindings],
+                            [Changes all the bindings default values to be either enabled or disabled, overridden by any explicit bindings on the commandline.]),
+             [if test "$enable_allbindings" = "no"; then
+	     	default_bindings_off="$default_bindings_all"
+		default_bindings_on=""
+	      else
+	     	default_bindings_off=""
+		default_bindings_on="$default_bindings_all"
+	      fi])
+for binding in $default_bindings_on; do
+	eval build_$binding=true
+done
+for binding in $default_bindings_off; do
+	eval build_$binding=false
+done
 
 dnl should we build the gnome.applet module?
-build_applet=false
-PKG_CHECK_MODULES(LIBPANELAPPLET, [libpanelapplet-2.0 >= libpanelapplet_required_version
-                                   gnome-python-2.0 >= gnome_python_required_version],
-  build_applet=true,
-  build_applet=false)
+AC_ARG_BINDING([applet],[YES],[gnome.applet])
+if $build_applet; then
+	PKG_CHECK_MODULES(LIBPANELAPPLET, [libpanelapplet-2.0 >= libpanelapplet_required_version
+					   gnome-python-2.0 >= gnome_python_required_version],
+	  build_applet=true,
+	  build_applet=false)
+fi
 AC_SUBST(LIBPANELAPPLET_CFLAGS)
 AC_SUBST(LIBPANELAPPLET_LIBS)
-AM_CONDITIONAL(BUILD_APPLET, $build_applet)
 if test -n "$export_dynamic"; then
   LIBPANELAPPLET_LIBS=`echo $LIBPANELAPPLET_LIBS | sed -e "s/$export_dynamic//"`
 fi
+AM_CONDITIONAL(BUILD_APPLET, $build_applet)
 
 
 
 
 dnl should we build the gnomeprint module?
-build_gnomeprint=false
-PKG_CHECK_MODULES(LIBGNOMEPRINT, [libgnomeprint-2.2 >= libgnomeprint_required_version
-                                 gnome-python-2.0 >= gnome_python_required_version],
-  build_gnomeprint=true,
-  build_gnomeprint=false)
+AC_ARG_BINDING([gnomeprint],[YES])
+if $build_gnomeprint; then
+	PKG_CHECK_MODULES(LIBGNOMEPRINT, [libgnomeprint-2.2 >= libgnomeprint_required_version
+					 gnome-python-2.0 >= gnome_python_required_version],
+	  build_gnomeprint=true,
+	  build_gnomeprint=false)
+fi
 AC_SUBST(LIBGNOMEPRINT_CFLAGS)
 AC_SUBST(LIBGNOMEPRINT_LIBS)
 AM_CONDITIONAL(BUILD_GNOMEPRINT, $build_gnomeprint)
@@ -146,11 +189,13 @@
 AC_SUBST(PYGNOMEPRINT_DEFS)
 
 dnl should we build the gnomeprint.ui module?
-build_gnomeprintui=false
-PKG_CHECK_MODULES(LIBGNOMEPRINTUI, [libgnomeprintui-2.2 >= libgnomeprintui_required_version,
-                                   gnome-python-2.0 >= gnome_python_required_version],
-  build_gnomeprintui=true,
-  build_gnomeprintui=false)
+AC_ARG_BINDING([gnomeprintui],[YES],[gnomeprint.ui])
+if $build_gnomeprintui; then
+	PKG_CHECK_MODULES(LIBGNOMEPRINTUI, [libgnomeprintui-2.2 >= libgnomeprintui_required_version,
+					   gnome-python-2.0 >= gnome_python_required_version],
+	  build_gnomeprintui=true,
+	  build_gnomeprintui=false)
+fi
 AC_SUBST(LIBGNOMEPRINTUI_CFLAGS)
 AC_SUBST(LIBGNOMEPRINTUI_LIBS)
 AM_CONDITIONAL(BUILD_GNOMEPRINTUI, $build_gnomeprintui)
@@ -159,10 +204,12 @@
 fi
 
 dnl should we build the gtksourceview module?
-build_gtksourceview=false
-PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-1.0 >= gtksourceview_required_version,
-  build_gtksourceview=true,
-  build_gtksourceview=false)
+AC_ARG_BINDING([gtksourceview],[YES])
+if $build_gtksourceview; then
+	PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-1.0 >= gtksourceview_required_version,
+	  build_gtksourceview=true,
+	  build_gtksourceview=false)
+fi
 AM_CONDITIONAL(BUILD_GTKSOURCEVIEW, $build_gtksourceview)
 if test -n "$export_dynamic"; then
   GTKSOURCEVIEW_LIBS=`echo $GTKSOURCEVIEW_LIBS | sed -e "s/$export_dynamic//"`
@@ -170,43 +217,50 @@
 
 
 dnl should we build the wnck module
-build_wnck=false
-PKG_CHECK_MODULES(WNCK, libwnck-1.0 >= wnck_required_version,
-  build_wnck=true,
-  build_wnck=false)
-AM_CONDITIONAL(BUILD_WNCK, $build_wnck)
+AC_ARG_BINDING([wnck],[YES])
+if $build_wnck; then
+	PKG_CHECK_MODULES(WNCK, libwnck-1.0 >= wnck_required_version,
+	  build_wnck=true,
+	  build_wnck=false)
+fi
 if test -n "$export_dynamic"; then
   WNCK_LIBS=`echo $WNCK_LIBS | sed -e "s/$export_dynamic//"`
 fi
-
+AM_CONDITIONAL(BUILD_WNCK, $build_wnck)
 
 
 dnl should we build the totem.plparser module?
-build_totem_plparser=false
-PKG_CHECK_MODULES(TOTEM_PLPARSER, [totem-plparser >= totem_required_version  pygtk-2.0 >= pygtk_required_version],
-  build_totem_plparser=true,
-  build_totem_plparser=false)
+AC_ARG_BINDING([totem_plparser],[YES],[totem.plparser])
+if $build_totem_plparser; then
+	PKG_CHECK_MODULES(TOTEM_PLPARSER, [totem-plparser >= totem_required_version  pygtk-2.0 >= pygtk_required_version],
+	  build_totem_plparser=true,
+	  build_totem_plparser=false)
+fi
 AM_CONDITIONAL(BUILD_TOTEM_PLPARSER, $build_totem_plparser)
 if test -n "$export_dynamic"; then
   TOTEM_PLPARSER_LIBS=`echo $TOTEM_PLPARSER_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
 dnl should we build the gtop module?
-build_gtop=false
-PKG_CHECK_MODULES(GTOP, [libgtop-2.0 >= libgtop_required_version pygtk-2.0 >= pygtk_required_version],
-  build_gtop=true,
-  build_gtop=false)
+AC_ARG_BINDING([gtop],[YES])
+if $build_gtop; then
+	PKG_CHECK_MODULES(GTOP, [libgtop-2.0 >= libgtop_required_version pygtk-2.0 >= pygtk_required_version],
+	  build_gtop=true,
+	  build_gtop=false)
+fi
 AM_CONDITIONAL(BUILD_GTOP, $build_gtop)
 if test -n "$export_dynamic"; then
   GTOP_LIBS=`echo $GTOP_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
 dnl should we build the nautilusburn module?
-build_nautilusburn=false
-PKG_CHECK_MODULES(NAUTILUSBURN, [libnautilus-burn >= libnautilus_burn_required_version
-                                 pygtk-2.0 >= pygtk_required_version],
-  build_nautilusburn=true,
-  build_nautilusburn=false)
+AC_ARG_BINDING([nautilusburn],[YES])
+if $build_nautilusburn; then
+	PKG_CHECK_MODULES(NAUTILUSBURN, [libnautilus-burn >= libnautilus_burn_required_version
+					 pygtk-2.0 >= pygtk_required_version],
+	  build_nautilusburn=true,
+	  build_nautilusburn=false)
+fi
 AM_CONDITIONAL(BUILD_NAUTILUSBURN, $build_nautilusburn)
 if test -n "$export_dynamic"; then
   NAUTILUSBURN_LIBS=`echo $NAUTILUSBURN_LIBS | sed -e "s/$export_dynamic//"`
@@ -214,24 +268,28 @@
 
 
 dnl should we build the mediaprofiles module?
-build_mediaprofiles=false
-PKG_CHECK_MODULES(MEDIAPROFILES, [gnome-media-profiles >= mediaprofiles_required_version
-                           pygtk-2.0 >= pygtk_required_version
-                           gconf-2.0 >= gconf_required_version],
-  build_mediaprofiles=true,
-  build_mediaprofiles=false)
+AC_ARG_BINDING([mediaprofiles],[YES])
+if $build_mediaprofiles; then
+	PKG_CHECK_MODULES(MEDIAPROFILES, [gnome-media-profiles >= mediaprofiles_required_version
+				   pygtk-2.0 >= pygtk_required_version
+				   gconf-2.0 >= gconf_required_version],
+	  build_mediaprofiles=true,
+	  build_mediaprofiles=false)
+fi
 AM_CONDITIONAL(BUILD_MEDIAPROFILES, $build_mediaprofiles)
 if test -n "$export_dynamic"; then
   MEDIAPROFILES_LIBS=`echo $MEDIAPROFILES_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
 dnl should we build the rsvg module?
-build_rsvg=false
-PKG_CHECK_MODULES(RSVG, [librsvg-2.0 >= rsvg_required_version
-                         pycairo
-                         pygtk-2.0 >= pygtk_required_version],
-  build_rsvg=true,
-  build_rsvg=false)
+AC_ARG_BINDING([rsvg],[YES])
+if $build_rsvg; then
+	PKG_CHECK_MODULES(RSVG, [librsvg-2.0 >= rsvg_required_version
+				 pycairo
+				 pygtk-2.0 >= pygtk_required_version],
+	  build_rsvg=true,
+	  build_rsvg=false)
+fi
 AM_CONDITIONAL(BUILD_RSVG, $build_rsvg)
 if test -n "$export_dynamic"; then
   RSVG_LIBS=`echo $RSVG_LIBS | sed -e "s/$export_dynamic//"`
@@ -239,10 +297,7 @@
 
 
 dnl should we build the metacity module
-AC_ARG_ENABLE([metacity],
-             AC_HELP_STRING([--enable-metacity],
-                            [build metacity bindings (default is NO)]),
-             [build_metacity=true], [build_metacity=false])
+AC_ARG_BINDING([metacity],[NO])
 if $build_metacity; then
     PKG_CHECK_MODULES(METACITY, libmetacity-private >= metacity_required_version,
       build_metacity=true,
@@ -254,39 +309,45 @@
 AM_CONDITIONAL(BUILD_METACITY, $build_metacity)
 
 dnl should we build the gnomekeyring module
-build_gnomekeyring=false
-PKG_CHECK_MODULES(GNOMEKEYRING, [gnome-keyring-1 >= gnomekeyring_required_version
-                                 gobject-2.0 >= glib_required_version],
-  build_gnomekeyring=true,
-  build_gnomekeyring=false)
+AC_ARG_BINDING([gnomekeyring],[YES])
+if $build_gnomekeyring; then
+	PKG_CHECK_MODULES(GNOMEKEYRING, [gnome-keyring-1 >= gnomekeyring_required_version
+					 gobject-2.0 >= glib_required_version],
+	  build_gnomekeyring=true,
+	  build_gnomekeyring=false)
+fi
 AM_CONDITIONAL(BUILD_GNOMEKEYRING, $build_gnomekeyring)
 if test -n "$export_dynamic"; then
   GNOMEKEYRING_LIBS=`echo $GNOMEKEYRING_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
 dnl should we build the gnomekeyring module
-build_gnomedesktop=false
-PKG_CHECK_MODULES(GNOMEDESKTOP, [gnome-desktop-2.0 >= gnomedesktop_required_version
-                                 pygobject-2.0],
-  build_gnomedesktop=true,
-  build_gnomedesktop=false)
+AC_ARG_BINDING([gnomedesktop],[YES])
+if $build_gnomedesktop; then
+	PKG_CHECK_MODULES(GNOMEDESKTOP, [gnome-desktop-2.0 >= gnomedesktop_required_version
+					 pygobject-2.0],
+	  build_gnomedesktop=true,
+	  build_gnomedesktop=false)
+fi
 AM_CONDITIONAL(BUILD_GNOMEDESKTOP, $build_gnomedesktop)
 if test -n "$export_dynamic"; then
   GNOMEDESKTOP_LIBS=`echo $GNOMEDESKTOP_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
 dnl Check for bug-buddy
-build_bugbuddy=false
-AC_PATH_PROG(BUG_BUDDY, bug-buddy)
-if test "x$BUG_BUDDY" != "x"; then 
-  AC_MSG_CHECKING([whether bug-buddy >= 2.16])
-  if $BUG_BUDDY --version | $PYTHON -c ["import sys; sys.exit([int(s) for s in sys.stdin.read().split()[2].split('.')] < [2,16])"]; then
-    AC_MSG_RESULT([yes])
-    build_bugbuddy=true
-  else
-    AC_MSG_RESULT([no])
-    build_bugbuddy=false
-  fi
+AC_ARG_BINDING([bugbuddy],[YES])
+if $build_bugbuddy; then
+	AC_PATH_PROG(BUG_BUDDY, bug-buddy)
+	if test "x$BUG_BUDDY" != "x"; then 
+	  AC_MSG_CHECKING([whether bug-buddy >= 2.16])
+	  if $BUG_BUDDY --version | $PYTHON -c ["import sys; sys.exit([int(s) for s in sys.stdin.read().split()[2].split('.')] < [2,16])"]; then
+	    AC_MSG_RESULT([yes])
+	    build_bugbuddy=true
+	  else
+	    AC_MSG_RESULT([no])
+	    build_bugbuddy=false
+	  fi
+	fi
 fi
 AM_CONDITIONAL(BUILD_BUGBUDDY, $build_bugbuddy)
 
diff -ru gnome-python-desktop-2.20.0.orig/docs/Makefile.am gnome-python-desktop-2.20.0/docs/Makefile.am
--- gnome-python-desktop-2.20.0.orig/docs/Makefile.am	2007-09-15 16:44:56.000000000 -0400
+++ gnome-python-desktop-2.20.0/docs/Makefile.am	2008-01-16 12:54:38.000000000 -0500
@@ -1,5 +1,16 @@
 EXTRA_DIST = common.xsl html.xsl ref-html-style.xsl tut-html-style.xsl \
 	     pdf-style.xsl pdf.xsl devhelp.xsl pygtk-ref-docs.make
 
-SUBDIRS = gtksourceview gnomeprint gnomeprintui
+SUBDIRS=
 
+if BUILD_GTKSOURCEVIEW
+  SUBDIRS += gtksourceview
+endif
+
+if BUILD_GNOMEPRINT
+  SUBDIRS += gnomeprint
+endif
+
+if BUILD_GNOMEPRINTUI
+  SUBDIRS += gnomeprintui
+endif
diff -ru gnome-python-desktop-2.20.0.orig/Makefile.am gnome-python-desktop-2.20.0/Makefile.am
--- gnome-python-desktop-2.20.0.orig/Makefile.am	2007-09-15 16:44:57.000000000 -0400
+++ gnome-python-desktop-2.20.0/Makefile.am	2008-01-16 12:56:51.000000000 -0500
@@ -1,5 +1,9 @@
 
-SUBDIRS =  docs
+SUBDIRS=
+
+if BUILD_DOCS
+  SUBDIRS += docs
+endif
 
 if BUILD_GNOMEPRINT
   SUBDIRS += gnomeprint