[network-manager-openconnect] check for libxml in configure.ac and use the pkg-config CFLAGS
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openconnect] check for libxml in configure.ac and use the pkg-config CFLAGS
- Date: Mon, 18 Apr 2011 14:51:17 +0000 (UTC)
commit 504b1eeb52504b7263149be0adad502721dca7b5
Author: Gregor Burger <burger gregor gmail com>
Date: Sat Apr 16 15:03:58 2011 +0200
check for libxml in configure.ac and use the pkg-config CFLAGS
not all distributions (e.g. Archlinux) install the libxml headers
in directly in /usr/include/ but in /usr/include/libxml2/.
auth-dialog/Makefile.am | 4 +++-
configure.ac | 4 ++++
2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 67d33d9..67bffd8 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -9,6 +9,7 @@ nm_openconnect_auth_dialog_CPPFLAGS = \
$(GCONF_CFLAGS) \
$(OPENCONNECT_CFLAGS) \
$(GNOMEKEYRING_CFLAGS) \
+ $(LIBXML_CFLAGS) \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DBINDIR=\""$(bindir)"\" \
-DG_DISABLE_DEPRECATED \
@@ -25,7 +26,8 @@ nm_openconnect_auth_dialog_LDADD = \
$(GTK_LIBS) \
$(NETWORKMANAGER_LIBS) \
$(GCONF_LIBS) \
- $(OPENCONNECT_LIBS)
+ $(OPENCONNECT_LIBS) \
+ $(LIBXML_LIBS)
CLEANFILES = *~
diff --git a/configure.ac b/configure.ac
index eb680b2..88c3947 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,10 @@ PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
AC_SUBST(GTHREAD_CFLAGS)
AC_SUBST(GTHREAD_LIBS)
+PKG_CHECK_MODULES(LIBXML, libxml-2.0)
+AC_SUBST(LIBXML_CFLAGS)
+AC_SUBST(LIBXML_LIBS)
+
PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.74)
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]