GNOME.org
 

gnome-python r627 - in trunk: . docs

Author: gjc
Date: Sat May 24 20:19:06 2008
New Revision: 627
URL: http://svn.gnome.org/viewvc/gnome-python?rev=627&view=rev

Log:
Bug 534307 â configure script could really use the ability to select particular modules

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/docs/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sat May 24 20:19:06 2008
@@ -1,6 +1,18 @@
 AUTOMAKE_OPTIONS = 1.6
 
-SUBDIRS = gnome bonobo docs
+SUBDIRS = 
+
+if BUILD_DOCS
+SUBDIRS += docs
+endif
+
+if BUILD_GNOME
+SUBDIRS += gnome
+endif
+
+if BUILD_BONOBO_ANY
+SUBDIRS += bonobo
+endif
 
 if BUILD_GCONF
 SUBDIRS += gconf

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat May 24 20:19:06 2008
@@ -41,6 +41,18 @@
 AC_DEFINE(PYGTK_REQUIRED_MINOR_VERSION, pygtk_required_minor_version, [PyGTK required minor version])
 AC_DEFINE(PYGTK_REQUIRED_MICRO_VERSION, pygtk_required_micro_version, [PyGTK required micro 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]) module (default is [$2])]),
+             [if test "$enable_[$1]" = "yes"; then 
+	     		build_[$1]=true
+			  else
+				build_[$1]=false
+			 fi])
+])
+
 GNOME_COMMON_INIT
 
 dnl put the ACLOCAL flags in the makefile
@@ -118,19 +130,39 @@
   GTK_LIBS=`echo $GTK_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
-PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= libgnome_required_version,,
-  [AC_MSG_ERROR(libgnome-2.0 is required.)])
-AC_SUBST(GNOME_CFLAGS)
-AC_SUBST(GNOME_LIBS)
-if test -n "$export_dynamic"; then
-  GNOME_LIBS=`echo $GNOME_LIBS | sed -e "s/$export_dynamic//"`
-fi
-
 dnl ****************************************************************************
 dnl * Check for prctl() or setproctitle()
 dnl ****************************************************************************
 AC_CHECK_FUNCS(prctl setproctitle)
 
+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="gnome gnomeui gnomecanvas gnomevfs gnomevfsbonobo pyvfsmodule gconf bonobo_activation bonobo bonoboui"
+default_bindings_off=""
+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
+
 
 have_pyorbit=false
 PKG_CHECK_MODULES(PYORBIT,
@@ -138,115 +170,146 @@
   have_pyorbit=true, have_pyorbit=false)
 AC_SUBST(PYORBIT_CFLAGS)
 
-build_gnomeui=false
-PKG_CHECK_MODULES(GNOMEUI, libgnomeui-2.0 >= libgnomeui_required_version,
-  build_gnomeui=true,
-  build_gnomeui=false)
-AC_SUBST(GNOMEUI_CFLAGS)
-AC_SUBST(GNOMEUI_LIBS)
-AM_CONDITIONAL(BUILD_GNOMEUI, $have_pyorbit && $build_gnomeui)
+AC_ARG_BINDING([gnome], [ON])
+if $build_gnome; then
+  PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= libgnome_required_version,,
+    [AC_MSG_ERROR(libgnome-2.0 is required.)])
+  AC_SUBST(GNOME_CFLAGS)
+  AC_SUBST(GNOME_LIBS)
+  if test -n "$export_dynamic"; then
+    GNOME_LIBS=`echo $GNOME_LIBS | sed -e "s/$export_dynamic//"`
+  fi
+fi
+AM_CONDITIONAL(BUILD_GNOME, $build_gnome)
+
+AC_ARG_BINDING([gnomeui], [ON], [gnome.ui])
+if $build_gnomeui; then
+  PKG_CHECK_MODULES(GNOMEUI, libgnomeui-2.0 >= libgnomeui_required_version,
+    build_gnomeui=true,
+    build_gnomeui=false)
+  AC_SUBST(GNOMEUI_CFLAGS)
+  AC_SUBST(GNOMEUI_LIBS)
+fi
+AM_CONDITIONAL(BUILD_GNOMEUI, $build_gnome && $have_pyorbit && $build_gnomeui)
 if test -n "$export_dynamic"; then
   GNOMEUI_LIBS=`echo $GNOMEUI_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
 dnl should we build the gnome.canvas module?
