From b80bf037518fb19a87d2fb61cf4aa1cba7f6edc3 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Mon, 30 Jul 2012 01:04:37 +0100
Subject: [PATCH] Fixed libnotify includes

---
 configure.ac  | 7 ++++---
 src/windows.c | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index d666bb4a..faacc931 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,10 +44,11 @@ AM_CFLAGS="-O3 -Werror -Wall -Wextra -Wno-unused-parameter "
 AM_CFLAGS="$AM_CFLAGS -Wno-unused-but-set-variable -Wno-unused-result "
 AM_CFLAGS="$AM_CFLAGS -Wno-missing-field-initializers "
 AM_CFLAGS="$AM_CFLAGS -lstrophe -lxml2 -lexpat -lncurses -lcurl -lresolv "
-AM_CFLAGS="$AM_CFLAGS $DEPS_CFLAGS $NOFTITY_CFLAGS $DEPS_LIBS $NOTIFY_LIBS"
+AM_CFLAGS="$AM_CFLAGS $DEPS_LIBS $NOTIFY_LIBS"
 
-AM_CPPFLAGS="-lstrophe -lxml2 -lexpat -lncurses -lcurl -lresolv "
-AM_CPPFLAGS="$AM_CPPFLAGS $DEPS_CFLAGS $NOFTITY_CFLAGS $DEPS_LIBS $NOTIFY_LIBS"
+#AM_CPPFLAGS="-lstrophe -lxml2 -lexpat -lncurses -lcurl -lresolv "
+#AM_CPPFLAGS="$AM_CPPFLAGS $DEPS_CFLAGS $NOFTITY_CFLAGS $DEPS_LIBS $NOTIFY_LIBS"
+AM_CPPFLAGS="$DEPS_CFLAGS $NOTIFY_CFLAGS"
 
 AC_SUBST(AM_CFLAGS)
 AC_SUBST(AM_CPPFLAGS)
diff --git a/src/windows.c b/src/windows.c
index 0c6b577f..6fc62ebe 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -26,7 +26,7 @@
 
 #include <ncurses.h>
 #include <glib.h>
-#ifdef HAVE_LIBNOTIFY_NOTIFY_H
+#ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
 #endif
 
@@ -73,7 +73,7 @@ static void _win_handle_switch(const int * const ch);
 static void _win_handle_page(const int * const ch);
 static void _win_resize_all(void);
 
-#ifdef HAVE_LIBNOTIFY_NOTIFY_H
+#ifdef HAVE_LIBNOTIFY
 static void _win_notify(char * short_from);
 #endif
 
@@ -208,13 +208,13 @@ win_show_incomming_msg(const char * const from, const char * const message)
 
     if (prefs_get_beep())
         beep();
-#ifdef HAVE_LIBNOTIFY_NOTIFY_H
+#ifdef HAVE_LIBNOTIFY
     if (prefs_get_notify())
         _win_notify(short_from);
 #endif
 }
 
-#ifdef HAVE_LIBNOTIFY_NOTIFY_H
+#ifdef HAVE_LIBNOTIFY
 static void
 _win_notify(char * short_from)
 {