From 6637c802c0a4c685a4e1866c9f7b033c2dd78979 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@gnome.org>
Date: Sun, 11 Dec 2011 21:34:39 +0100
Subject: Modernise and simplify configure

---
 src/Makefile.am          | 6 ++----
 src/cr-sel-eng.h         | 6 +-----
 src/libcroco-config.h.in | 5 ++---
 3 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index f187774..e382ffe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -101,8 +101,7 @@ libcroco_0_6_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 libcroco_0_6_la_CFLAGS = \
-	@GLIB2_CFLAGS@ \
-	@LIBXML2_CFLAGS@ \
+	$(CROCO_CFLAGS) \
 	$(AM_CFLAGS)
 
 libcroco_0_6_la_LDFLAGS = \
@@ -112,5 +111,4 @@ libcroco_0_6_la_LDFLAGS = \
 	$(AM_LDFLAGS)
 
 libcroco_0_6_la_LIBADD = \
-	@GLIB2_LIBS@ \
-	@LIBXML2_LIBS@
+	$(CROCO_LIBS)
diff --git a/src/cr-sel-eng.h b/src/cr-sel-eng.h
index e64d133..cab3d14 100644
--- a/src/cr-sel-eng.h
+++ b/src/cr-sel-eng.h
@@ -30,11 +30,7 @@
 #include "cr-style.h"
 #include "cr-prop-list.h"
 
-#ifdef CROCO_HAVE_LIBXML2
- #include <libxml/tree.h>
-#endif
-
-
+#include <libxml/tree.h>
 
 /**
  *@file:
diff --git a/src/libcroco-config.h.in b/src/libcroco-config.h.in
index e817cd8..7f2e217 100644
--- a/src/libcroco-config.h.in
+++ b/src/libcroco-config.h.in
@@ -12,7 +12,6 @@
 #endif
 #endif
 
-#if @CROCO_HAVE_LIBXML2@
-#define CROCO_HAVE_LIBXML2 @CROCO_HAVE_LIBXML2@
+#ifndef CROCO_HAVE_LIBXML2
+#define CROCO_HAVE_LIBXML2 (1)
 #endif
-
-- 
cgit v1.2.1