From df17096f5effbf060e75f87030cea66081e81d4f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 2 Oct 2008 14:57:42 +0200
Subject: configure.ac: define ENABLE_x_SCREEN instead of DISABLE_x_SCREEN

Everybody who uses the ENABLE_ macros has to include ncmpc.h.  We're
better off defining those in config.h via configure.ac.
---
 src/ncmpc.h       | 13 -------------
 src/playlist.c    |  1 -
 src/screen_list.h |  2 +-
 3 files changed, 1 insertion(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/ncmpc.h b/src/ncmpc.h
index c87c84d88..5d4ca8425 100644
--- a/src/ncmpc.h
+++ b/src/ncmpc.h
@@ -5,19 +5,6 @@
 #include "config.h"
 #endif
 
-#ifndef DISABLE_ARTIST_SCREEN
-#define ENABLE_ARTIST_SCREEN 1
-#endif
-#ifndef DISABLE_SEARCH_SCREEN
-#define ENABLE_SEARCH_SCREEN 1
-#endif
-#ifndef DISABLE_KEYDEF_SCREEN
-#define ENABLE_KEYDEF_SCREEN 1
-#endif
-#ifndef DISABLE_LYRICS_SCREEN
-#define ENABLE_LYRICS_SCREEN 1
-#endif
-
 #ifndef NDEBUG
 void D(const char *format, ...);
 #else
diff --git a/src/playlist.c b/src/playlist.c
index 919b4c34f..108c4f51a 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -21,7 +21,6 @@
 
 #include "playlist.h"
 #include "mpdclient.h"
-#include "ncmpc.h"
 
 #include <string.h>
 
diff --git a/src/screen_list.h b/src/screen_list.h
index 1293b74d9..27c034676 100644
--- a/src/screen_list.h
+++ b/src/screen_list.h
@@ -20,7 +20,7 @@
 #ifndef SCREEN_LIST_H
 #define SCREEN_LIST_H
 
-#include "ncmpc.h"
+#include "config.h"
 
 #include <ncurses.h>
 
-- 
cgit v1.2.3