[Lunar-commits] <moonbase-other> neon: Fixing up the BUILD

[Dennis Veatch]

commit 95333a744a0cb4302409cbe952adb4eafde6f9f1
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Sat, 13 Sep 2014 07:27:34 -0400
URL: https://github.com/lunar-linux/moonbase-other/commit/95333a744a0cb4302409cbe952adb4eafde6f9f1

neon: Fixing up the BUILD
---
  libs/neon/BUILD | +4/-11    
  1 file changed, 4 insertions(+), 11 deletions(-)

--- a/libs/neon/BUILD
+++ b/libs/neon/BUILD
@@ -1,13 +1,8 @@
-(
-
-  # get the aliases
-  SSL=`unalias %SSL`         &&
-  XML=`unalias %XMLRENDERER` &&
 
   # setting the ssl option
-  if [[ $SSL == "openssl" ]] && module_installed "openssl" ; then
+  if in_depends $MODULE openssl ; then
         OPTS+=" --with-ssl=openssl"
-  elif [[ $SSL == "gnutls" ]] && module_installed "gnutls" ; then
+  elif in_depends $MODULE gnutls ; then
         OPTS+=" --with-ssl=gnutls"
   else
         OPTS+=" --without-ssl"
@@ -15,9 +10,9 @@
 
   # 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
+  if in_depends $MODULE libxml2 ; then
         OPTS+=" --with-libxml2 --without-expat"
-  elif [[ $XML == "gnutls" ]] && module_installed "expat" ; then
+  elif in_depends $MODULE gnutls && module_installed expat ; then
         OPTS+=" --with-expat --without-libxml2"
   else
         OPTS+=" --without-libxml2 --without-expat"
@@ -26,5 +21,3 @@
   OPTS+=" --enable-shared --disable-static" &&
 
   default_build
-
-) > $C_FIFO 2>&1