diff options
| author | Christian Persch <chpe@gnome.org> | 2011-12-11 21:34:39 +0100 |
|---|---|---|
| committer | Christian Persch <chpe@gnome.org> | 2011-12-11 22:18:54 +0100 |
| commit | 6637c802c0a4c685a4e1866c9f7b033c2dd78979 (patch) | |
| tree | 49922f0a3aa036411e1e8a4f0fea0f459318e260 /src | |
| parent | fb4164470b49e80f5419ec8188b64d23221ea222 (diff) | |
| download | libcroco-6637c802c0a4c685a4e1866c9f7b033c2dd78979.tar.gz | |
Modernise and simplify configure
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/cr-sel-eng.h | 6 | ||||
| -rw-r--r-- | src/libcroco-config.h.in | 5 |
3 files changed, 5 insertions, 12 deletions
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 - |