[Lunar-commits] <moonbase> apr-util: changed optional_depends expat to hard depends

[Duncan Gibson]

commit 1793e33277ed0c602cc411450c604e38d4cf7e49
Author: Christian Krause <kizkizzbangbang at googlemail.com>
Date:   Mon Apr 25 22:55:15 2011 +0200

    apr-util: changed optional_depends expat to hard depends
    
    expat is actually required see mailing list for further explanation
    http://foo-projects.org/pipermail/lunar-dev/2011-April/007154.html
---
 libs/apr-util/BUILD   |    2 +-
 libs/apr-util/DEPENDS |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/apr-util/BUILD b/libs/apr-util/BUILD
index f7ac4be..8efa07e 100644
--- a/libs/apr-util/BUILD
+++ b/libs/apr-util/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS+=" --with-apr=`which apr-$(installed_version apr | cut -d. -f1)-config` --with-iconv=/usr --disable-static" &&
+  OPTS+=" --with-apr=`which apr-$(installed_version apr | cut -d. -f1)-config` --with-iconv=/usr" &&
 
   default_build
 
diff --git a/libs/apr-util/DEPENDS b/libs/apr-util/DEPENDS
index e33427a..b9fccbd 100644
--- a/libs/apr-util/DEPENDS
+++ b/libs/apr-util/DEPENDS
@@ -1,10 +1,10 @@
 depends apr
+depends expat
 
 optional_depends "openldap"   "--with-ldap=ldap"    "" "ldap support"
 optional_depends "mysql"      "--with-mysql=/usr"   "" "mysql support"
 optional_depends "postgresql" "--with-pgsql=/usr"   "" "postgresql support"
 optional_depends "sqlite"     "--with-sqlite3=/usr" "" "sqlite support"
-optional_depends "expat"      "--with-expat=/usr"   "" "expat support"
 
 optional_depends "db"         "--with-dbm=db44  --with-berkeley-db=/usr" \
                                                     "" "berkeley db support"