[PATCH modular 5/6] jhbuildrc: rebase on a more recent sample

[Gaetan Nadon]

Use the most recent version of jhbuildrc from the GNOME project to
customize for xorg.

The user is invited to copy it to ~/.config and perhaps customize it
some more. The module name is changed to match xorg.modules.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 jhbuildrc |   60 +++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 17 deletions(-)

diff --git a/jhbuildrc b/jhbuildrc
index de6a037..60a5434 100644
--- a/jhbuildrc
+++ b/jhbuildrc
@@ -1,25 +1,51 @@
-# how to use this file?
+# -*- mode: python -*-
+# -*- coding: utf-8 -*-
+
 #
-# mkdir -p $HOME/xorg/util
-# git clone git://anongit.freedesktop.org/git/xorg/util/modular/ $HOME/xorg/util/modular
-# jhbuild -f $HOME/xorg/util/modular/jhbuildrc
+#			X.Org JHBuild Configuration File Sample
 #
-# Source tree will be in $HOME/xorg
-# Binaries will be in $HOME/xorg-build
+# Edit this sample file to match your settings and copy it to ~/.config/jhbuildrc
 #
+# This file comes from: http://cgit.freedesktop.org/xorg/util/modular/tree/jhbuildrc
+# The modules file: http://cgit.freedesktop.org/xorg/util/modular/tree/xorg.modules
+# JhBuild installation: https://developer.gnome.org/jhbuild/unstable/getting-started.html.en
+# The specs for this file: https://developer.gnome.org/jhbuild/unstable/config-reference.html.en
+# The build guide for X: http://www.x.org/wiki/Building_the_X_Window_System/
+
+# A string or list of strings specifying the name(s) of the module set(s) to use.
+# It can be a full HTTP URL to an externally managed moduleset
+moduleset = os.path.join(os.environ['HOME'], 'xorg/util/modular/xorg.modules')
 
-#moduleset = 'http://cgit.freedesktop.org/xorg/util/modular/blob/xorg.modules'
-# Requires the module set be in $HOME/xorg/util/modular/
-moduleset = os.path.join(os.environ['HOME'], 'xorg', 'util', 'modular', 'xorg.modules')
+# A list of strings specifying the modules to build.
+# The list of modules actually built will be recursively expanded to include all the dependencies
+# Run 'jhbuild build' to build all of X
+modules = [ 'The X Window System' ]
 
-modules = [ 'xorg' ]
+# A string specifying the directory to unpack source trees to.
+checkoutroot = os.path.join(os.environ['HOME'])
 
-# All modules will be in $HOME/xorg/ after the checkout
-checkoutroot = os.environ['HOME']
+# A string specifying the prefix to install modules to.
+# The prefix must be an absolute path. This directory must be writable
 prefix = os.path.join(os.environ['HOME'], 'xorg-build')
-os.environ['ACLOCAL'] = 'aclocal -I ' + os.path.join(prefix, 'share', 'aclocal')
-os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'lib', 'pkgconfig') \
-    + ':' + os.path.join(prefix, 'share', 'pkgconfig')
 
-#autogenargs='--cache-file=/usr/src/jhmodular/configure-cache --disable-static'
-#os.environ['INSTALL'] = os.path.join(os.environ['HOME'], 'bin', 'install-check')
+# The following is required to make aclocal find our .m4 macros
+os.environ['ACLOCAL'] = 'aclocal -I ' + os.path.join(prefix, 'share/aclocal')
+
+# The following is required to make pkg-config find our .pc metadata files
+os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'lib/pkgconfig') \
+    + ':' + os.path.join(prefix, 'share/pkgconfig')
+
+# A boolean value that specifies whether to install libraries to lib64 directories.
+# Defaults to 1 on Debian but now obsolete, using multi-arch nomenclature
+use_lib64 = 0
+
+# Extra configure options to pass to all autogen.sh scripts, e.g. --enable-xxx
+# If commented out, the GNOME defaults are used which are not used in xorg
+autogenargs=''
+
+# custom CFLAGS / environment pieces for the build
+# os.environ['CFLAGS'] = '-Wall -g -O0'
+
+# A string listing additional arguments to be passed to make.
+# Set makeargs to 'V=1' for verbose build output.
+#makeargs = ''
-- 
1.7.9.5