[gnote] * Properly check for libxml2.



commit 3dcfc74f4b03f2b96dad4036f3b260d51e931f68
Author: Hubert Figuiere <hub figuiere net>
Date:   Tue Apr 21 22:30:17 2009 -0400

      * Properly check for libxml2.
---
 NEWS                    |    1 +
 configure.ac            |    1 +
 src/Makefile.am         |    2 +-
 src/addins/addins.mk.in |    2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 3470be9..9fd5a5c 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ Fixes:
     (Close #579225)
   * Fix offsets on WikiWord (similar to bug #579225)
   * Initialize gettext properly (Close #579520)
+  * Properly check for libxml2.
 
 Translations:
 
diff --git a/configure.ac b/configure.ac
index c5832b7..95bbd9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,7 @@ AC_LANG_COMPILER_REQUIRE
 PKG_CHECK_MODULES(LIBGLIBMM, [glibmm-2.4])
 PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= $GTK_VERSION])
 PKG_CHECK_MODULES(LIBGTKMM, [gtkmm-2.4 >= $LIBGTKMM_VERSION])
+PKG_CHECK_MODULES(LIBXML, [libxml-2.0])
 PKG_CHECK_MODULES(LIBXMLPP, [libxml++-2.6])
 PKG_CHECK_MODULES(GCONF, [gconf-2.0])
 dnl PKG_CHECK_MODULES(LIBGLADEMM, [libglademm-2.4 >= $LIBGLADEMM_VERSION])
diff --git a/src/Makefile.am b/src/Makefile.am
index 6309493..9fcb8e2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = addins
 INCLUDES = -I$(top_srcdir)
 AM_CPPFLAGS= LIBGTKMM_CFLAGS@ @LIBGLIBMM_CFLAGS@ \
 	@LIBXMLPP_CFLAGS@ @GCONF_CFLAGS@ @GTK_CFLAGS@ \
-	@GTKSPELL_CFLAGS@ \
+	@GTKSPELL_CFLAGS@ @LIBXML_CFLAGS@ \
 	-DGNOTE_LOCALEDIR=\"@GNOTE_LOCALEDIR \" \
 	-DDATADIR=\"$(datadir)\" -DLIBDIR=\"$(libdir)\"
 
diff --git a/src/addins/addins.mk.in b/src/addins/addins.mk.in
index c74d120..6e05c2f 100644
--- a/src/addins/addins.mk.in
+++ b/src/addins/addins.mk.in
@@ -4,7 +4,7 @@
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
 
 AM_CPPFLAGS= LIBGTKMM_CFLAGS@ @LIBGLIBMM_CFLAGS@ \
-	@GCONF_CFLAGS@ \
+	@GCONF_CFLAGS@ @LIBXML_CFLAGS@ \
 	-DDATADIR=\"$(datadir)\" -DLIBDIR=\"$(libdir)\"
 
 AM_LDFLAGS = -avoid-version -module -Wl,--export-dynamic



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]