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

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

diff --git a/ChangeLog b/ChangeLog
index 8ade6f835c8787103beab9960363296bf0d02877..f191c7ddfc88f3ad126d632c16d0f6ebca1d10a3 100644 (file)
--- 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 9e1ad1eacd126b769800a651b613a6a162a0dbbd..40d542ecc767500a90c1c6dbe7b5037d80b9fa0e 100644 (file)
--- 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);
 }