[Lunar-commits] r17601 - in moonbase/trunk: devel/subversion libs/apr-iconv libs/apr-util

[Jerry Lundström]

Author: prox
Date: 2005-12-08 15:19:33 +0000 (Thu, 08 Dec 2005)
New Revision: 17601

Added:
   moonbase/trunk/libs/apr-iconv/BUILD
Modified:
   moonbase/trunk/devel/subversion/BUILD
   moonbase/trunk/devel/subversion/DEPENDS
   moonbase/trunk/libs/apr-iconv/DEPENDS
   moonbase/trunk/libs/apr-util/DEPENDS
Log:
fixed depend stuff

Modified: moonbase/trunk/devel/subversion/BUILD
===================================================================
--- moonbase/trunk/devel/subversion/BUILD	2005-12-08 14:35:41 UTC (rev 17600)
+++ moonbase/trunk/devel/subversion/BUILD	2005-12-08 15:19:33 UTC (rev 17601)
@@ -1,4 +1,6 @@
 (
+  OPTS="$OPTS --with-neon=`neon-config --prefix` --with-apr=`which apr-$(installed_version apr | cut -d. -f1)-config` --with-apr-util=`which apu-$(installed_version apr-util | cut -d. -f1)-config`"
+
   if in_depends $MODULE swig ; then
     if module_installed perl; then
       BINDINGS_MAKE="$BINDINGS_MAKE swig-pl"

Modified: moonbase/trunk/devel/subversion/DEPENDS
===================================================================
--- moonbase/trunk/devel/subversion/DEPENDS	2005-12-08 14:35:41 UTC (rev 17600)
+++ moonbase/trunk/devel/subversion/DEPENDS	2005-12-08 15:19:33 UTC (rev 17601)
@@ -1,7 +1,7 @@
-depends  neon      "--with-neon=`neon-config --prefix`" &&
+depends  neon      &&
 depends  zlib      &&
 depends  db        &&
-depends  apr       "--with-apr=/usr/bin/apr-1-config" &&
-depends  apr-util  "--with-apr-util=/usr/bin/apu-1-config" &&
+depends  apr       &&
+depends  apr-util  &&
 
 optional_depends "swig" "" "--without-swig" "for Perl/Python and Ruby Swig Bindings"

Added: moonbase/trunk/libs/apr-iconv/BUILD
===================================================================
--- moonbase/trunk/libs/apr-iconv/BUILD	2005-12-08 14:35:41 UTC (rev 17600)
+++ moonbase/trunk/libs/apr-iconv/BUILD	2005-12-08 15:19:33 UTC (rev 17601)
@@ -0,0 +1,4 @@
+(
+  OPTS="$OPTS --with-apr=`which apr-$(installed_version apr | cut -d. -f1)-config`"
+  default_build
+) > $C_FIFO 2>&1

Modified: moonbase/trunk/libs/apr-iconv/DEPENDS
===================================================================
--- moonbase/trunk/libs/apr-iconv/DEPENDS	2005-12-08 14:35:41 UTC (rev 17600)
+++ moonbase/trunk/libs/apr-iconv/DEPENDS	2005-12-08 15:19:33 UTC (rev 17601)
@@ -1 +1 @@
-depends apr "--with-apr=/usr/bin/apr-1-config"
+depends apr

Modified: moonbase/trunk/libs/apr-util/DEPENDS
===================================================================
--- moonbase/trunk/libs/apr-util/DEPENDS	2005-12-08 14:35:41 UTC (rev 17600)
+++ moonbase/trunk/libs/apr-util/DEPENDS	2005-12-08 15:19:33 UTC (rev 17601)
@@ -1 +1 @@
-depends apr "--with-apr=/usr/bin/apr-1-config"
+depends apr