Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 205606
Collapse All | Expand All

(-)autotools.eclass.orig (-4 / +11 lines)
Lines 140-146 Link Here
140
	lttest="$(autotools_check_macro "AC_PROG_LIBTOOL")$(autotools_check_macro "AM_PROG_LIBTOOL")"
140
	lttest="$(autotools_check_macro "AC_PROG_LIBTOOL")$(autotools_check_macro "AM_PROG_LIBTOOL")"
141
	[[ -n $lttest ]] || return 0
141
	[[ -n $lttest ]] || return 0
142
142
143
	[[ -f Makefile.am ]] && opts="--automake"
143
	[[ -f GNUmakefile.am || -f Makefile.am ]] && opts="--automake"
144
144
145
	[[ "${USERLAND}" == "Darwin" ]] && LIBTOOLIZE="glibtoolize"
145
	[[ "${USERLAND}" == "Darwin" ]] && LIBTOOLIZE="glibtoolize"
146
	autotools_run_tool ${LIBTOOLIZE:-libtoolize} "$@" ${opts}
146
	autotools_run_tool ${LIBTOOLIZE:-libtoolize} "$@" ${opts}
Lines 168-183 Link Here
168
168
169
eautomake() {
169
eautomake() {
170
	local extra_opts
170
	local extra_opts
171
	local makefile_name
171
172
172
	[[ -f Makefile.am ]] || return 0
173
	if [[ -f GNUmakefile.am ]]; then
174
		makefile_name="GNUmakefile"
175
	elif [[ -f Makefile.am ]]; then
176
		makefile_name="Makefile"
177
	else
178
		return 0
179
	fi
173
180
174
	if [[ -z ${FROM_EAUTORECONF} && -f Makefile.in ]]; then
181
	if [[ -z ${FROM_EAUTORECONF} && -f ${makefile_name}.in ]]; then
175
		local used_automake
182
		local used_automake
176
		local installed_automake
183
		local installed_automake
177
184
178
		installed_automake=$(automake --version | head -n 1 | \
185
		installed_automake=$(automake --version | head -n 1 | \
179
			sed -e 's:.*(GNU automake) ::')
186
			sed -e 's:.*(GNU automake) ::')
180
		used_automake=$(head -n 1 < Makefile.in | \
187
		used_automake=$(head -n 1 < ${makefile_name}.in | \
181
			sed -e 's:.*by automake \(.*\) from .*:\1:')
188
			sed -e 's:.*by automake \(.*\) from .*:\1:')
182
189
183
		if [[ ${installed_automake} != ${used_automake} ]]; then
190
		if [[ ${installed_automake} != ${used_automake} ]]; then

Return to bug 205606