From 751090926105ae5b67cafd8425257624d51963ca Mon Sep 17 00:00:00 2001
From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Wed, 13 Jan 2010 02:08:38 +0000
Subject: [PATCH] Capture the previous output from "pkg-config x11" in a static
 screen section.  Ubuntu Karmic changed the X11 package config so it no longer
 prints a -I option, and this is just an example anyway.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4613 fdb21ef1-2011-0410-befe-b5e4ea1792b1
---
 doc/user/parseconfig.in  | 26 ++++++++++++++++++++++++++
 doc/user/parseconfig.xml | 22 ++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/doc/user/parseconfig.in b/doc/user/parseconfig.in
index e5cc5644..2dbefff1 100644
--- a/doc/user/parseconfig.in
+++ b/doc/user/parseconfig.in
@@ -78,9 +78,22 @@
 
  </para>
 
+ <!--
+ This is how we used to generate the screen output below, but
+ as of (at least) Ubuntu Karmic, the pkg-config output for x11
+ no longer reports back an include directory.  Since this is just
+ for example anyway, we're just hard-coding the output.
+
  <scons_output example="ParseConfig1">
     <scons_output_command>scons -Q</scons_output_command>
  </scons_output>
+ -->
+
+ <screen>
+    % <userinput>scons -Q</userinput>
+    ['/lib/compat', '/usr/X11/include']
+    scons: `.' is up to date.
+ </screen>
 
  <para>
 
@@ -109,6 +122,19 @@
    </file>
  </scons_example>
 
+ <!--
+ This is how we used to generate the screen output below, but
+ as of (at least) Ubuntu Karmic, the pkg-config output for x11
+ no longer reports back an include directory.  Since this is just
+ for example anyway, we're just hard-coding the output.
+
  <scons_output example="ParseConfig2">
     <scons_output_command>scons -Q</scons_output_command>
  </scons_output>
+ -->
+
+ <screen>
+    % <userinput>scons -Q</userinput>
+    ['/usr/X11/include']
+    scons: `.' is up to date.
+ </screen>
diff --git a/doc/user/parseconfig.xml b/doc/user/parseconfig.xml
index 46bd4dc0..3613d77c 100644
--- a/doc/user/parseconfig.xml
+++ b/doc/user/parseconfig.xml
@@ -76,6 +76,17 @@
 
  </para>
 
+ <!--
+ This is how we used to generate the screen output below, but
+ as of (at least) Ubuntu Karmic, the pkg-config output for x11
+ no longer reports back an include directory.  Since this is just
+ for example anyway, we're just hard-coding the output.
+
+ <scons_output example="ParseConfig1">
+    <scons_output_command>scons -Q</scons_output_command>
+ </scons_output>
+ -->
+
  <screen>
     % <userinput>scons -Q</userinput>
     ['/lib/compat', '/usr/X11/include']
@@ -107,6 +118,17 @@
     print env['CPPPATH']
  </programlisting>
 
+ <!--
+ This is how we used to generate the screen output below, but
+ as of (at least) Ubuntu Karmic, the pkg-config output for x11
+ no longer reports back an include directory.  Since this is just
+ for example anyway, we're just hard-coding the output.
+
+ <scons_output example="ParseConfig2">
+    <scons_output_command>scons -Q</scons_output_command>
+ </scons_output>
+ -->
+
  <screen>
     % <userinput>scons -Q</userinput>
     ['/usr/X11/include']
-- 
2.26.2