Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 152746 | Differences between
and this patch

Collapse All | Expand All

(-)subversion-1.4.0.ebuild.orig (-3 / +7 lines)
Lines 76-82 Link Here
76
76
77
src_compile() {
77
src_compile() {
78
	local myconf
78
	local myconf
79
	myconf="--with-apr=/usr --with-apr-util=/usr"
79
	
80
	apache_minor="$(best_version apache | cut -d. -f2)"
81
	if [ "x${apache_minor}" = "x0" ]; then
82
		myconf="--with-apr=${ROOT}/usr/bin/apr-config --with-apr-util=${ROOT}/usr/bin/apu-config"
83
	else
84
		myconf="--with-apr=${ROOT}/usr/bin/apr-1-config --with-apr-util=${ROOT}/usr/bin/apu-1-config"
85
	fi
80
86
81
	use apache2 && myconf="${myconf} --with-apxs=${APXS2}"
87
	use apache2 && myconf="${myconf} --with-apxs=${APXS2}"
82
	use apache2 || myconf="${myconf} --without-apxs"
88
	use apache2 || myconf="${myconf} --without-apxs"
Lines 102-109 Link Here
102
		$(use_with berkdb berkeley-db) \
108
		$(use_with berkdb berkeley-db) \
103
		$(use_with python) \
109
		$(use_with python) \
104
		$(use_enable nls) \
110
		$(use_enable nls) \
105
		--with-apr=/usr \
106
		--with-apr-util=/usr \
107
		--disable-experimental-libtool \
111
		--disable-experimental-libtool \
108
		--disable-mod-activation || die "econf failed"
112
		--disable-mod-activation || die "econf failed"
109
113

Return to bug 152746