Fix compilation error with --disable-x11 (bug #1830373).

Bump doc stylesheet from 4.3 to 4.4.

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@987 7f574dfc-610e-0410-a909-a81674777703

diff --git a/ChangeLog b/ChangeLog
index 37f3d75..8ba2bae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # $Id$
 
+2007-11-14
+       * Fix compilation error with --disable-x11 (bug #1830373).
+       * Bump doc stylesheet from 4.3 to 4.4.
+
 2007-10-31
        * Fix mpd_smart bug #1822773.
 

diff --git a/doc/docs.xml b/doc/docs.xml
index 25628e4..8ee3e6e 100644 (file)
--- a/doc/docs.xml
+++ b/doc/docs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+               "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
                <!ENTITY testtable SYSTEM "test.xml">
                <!ENTITY command_options SYSTEM "command_options.xml">
                <!ENTITY config_settings SYSTEM "config_settings.xml">

diff --git a/src/conky.c b/src/conky.c
index 4f3a049..a6dfd3d 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -4001,9 +4001,11 @@ static void generate_text_internal(char *p, int p_max_size, struct text_object *
                                }
 #endif /* __OpenBSD__ */
 
+#ifdef X11
                                OBJ(font) {
                                        new_font(p, obj->data.s);
                                }
+#endif
                                void format_diskio(unsigned int diskio_value)
                                {
                                        if (!use_spacer) {