From 6f5620089eb5908a71e54b47f5e4cc9470fde9d5 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Sat, 29 Dec 2007 16:06:00 +0100 Subject: [PATCH] * popthelp.c: Apply patch from Tom Tromey to make pkg-config --help print to stdout, not stderr. Gnome #127314. --- ChangeLog | 4 ++++ popthelp.c | 4 ++-- 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 + * popthelp.c: Apply patch from Tom Tromey 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); } -- 2.39.5