[Lunar-commits] <moonbase> dbus: Fix dependency on libxml2/expat.

Jannis Pohlmann jannis at xfce.org
Sun Mar 2 19:01:25 CET 2008


commit 841a214c68f093db636517c13c22104f3b2175ac
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sun Mar 2 19:01:25 2008 +0100

    dbus: Fix dependency on libxml2/expat.
    
    Make use of the %XMLRENDERER alias. This makes it possible to choose
    between libxml2 and expat.
---
 devel/dbus/BUILD   |    6 +++++-
 devel/dbus/DEPENDS |    1 +
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/devel/dbus/BUILD b/devel/dbus/BUILD
index a6bc30f..abdd14e 100644
--- a/devel/dbus/BUILD
+++ b/devel/dbus/BUILD
@@ -10,8 +10,12 @@
     OPTS="$OPTS --disable-mono"
   fi
 
+  # Figure out which XML library to use (expat or libxml2 - without the 2
+  # at the end though).
+  XMLLIB=$(get_local_config LUNAR_ALIAS_XMLRENDERER | sed 's/2//g')
+
   OPTS="$OPTS --with-x --enable-checks --enable-verbose-mode              \
-        --with-xml=$XMLRENDERER --with-system-pid-file=/var/run/messagebus.pid  \
+        --with-xml=$XMLLIB --with-system-pid-file=/var/run/messagebus.pid \
         --with-system-socket=/var/lib/dbus/system_bus_socket              \
         --with-session-socket-dir=/tmp  --with-dbus-user=messagebus       \
         --disable-xml-docs --with-init-scripts=none"
diff --git a/devel/dbus/DEPENDS b/devel/dbus/DEPENDS
index a708cc1..48620dc 100644
--- a/devel/dbus/DEPENDS
+++ b/devel/dbus/DEPENDS
@@ -1 +1,2 @@
 depends pkgconfig
+depends %XMLRENDERER


More information about the Lunar-commits mailing list