From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 22 May 2007 10:28:20 +0000 (+0000)
Subject: Fix subversion compilation when apache is present on the host system (#1737)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=65a822f9fee92915047b5c88843d10705ac60745;p=openwrt%2Fsvn-archive%2Farchive.git

Fix subversion compilation when apache is present on the host system (#1737)


SVN-Revision: 7305
---

diff --git a/net/subversion/Makefile b/net/subversion/Makefile
index 49606bc79d..10aa657417 100644
--- a/net/subversion/Makefile
+++ b/net/subversion/Makefile
@@ -26,7 +26,7 @@ define Package/subversion/Default
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A compelling replacement for CVS
-  DEPENDS:=+zlib +neon +libintl
+  DEPENDS:=+zlib +neon +libintl +apr +apr-util
   URL:=http://subversion.tigris.org/
   SUBMENU:=subversion
 endef
@@ -61,6 +61,8 @@ define Build/Configure
 		--without-berkeley-db \
 		--with-ssl \
 		--disable-neon-version-check \
+		--with-apxs=no \
+		--with-apache=no \
 		, \
 		svn_lib_neon=yes \
 		LDFLAGS="-lcrypt -lnsl -lm -lintl -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
@@ -96,3 +98,7 @@ endef
 $(eval $(call BuildPackage,subversion-libs))
 $(eval $(call BuildPackage,subversion-client))
 $(eval $(call BuildPackage,subversion-server))
+
+$(eval $(call RequireCommand,/usr/bin/ruby, \
+	$(PKG_NAME) requires ruby installed on the host-system. \
+))