From 9a126106a982c16fe860b921b91e5ce168a4c602 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 29 Jan 2015 12:25:35 +0000
Subject: [PATCH] Reset wxUSE_LIBNOTIFY if libnotify not detected in configure.

This avoids

WARNING: libnotify not found, wxNotificationMessage will use generic implementation.

followed by

Which GUI toolkit should wxWidgets use?    GTK+ 2 with support for libnotify

at the end.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 configure    | 20 ++++++++++++++++----
 configure.in |  5 ++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index 6780697b98..d3620386cb 100755
--- a/configure
+++ b/configure
@@ -34091,12 +34091,18 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBNOTIFY_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5
+
+                            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5
 $as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;}
+                            wxUSE_LIBNOTIFY="no"
+
 
 elif test $pkg_failed = untried; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5
+
+                            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5
 $as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;}
+                            wxUSE_LIBNOTIFY="no"
+
 
 else
 	LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
@@ -34168,12 +34174,18 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBNOTIFY_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5
+
+                            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5
 $as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;}
+                            wxUSE_LIBNOTIFY="no"
+
 
 elif test $pkg_failed = untried; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5
+
+                            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5
 $as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;}
+                            wxUSE_LIBNOTIFY="no"
+
 
 else
 	LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
diff --git a/configure.in b/configure.in
index 1a061bce62..941f885e3c 100644
--- a/configure.in
+++ b/configure.in
@@ -5477,7 +5477,10 @@ if test "$WXGTK2" = 1; then
                 [
                     PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= 0.4],
                         [HAVE_LIBNOTIFY=1],
-                        [AC_MSG_WARN([libnotify not found, wxNotificationMessage will use generic implementation.])]
+                        [
+                            AC_MSG_WARN([libnotify not found, wxNotificationMessage will use generic implementation.])
+                            wxUSE_LIBNOTIFY="no"
+                        ]
                     )
                 ]
             )