Fix building with --disable-xft and add ncurses to the -v option

diff --git a/src/conky.c b/src/conky.c
index 1b12d14..e9b5e07 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -268,6 +268,9 @@ static void print_version(void)
 #ifdef IOSTATS
                   "  * iostats\n"
 #endif /* IOSTATS */
+#ifdef NCURSES
+                  "  * ncurses\n"
+#endif /* NCURSES */
 #ifdef HAVE_LUA
                   "  * Lua\n"
                   "\n  Lua bindings:\n"

diff --git a/src/x11.c b/src/x11.c
index 03ccf25..e61c684 100644 (file)
--- a/src/x11.c
+++ b/src/x11.c
@@ -196,9 +196,11 @@ void set_transparent_background(Window win)
 
 void destroy_window(void)
 {
+#ifdef XFT
        if(window.xftdraw) {
                XftDrawDestroy(window.xftdraw);
        }
+#endif
        if(window.gc) {
                XFreeGC(display, window.gc);
        }