-build_gnomecanvas=false
-PKG_CHECK_MODULES(GNOMECANVAS, libgnomecanvas-2.0 >= libgnomecanvas_required_version,
-  build_gnomecanvas=true,
-  build_gnomecanvas=false)
-AC_SUBST(GNOMECANVAS_CFLAGS)
-AC_SUBST(GNOMECANVAS_LIBS)
+AC_ARG_BINDING([gnomecanvas], [ON])
+if $build_gnomecanvas; then
+  PKG_CHECK_MODULES(GNOMECANVAS, libgnomecanvas-2.0 >= libgnomecanvas_required_version,
+    build_gnomecanvas=true,
+    build_gnomecanvas=false)
+  AC_SUBST(GNOMECANVAS_CFLAGS)
+  AC_SUBST(GNOMECANVAS_LIBS)
+fi
 AM_CONDITIONAL(BUILD_GNOMECANVAS, $build_gnomecanvas)
 if test -n "$export_dynamic"; then
   GNOMECANVAS_LIBS=`echo $GNOMECANVAS_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
 dnl should we build the gnomevfs module?
-build_gnomevfs=false
-PKG_CHECK_MODULES(GNOMEVFS, [gnome-vfs-2.0 >= libgnomevfs_required_version],
-  build_gnomevfs=true,
-  build_gnomevfs=false)
-AC_SUBST(GNOMEVFS_CFLAGS)
-AC_SUBST(GNOMEVFS_LIBS)
+AC_ARG_BINDING([gnomevfs], [ON])
+if $build_gnomevfs; then
+  PKG_CHECK_MODULES(GNOMEVFS, [gnome-vfs-2.0 >= libgnomevfs_required_version],
+    build_gnomevfs=true,
+    build_gnomevfs=false)
+  AC_SUBST(GNOMEVFS_CFLAGS)
+  AC_SUBST(GNOMEVFS_LIBS)
+fi
 AM_CONDITIONAL(BUILD_GNOMEVFS, $build_gnomevfs)
 if test -n "$export_dynamic"; then
   GNOMEVFS_LIBS=`echo $GNOMEVFS_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
 dnl should we build bonobo support into the gnomevfs module?
