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.2.ebuild.orig (-5 / +9 lines)
Lines 75-81 Link Here
75
75
76
src_compile() {
76
src_compile() {
77
	local myconf
77
	local myconf
78
	myconf="--with-apr=/usr --with-apr-util=/usr"
78
79
	apache_minor="$(best_version apache | cut -d. -f2)"
80
	if [ "x${apache_minor}" = "x0" ]; then
81
		myconf="--with-apr=${ROOT}/usr/bin/apr-config --with-apr-util=${ROOT}/usr/bin/apu-config"
82
		append-flags `/usr/bin/apr-config --cppflags`
83
	else
84
		myconf="--with-apr=${ROOT}/usr/bin/apr-1-config --with-apr-util=${ROOT}/usr/bin/apu-1-config"
85
		append-flags `/usr/bin/apr-1-config --cppflags`
86
	fi
79
87
80
	use apache2 && myconf="${myconf} --with-apxs=${APXS2}"
88
	use apache2 && myconf="${myconf} --with-apxs=${APXS2}"
81
	use apache2 || myconf="${myconf} --without-apxs"
89
	use apache2 || myconf="${myconf} --without-apxs"
Lines 95-108 Link Here
95
		myconf="${myconf} --with-neon=/usr"
103
		myconf="${myconf} --with-neon=/usr"
96
	fi
104
	fi
97
105
98
	append-flags `/usr/bin/apr-config --cppflags`
99
100
	econf ${myconf} \
106
	econf ${myconf} \
101
		$(use_with berkdb berkeley-db) \
107
		$(use_with berkdb berkeley-db) \
102
		$(use_with python) \
108
		$(use_with python) \
103
		$(use_enable nls) \
109
		$(use_enable nls) \
104
		--with-apr=/usr \
105
		--with-apr-util=/usr \
106
		--disable-experimental-libtool \
110
		--disable-experimental-libtool \
107
		--disable-mod-activation || die "econf failed"
111
		--disable-mod-activation || die "econf failed"
108
112

Return to bug 152746