From f423075391206985356e8c85b334f263484e410f Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Mon, 28 Nov 2011 04:51:51 +0000 Subject: [PATCH] don't warn about gnomeprint if we already have gtkprint git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 14 ++++++++++++-- configure.in | 6 +++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/configure b/configure index aa3b1c3c48..acbae64330 100755 --- a/configure +++ b/configure @@ -47219,15 +47219,25 @@ fi echo "$LIBGNOMEPRINTUI_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5 + if test "$wxUSE_GTKPRINT" = yes; then + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + else + { echo "$as_me:$LINENO: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5 echo "$as_me: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&2;} + fi wxUSE_LIBGNOMEPRINT="no" elif test $pkg_failed = untried; then - { echo "$as_me:$LINENO: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5 + if test "$wxUSE_GTKPRINT" = yes; then + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + else + { echo "$as_me:$LINENO: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5 echo "$as_me: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&2;} + fi wxUSE_LIBGNOMEPRINT="no" diff --git a/configure.in b/configure.in index fe75f8dcc1..775dc05a82 100644 --- a/configure.in +++ b/configure.in @@ -5839,7 +5839,11 @@ if test "$WXGTK2" = 1; then AC_DEFINE(wxUSE_LIBGNOMEPRINT) ], [ - AC_MSG_WARN([libgnomeprintui not found, library will use standard PostScript printing]) + if test "$wxUSE_GTKPRINT" = yes; then + AC_MSG_RESULT(no) + else + AC_MSG_WARN([libgnomeprintui not found, library will use standard PostScript printing]) + fi wxUSE_LIBGNOMEPRINT="no" ] ) -- 2.45.2