Merge commit 'upstream/1.2.0.d20100117'

1 files changed, 27 insertions, 23 deletions

diff --git a/doc/user/parseconfig.xml b/doc/user/parseconfig.xml
index 1f85ad0..534ea3d 100644
--- a/doc/user/parseconfig.xml
+++ b/doc/user/parseconfig.xml
@@ -1,6 +1,6 @@
 <!--
 
-  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation
+  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
@@ -76,19 +76,21 @@
 
  </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>
-    Package x11 was not found in the pkg-config search path.
-    Perhaps you should add the directory containing `x11.pc'
-    to the PKG_CONFIG_PATH environment variable
-    No package 'x11' found
-    OSError: 'pkg-config x11 --cflags --libs' exited 1:
-      File "/home/my/project/SConstruct", line 3:
-        env.ParseConfig("pkg-config x11 --cflags --libs")
-      File "bootstrap/src/engine/SCons/Environment.py", line 1474:
-        None
-      File "bootstrap/src/engine/SCons/Environment.py", line 593:
-        None
+    ['/lib/compat', '/usr/X11/include']
+    scons: `.' is up to date.
  </screen>
 
  <para>
@@ -116,17 +118,19 @@
     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>
-    Package x11 was not found in the pkg-config search path.
-    Perhaps you should add the directory containing `x11.pc'
-    to the PKG_CONFIG_PATH environment variable
-    No package 'x11' found
-    OSError: 'pkg-config x11 --cflags --libs' exited 1:
-      File "/home/my/project/SConstruct", line 2:
-        env.ParseConfig("pkg-config x11 --cflags --libs")
-      File "bootstrap/src/engine/SCons/Environment.py", line 1474:
-        None
-      File "bootstrap/src/engine/SCons/Environment.py", line 593:
-        None
+    ['/usr/X11/include']
+    scons: `.' is up to date.
  </screen>