* popthelp.c: Apply patch from Tom Tromey <tromey@redhat.com> to

	make pkg-config --help print to stdout, not stderr.  Gnome
	#127314.

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 8ade6f8..f191c7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-12-29  Tollef Fog Heen  <tfheen@err.no>
 
+	* popthelp.c: Apply patch from Tom Tromey <tromey@redhat.com> to
+	make pkg-config --help print to stdout, not stderr.  Gnome
+	#127314.
+
 	* pkg.m4: Don't use --errors-to-stdout in pkg.m4, but rather
 	redirect stderr to stdout.  This makes pkg.m4 with old (pre 0.15)
 	pkg-config look good, and it makes newer pkg-config with ancient
diff --git a/popthelp.c b/popthelp.c
index 9e1ad1e..40d542e 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -53,9 +53,9 @@ static void displayArgs(poptContext con, enum poptCallbackReason foo,
 			struct poptOption * key, 
 			const char * arg, void * data) {
     if (key->shortName== '?')
-	poptPrintHelp(con, stderr, 0);
+	poptPrintHelp(con, stdout, 0);
     else
-	poptPrintUsage(con, stderr, 0);
+	poptPrintUsage(con, stdout, 0);
     exit(0);
 }