-build_gnomevfsbonobo=false
-PKG_CHECK_MODULES(GNOMEVFSBONOBO, [gnome-vfs-2.0 >= libgnomevfs_required_version dnl
-                             bonobo-activation-2.0 >= bonobo_activation_required_version
-			     pyorbit-2 >= pyorbit_required_version],
-  build_gnomevfsbonobo=true,
-  build_gnomevfsbonobo=false)
-AC_SUBST(GNOMEVFSBONOBO_CFLAGS)
-AC_SUBST(GNOMEVFSBONOBO_LIBS)
-AM_CONDITIONAL(BUILD_GNOMEVFSBONOBO, $build_gnomevfsbonobo)
+AC_ARG_BINDING([gnomevfsbonobo], [ON], [gnomevfs.bonobo])
+if $build_gnomevfsbonobo; then
+  PKG_CHECK_MODULES(GNOMEVFSBONOBO, [gnome-vfs-2.0 >= libgnomevfs_required_version dnl
+				     bonobo-activation-2.0 >= bonobo_activation_required_version
+				     pyorbit-2 >= pyorbit_required_version],
+    build_gnomevfsbonobo=true,
+    build_gnomevfsbonobo=false)
+  AC_SUBST(GNOMEVFSBONOBO_CFLAGS)
+  AC_SUBST(GNOMEVFSBONOBO_LIBS)
+fi
+AM_CONDITIONAL(BUILD_GNOMEVFSBONOBO, $build_gnomevfs && $build_gnomevfsbonobo)
 if test -n "$export_dynamic"; then
   GNOMEVFSBONOBO_LIBS=`echo $GNOMEVFSBONOBO_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
 
 dnl should we build the gnomevfs python module bridge?
-build_pyvfsmodule=false
-PKG_CHECK_MODULES(GNOME_VFS_MODULE, [gnome-vfs-module-2.0 >= libgnomevfs_required_version dnl
-                                     bonobo-activation-2.0 >= bonobo_activation_required_version],
-  build_pyvfsmodule=true,
-  build_pyvfsmodule=false)
-
-AM_CONDITIONAL(BUILD_PYVFSMODULE, $build_pyvfsmodule)
+AC_ARG_BINDING([pyvfsmodule], [ON], [bridge])
+if $build_pyvfsmodule; then
+  PKG_CHECK_MODULES(GNOME_VFS_MODULE, [gnome-vfs-module-2.0 >= libgnomevfs_required_version dnl
+				       bonobo-activation-2.0 >= bonobo_activation_required_version],
+    build_pyvfsmodule=true,
+    build_pyvfsmodule=false)
+fi
+AM_CONDITIONAL(BUILD_PYVFSMODULE, $build_gnomevfs && $build_pyvfsmodule)
 if test -n "$export_dynamic"; then
   GNOME_VFS_MODULE_LIBS=`echo $GNOME_VFS_MODULE_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
 dnl should we build the gconf module?
-build_gconf=false
-PKG_CHECK_MODULES(GCONF, gconf-2.0 >= gconf_required_version,
-  build_gconf=true,
-  build_gconf=false)
-GCONF_INCLUDEDIR="`pkg-config gconf-2.0 --variable includedir`/gconf/2/gconf"
-AC_SUBST(GCONF_INCLUDEDIR)
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
+AC_ARG_BINDING([gconf], [ON])
+if $build_gconf; then
+  PKG_CHECK_MODULES(GCONF, gconf-2.0 >= gconf_required_version,
+    build_gconf=true,
+    build_gconf=false)
+  GCONF_INCLUDEDIR="`pkg-config gconf-2.0 --variable includedir`/gconf/2/gconf"
+  AC_SUBST(GCONF_INCLUDEDIR)
+  AC_SUBST(GCONF_CFLAGS)
+  AC_SUBST(GCONF_LIBS)
+fi
 AM_CONDITIONAL(BUILD_GCONF, $build_gconf)
 if test -n "$export_dynamic"; then
   GCONF_LIBS=`echo $GCONF_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
 dnl should we build the bonobo.activation module?
-build_bonobo_activation=false
-PKG_CHECK_MODULES(BONOBO_ACTIVATION, bonobo-activation-2.0 >= bonobo_activation_required_version,
-  build_bonobo_activation=true, build_bonobo_activation=false)
-AC_SUBST(BONOBO_ACTIVATION_CFLAGS)
-AC_SUBST(BONOBO_ACTIVATION_LIBS)
+AC_ARG_BINDING([bonobo_activation], [ON], [bonobo.activation])
+if $build_bonobo_activation; then
+  PKG_CHECK_MODULES(BONOBO_ACTIVATION, bonobo-activation-2.0 >= bonobo_activation_required_version,
+    build_bonobo_activation=true, build_bonobo_activation=false)
+  AC_SUBST(BONOBO_ACTIVATION_CFLAGS)
+  AC_SUBST(BONOBO_ACTIVATION_LIBS)
+fi
 AM_CONDITIONAL(BUILD_BONOBO_ACTIVATION, $have_pyorbit && $build_bonobo_activation)
 if test -n "$export_dynamic"; then
   BONOBO_ACTIVATION_LIBS=`echo $BONOBO_ACTIVATION_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
 dnl should we build the bonobo._bonobo module?
