[Lunar-commits] <moonbase> neon: added missing dep and fixed BUILD

[Auke Kok]

commit 426d085b54ca2a506b0a40c9a4a3f7b00bbf53d9
Author: Christian Krause <kizkizzbangbang at googlemail.com>
Date:   Mon Feb 7 23:46:09 2011 +0100

    neon: added missing dep and fixed BUILD
---
 libs/neon/BUILD   |   24 +++++++++++++++++++++---
 libs/neon/DEPENDS |    5 +++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/libs/neon/BUILD b/libs/neon/BUILD
index 696ef5e..bdca000 100644
--- a/libs/neon/BUILD
+++ b/libs/neon/BUILD
@@ -1,12 +1,30 @@
 (
 
-  if module_installed openssl ; then
+  # get the aliases
+  SSL=`unalias %SSL`         &&
+  XML=`unalias %XMLRENDERER` &&
+
+  # setting the ssl option
+  if [[ $SSL == "openssl" ]] && module_installed "openssl" ; then
         OPTS+=" --with-ssl=openssl"
-  else
+  elif [[ $SSL == "gnutls" ]] && module_installed "gnutls" ; then
         OPTS+=" --with-ssl=gnutls"
+  else
+        OPTS+=" --without-ssl"
   fi &&
 
-  OPTS+=" --enable-shared"
+  # setting the xml renderer option (forced without, since
+  # unfortunately there is no --with-xml=foo like with ssl
+  if [[ $XML == "libxml2" ]] && module_installed "libxml2" ; then
+        OPTS+=" --with-libxml2 --without-expat"
+  elif [[ $XML == "gnutls" ]] && module_installed "expat" ; then
+        OPTS+=" --with-expat --without-libxml2"
+  else
+        OPTS+=" --without-libxml2 --without-expat"
+  fi &&
+
+  OPTS+=" --enable-shared" &&
+
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/libs/neon/DEPENDS b/libs/neon/DEPENDS
index 9dbb6bf..6fad50b 100644
--- a/libs/neon/DEPENDS
+++ b/libs/neon/DEPENDS
@@ -1,2 +1,7 @@
 depends %XMLRENDERER
 depends %SSL
+
+optional_depends "libproxy"             \
+                 "--with-libproxy"      \
+                 "--without-libproxy"   \
+                 "for libproxy support"