build fixes
Dana Jansens danakj@orodu.net
3 files changed,
11 insertions(+),
3 deletions(-)
M
Makefile.am
→
Makefile.am
@@ -42,6 +42,7 @@ ## render ##
render_rendertest_CPPFLAGS = \ $(PANGO_CFLAGS) \ + $(XFT_CFLAGS) \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\"RenderTest\" render_rendertest_LDADD = \@@ -49,6 +50,7 @@ parser/libobparser.la \
render/libobrender.la \ $(GLIB_LIBS) \ $(PANGO_LIBS) \ + $(XFT_LIBS) \ $(XML_LIBS) \ $(X_LIBS) render_rendertest_SOURCES = render/test.c@@ -58,6 +60,7 @@ $(X_CFLAGS) \
$(GLIB_CFLAGS) \ $(XML_CFLAGS) \ $(PANGO_CFLAGS) \ + $(XFT_CFLAGS) \ -DG_LOG_DOMAIN=\"ObRender\" \ -DDEFAULT_THEME=\"$(theme)\" render_libobrender_la_LDFLAGS = \@@ -66,6 +69,7 @@ render_libobrender_la_LIBADD = \
parser/libobparser.la \ $(X_LIBS) \ $(PANGO_LIBS) \ + $(XFT_LIBS) \ $(GLIB_LIBS) \ $(XML_LIBS) render_libobrender_la_SOURCES = \
M
configure.ac
→
configure.ac
@@ -78,6 +78,10 @@ PKG_CHECK_MODULES(PANGO, [pango >= 1.8.0 pangoxft >= 1.8.0])
AC_SUBST(PANGO_CFLAGS) AC_SUBST(PANGO_LIBS) +PKG_CHECK_MODULES(XFT, [xft]) +AC_SUBST(XFT_CFLAGS) +AC_SUBST(XFT_LIBS) + PKG_CHECK_MODULES(XML, [libxml-2.0]) AC_SUBST(XML_CFLAGS) AC_SUBST(XML_LIBS)
M
render/render.c
→
render/render.c
@@ -18,9 +18,6 @@
See the COPYING file for a copy of the GNU General Public License. */ -#include <X11/Xlib.h> -#include <X11/Xutil.h> - #include "render.h" #include "gradient.h" #include "font.h"@@ -30,6 +27,9 @@ #include "image.h"
#include "theme.h" #include <glib.h> +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#include <X11/Xft/Xft.h> #ifdef HAVE_STDLIB_H # include <stdlib.h>