[patch] subversion-1.4.2-apache2.2-fix-r1.diff

subversion-1.4.2-apache2.2-fix-r1.diff (text/plain), 1.43 KB, created by Brian Tarricone on 2006-12-01 20:11:50 UTC

--- subversion-1.4.2.ebuild.orig	2006-12-01 20:08:48.000000000 -0800
+++ subversion-1.4.2.ebuild	2006-12-01 20:04:55.000000000 -0800
@@ -75,10 +75,27 @@
 
 src_compile() {
 	local myconf
-	myconf="--with-apr=/usr --with-apr-util=/usr"
+	local apr_suffix=""
 
-	use apache2 && myconf="${myconf} --with-apxs=${APXS2}"
-	use apache2 || myconf="${myconf} --without-apxs"
+	if use apache2; then
+		# apache 2.2 requires linking to apr and apr-util 1.x (bug #152746)
+		apache_minor="$(best_version apache | cut -d. -f2)"
+		if [ ${apache_minor} -gt 0 ]; then
+			apr_suffix="-1"
+		fi
+
+		myconf="--with-apxs=${APXS2}"
+	else
+		if [ -x "${ROOT}/usr/bin/apr-1-config" -a -x "${ROOT}/usr/bin/apu-1-config" ]; then
+			apr_suffix="-1"
+		fi
+
+		myconf="--without-apxs"
+	fi
+
+	myconf="${myconf} --with-apr=${ROOT}/usr/bin/apr${apr_suffix}-config"
+	myconf="${myconf} --with-apr-util=${ROOT}/usr/bin/apu${apr_suffix}-config"
+	append-flags `${ROOT}/usr/bin/apr${apr_suffix}-config --cppflags`
 
 	myconf="${myconf} $(use_enable java javahl)"
 	use java && myconf="${myconf} --without-jikes --with-jdk=${JAVA_HOME}"
@@ -95,14 +112,10 @@
 		myconf="${myconf} --with-neon=/usr"
 	fi
 
-	append-flags `/usr/bin/apr-config --cppflags`
-
 	econf ${myconf} \
 		$(use_with berkdb berkeley-db) \
 		$(use_with python) \
 		$(use_enable nls) \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
 		--disable-experimental-libtool \
 		--disable-mod-activation || die "econf failed"