-build_bonobo=false
-PKG_CHECK_MODULES(BONOBO, libbonobo-2.0 >= libbonobo_required_version,
-  build_bonobo=true, build_bonobo=false)
-AC_SUBST(BONOBO_CFLAGS)
-AC_SUBST(BONOBO_LIBS)
+AC_ARG_BINDING([bonobo], [ON], [bonobo._bonobo])
+if $build_bonobo; then
+  PKG_CHECK_MODULES(BONOBO, libbonobo-2.0 >= libbonobo_required_version,
+    build_bonobo=true, build_bonobo=false)
+  AC_SUBST(BONOBO_CFLAGS)
+  AC_SUBST(BONOBO_LIBS)
+fi
 AM_CONDITIONAL(BUILD_BONOBO, $have_pyorbit && $build_bonobo)
 if test -n "$export_dynamic"; then
   BONOBO_LIBS=`echo $BONOBO_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
 dnl should we build the bonobo.ui module?
-build_bonoboui=false
-PKG_CHECK_MODULES(BONOBOUI, libbonoboui-2.0 >= libbonoboui_required_version libgnome-2.0 >= libgnome_required_version,
-  build_bonoboui=true, build_bonoboui=false)
-AC_SUBST(BONOBOUI_CFLAGS)
-AC_SUBST(BONOBOUI_LIBS)
+AC_ARG_BINDING([bonoboui], [ON], [bonobo.ui])
+if $build_bonoboui; then
+  PKG_CHECK_MODULES(BONOBOUI, libbonoboui-2.0 >= libbonoboui_required_version libgnome-2.0 >= libgnome_required_version,
+    build_bonoboui=true, build_bonoboui=false)
+  AC_SUBST(BONOBOUI_CFLAGS)
+  AC_SUBST(BONOBOUI_LIBS)
+fi
 AM_CONDITIONAL(BUILD_BONOBOUI, $have_pyorbit && $build_bonoboui)
 if test -n "$export_dynamic"; then
   BONOBOUI_LIBS=`echo $BONOBOUI_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
+AM_CONDITIONAL(BUILD_BONOBO_ANY, $build_bonobo || $build_bonoboui || $build_bonobo_activation)
+
 
 dnl add required cflags ...
 JH_ADD_CFLAG([-Wall])
@@ -275,6 +338,7 @@
 $build_gnomeui           && $have_pyorbit && echo     gnome.ui
 $build_gnomecanvas       && echo     gnomecanvas
 $build_gnomevfs          && echo     gnomevfs
+$build_gnomevfsbonobo    && echo     gnomevfs.bonobo
 $build_pyvfsmodule       && echo     gnome-vfs python module support
 $build_gconf             && echo     gconf
 $build_bonobo            && $have_pyorbit && echo     bonobo
@@ -288,6 +352,7 @@
 $build_gnomeui           && $have_pyorbit || echo     gnome.ui
 $build_gnomecanvas       || echo     gnomecanvas
 $build_gnomevfs          || echo     gnomevfs
+$build_gnomevfsbonobo    || echo     gnomevfs.bonobo
 $build_pyvfsmodule       || echo     gnome-vfs python module support
 $build_gconf             || echo     gconf
 $build_bonobo            && $have_pyorbit || echo     bonobo

Modified: trunk/docs/Makefile.am
==============================================================================
--- trunk/docs/Makefile.am	(original)
+++ trunk/docs/Makefile.am	Sat May 24 20:19:06 2008
@@ -1,4 +1,8 @@
-SUBDIRS = gnomevfs
+SUBDIRS = 
+
+if BUILD_GNOMEVFS
+SUBDIRS += gnomevfs
+endif
 
 EXTRA_DIST = common.xsl devhelp.xsl html.xsl pdf-style.xsl pdf.xsl \
              pygtk-ref-docs.make ref-html-style.xsl tut-html-style.xsl
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]