xrdb: Changes to 'master'

[Egbert Eich]

 xrdb.c |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 420347005ccf1886dfbb2eb2902beafdcf4e2477
Author: Egbert Eich <eich at freedesktop.org>
Date:   Thu May 19 11:35:25 2011 +0200

    Allow the CPP macro to contain preprocessors with command line options (v2)
    
    The preprocessor used for xrdb may require a command line option to
    produce the desired output. For the GNU cpp this could be
    'traditional-cpp' which may not be valid for other preprocessors.
    Therefore support the specification of preprocessors along with
    required command line arguments when using the '--with-cpp' configure
    option.
    Example:
       ./configure --with-cpp="/usr/bin/cpp --traditional-cpp, /usr/lib/cpp".
    
    v2: Followed a suggestion by Julien Cristau <jcristau at debian.org>
        to allocate memory for the dup string dynamically instead of
        using a static buffer.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>

commit 76f2c5b2a744587a9e97b622ab359d6fd7689604
Author: Egbert Eich <eich at freedesktop.org>
Date:   Thu May 19 11:29:57 2011 +0200

    Usage: In usage message print preprocessor that's actually chosen.
    
    The CPP macro may contain a list of preprocessors to chose from.
    In the usage message describing the -cpp command line option print
    the preprocessor that would actually be chosen.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>