/[gentoo-x86]/eclass/autotools.eclass
Gentoo

Diff of /eclass/autotools.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.106 Revision 1.126
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2012 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.106 2011/08/22 19:39:52 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.126 2012/03/21 08:19:22 ssuominen Exp $
4 4
5# @ECLASS: autotools.eclass 5# @ECLASS: autotools.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# base-system@gentoo.org 7# base-system@gentoo.org
8# @BLURB: Regenerates auto* build scripts 8# @BLURB: Regenerates auto* build scripts
9# @DESCRIPTION: 9# @DESCRIPTION:
10# This eclass is for safely handling autotooled software packages that need to 10# This eclass is for safely handling autotooled software packages that need to
11# regenerate their build scripts. All functions will abort in case of errors. 11# regenerate their build scripts. All functions will abort in case of errors.
12# 12
13# NB: If you add anything, please comment it! 13# Note: We require GNU m4, as does autoconf. So feel free to use any features
14# from the GNU version of m4 without worrying about other variants (i.e. BSD).
15
16if [[ ${___ECLASS_ONCE_AUTOTOOLS} != "recur -_+^+_- spank" ]] ; then
17___ECLASS_ONCE_AUTOTOOLS="recur -_+^+_- spank"
14 18
15inherit eutils libtool 19inherit eutils libtool
16 20
17# @ECLASS-VARIABLE: WANT_AUTOCONF 21# @ECLASS-VARIABLE: WANT_AUTOCONF
18# @DESCRIPTION: 22# @DESCRIPTION:
31 35
32# @ECLASS-VARIABLE: _LATEST_AUTOMAKE 36# @ECLASS-VARIABLE: _LATEST_AUTOMAKE
33# @INTERNAL 37# @INTERNAL
34# @DESCRIPTION: 38# @DESCRIPTION:
35# CONSTANT! 39# CONSTANT!
36# The latest major version/slot of automake available on each arch. 40# The latest major version/slot of automake available on each arch. #312315
37# If a newer version is stable on any arch, and is NOT reflected in this list, 41# If a newer version is stable on any arch, and is NOT reflected in this list,
38# then circular dependencies may arise during emerge @system bootstraps. 42# then circular dependencies may arise during emerge @system bootstraps.
43# If you want to force a newer minor version, you can specify the correct
44# WANT value by using a colon: <PV>[:<WANT_AUTOMAKE>]
39# Do NOT change this variable in your ebuilds! 45# Do NOT change this variable in your ebuilds!
40_LATEST_AUTOMAKE='1.11' 46_LATEST_AUTOMAKE=( 1.11.1:1.11 )
41 47
42_automake_atom="sys-devel/automake" 48_automake_atom="sys-devel/automake"
43_autoconf_atom="sys-devel/autoconf" 49_autoconf_atom="sys-devel/autoconf"
44if [[ -n ${WANT_AUTOMAKE} ]]; then 50if [[ -n ${WANT_AUTOMAKE} ]]; then
45 case ${WANT_AUTOMAKE} in 51 case ${WANT_AUTOMAKE} in
46 none) _automake_atom="" ;; # some packages don't require automake at all 52 none) _automake_atom="" ;; # some packages don't require automake at all
47 # if you change the "latest" version here, change also autotools_run_tool 53 # if you change the "latest" version here, change also autotools_run_tool
48 # this MUST reflect the latest stable major version for each arch! 54 # this MUST reflect the latest stable major version for each arch!
49 latest) _automake_atom="|| ( `printf '=sys-devel/automake-%s* ' ${_LATEST_AUTOMAKE}` )" ;; 55 latest) _automake_atom="|| ( `printf '>=sys-devel/automake-%s ' ${_LATEST_AUTOMAKE[@]/%:*}` )" ;;
50 *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;; 56 *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
51 esac 57 esac
52 export WANT_AUTOMAKE 58 export WANT_AUTOMAKE
53fi 59fi
54 60
55if [[ -n ${WANT_AUTOCONF} ]] ; then 61if [[ -n ${WANT_AUTOCONF} ]] ; then
56 case ${WANT_AUTOCONF} in 62 case ${WANT_AUTOCONF} in
57 none) _autoconf_atom="" ;; # some packages don't require autoconf at all 63 none) _autoconf_atom="" ;; # some packages don't require autoconf at all
58 2.1) _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;; 64 2.1) _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;;
59 # if you change the latest version here, change also autotools_run_tool 65 # if you change the "latest" version here, change also autotools_env_setup
60 latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.61" ;; 66 latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.68" ;;
61 *) die "Invalid WANT_AUTOCONF value '${WANT_AUTOCONF}'" ;; 67 *) die "Invalid WANT_AUTOCONF value '${WANT_AUTOCONF}'" ;;
62 esac 68 esac
63 export WANT_AUTOCONF 69 export WANT_AUTOCONF
64fi 70fi
65 71
92# @DEFAULT_UNSET 98# @DEFAULT_UNSET
93# @DESCRIPTION: 99# @DESCRIPTION:
94# Additional options to pass to automake during 100# Additional options to pass to automake during
95# eautoreconf call. 101# eautoreconf call.
96 102
103# @ECLASS-VARIABLE: AT_NOEACLOCAL
104# @DEFAULT_UNSET
105# @DESCRIPTION:
106# Don't run eaclocal command if set to 'yes',
107# useful when eaclocal needs to be ran with
108# particular options
109
110# @ECLASS-VARIABLE: AT_NOEAUTOCONF
111# @DEFAULT_UNSET
112# @DESCRIPTION:
113# Don't run eautoconf command if set to 'yes',
114# useful when eautoconf needs to be ran with
115# particular options
116
117# @ECLASS-VARIABLE: AT_NOEAUTOMAKE
118# @DEFAULT_UNSET
119# @DESCRIPTION:
120# Don't run eautomake command if set to 'yes',
121# useful when eautomake needs to be ran with
122# particular options
123
97# @ECLASS-VARIABLE: AT_NOELIBTOOLIZE 124# @ECLASS-VARIABLE: AT_NOELIBTOOLIZE
98# @DEFAULT_UNSET 125# @DEFAULT_UNSET
99# @DESCRIPTION: 126# @DESCRIPTION:
100# Don't run elibtoolize command if set to 'yes', 127# Don't run elibtoolize command if set to 'yes',
101# useful when elibtoolize needs to be ran with 128# useful when elibtoolize needs to be ran with
102# particular options 129# particular options
103 130
104# XXX: M4DIR should be deprecated
105# @ECLASS-VARIABLE: AT_M4DIR 131# @ECLASS-VARIABLE: AT_M4DIR
106# @DESCRIPTION: 132# @DESCRIPTION:
107# Additional director(y|ies) aclocal should search 133# Additional director(y|ies) aclocal should search
108: ${AT_M4DIR:=${M4DIR}} 134: ${AT_M4DIR:=}
135
136# @ECLASS-VARIABLE: AT_SYS_M4DIR
137# @INTERNAL
138# @DESCRIPTION:
139# For system integrators, a list of additional aclocal search paths.
140# This variable gets eval-ed, so you can use variables in the definition
141# that may not be valid until eautoreconf & friends are run.
142: ${AT_SYS_M4DIR:=}
109 143
110# @FUNCTION: eautoreconf 144# @FUNCTION: eautoreconf
111# @DESCRIPTION: 145# @DESCRIPTION:
112# This function mimes the behavior of autoreconf, but uses the different 146# This function mimes the behavior of autoreconf, but uses the different
113# eauto* functions to run the tools. It doesn't accept parameters, but 147# eauto* functions to run the tools. It doesn't accept parameters, but
129 done 163 done
130 fi 164 fi
131 165
132 auxdir=$(autotools_get_auxdir) 166 auxdir=$(autotools_get_auxdir)
133 167
168 if [[ ${AT_NOEACLOCAL} != "yes" ]]; then
134 einfo "Running eautoreconf in '${PWD}' ..." 169 einfo "Running eautoreconf in '${PWD}' ..."
135 [[ -n ${auxdir} ]] && mkdir -p ${auxdir} 170 [[ -n ${auxdir} ]] && mkdir -p ${auxdir}
136 eaclocal 171 eaclocal
172 fi
137 [[ ${CHOST} == *-darwin* ]] && g=g 173 [[ ${CHOST} == *-darwin* ]] && g=g
138 if ${LIBTOOLIZE:-${g}libtoolize} -n --install >& /dev/null ; then 174 if ${LIBTOOLIZE:-${g}libtoolize} -n --install >& /dev/null ; then
139 _elibtoolize --copy --force --install 175 _elibtoolize --copy --force --install
140 else 176 else
141 _elibtoolize --copy --force 177 _elibtoolize --copy --force
142 fi 178 fi
143 eautoconf 179 [[ ${AT_NOEAUTOCONF} != "yes" ]] && eautoconf
144 eautoheader 180 [[ ${AT_NOEAUTOHEADER} != "yes" ]] && eautoheader
145 FROM_EAUTORECONF="yes" eautomake ${AM_OPTS} 181 [[ ${AT_NOEAUTOMAKE} != "yes" ]] && FROM_EAUTORECONF="yes" eautomake ${AM_OPTS}
146 182
147 [[ ${AT_NOELIBTOOLIZE} == "yes" ]] && return 0 183 [[ ${AT_NOELIBTOOLIZE} == "yes" ]] && return 0
148 184
149 # Call it here to prevent failures due to elibtoolize called _before_ 185 # Call it here to prevent failures due to elibtoolize called _before_
150 # eautoreconf. We set $S because elibtoolize runs on that #265319 186 # eautoreconf. We set $S because elibtoolize runs on that #265319
151 S=${PWD} elibtoolize 187 S=${PWD} elibtoolize --force
152 188
153 return 0 189 return 0
190}
191
192# @FUNCTION: eaclocal_amflags
193# @DESCRIPTION:
194# Extract the ACLOCAL_AMFLAGS value from the Makefile.am and try to handle
195# (most) of the crazy crap that people throw at us.
196eaclocal_amflags() {
197 local aclocal_opts amflags_file
198
199 for amflags_file in GNUmakefile.am Makefile.am GNUmakefile.in Makefile.in ; do
200 [[ -e ${amflags_file} ]] || continue
201 # setup the env in case the pkg does something crazy
202 # in their ACLOCAL_AMFLAGS. like run a shell script
203 # which turns around and runs autotools. #365401
204 # or split across multiple lines. #383525
205 autotools_env_setup
206 aclocal_opts=$(sed -n \
207 "/^ACLOCAL_AMFLAGS[[:space:]]*=/{ \
208 # match the first line
209 s:[^=]*=::p; \
210 # then gobble up all escaped lines
211 : nextline /\\\\$/{ n; p; b nextline; } \
212 }" ${amflags_file})
213 eval aclocal_opts=\""${aclocal_opts}"\"
214 break
215 done
216
217 echo ${aclocal_opts}
154} 218}
155 219
156# @FUNCTION: eaclocal 220# @FUNCTION: eaclocal
157# @DESCRIPTION: 221# @DESCRIPTION:
158# These functions runs the autotools using autotools_run_tool with the 222# These functions runs the autotools using autotools_run_tool with the
159# specified parametes. The name of the tool run is the same of the function 223# specified parametes. The name of the tool run is the same of the function
160# without e prefix. 224# without e prefix.
161# They also force installing the support files for safety. 225# They also force installing the support files for safety.
162# Respects AT_M4DIR for additional directories to search for macro's. 226# Respects AT_M4DIR for additional directories to search for macro's.
163eaclocal() { 227eaclocal() {
164 local aclocal_opts
165
166 local amflags_file
167 for amflags_file in GNUmakefile.am Makefile.am GNUmakefile.in Makefile.in ; do
168 [[ -e ${amflags_file} ]] || continue
169 # setup the env in case the pkg does something crazy
170 # in their ACLOCAL_AMFLAGS. like run a shell script
171 # which turns around and runs autotools #365401
172 autotools_env_setup
173 aclocal_opts=$(sed -n '/^ACLOCAL_AMFLAGS[[:space:]]*=/s:[^=]*=::p' ${amflags_file})
174 eval aclocal_opts=\"${aclocal_opts}\"
175 break
176 done
177
178 [[ ! -f aclocal.m4 || -n $(grep -e 'generated.*by aclocal' aclocal.m4) ]] && \ 228 [[ ! -f aclocal.m4 || -n $(grep -e 'generated.*by aclocal' aclocal.m4) ]] && \
179 autotools_run_tool aclocal $(autotools_m4dir_include) "$@" ${aclocal_opts} 229 autotools_run_tool --at-m4flags aclocal "$@" $(eaclocal_amflags)
180} 230}
181 231
182# @FUNCTION: _elibtoolize 232# @FUNCTION: _elibtoolize
183# @DESCRIPTION: 233# @DESCRIPTION:
184# Runs libtoolize. Note the '_' prefix .. to not collide with elibtoolize() from 234# Runs libtoolize. Note the '_' prefix .. to not collide with elibtoolize() from
203# @DESCRIPTION: 253# @DESCRIPTION:
204# Runs autoheader. 254# Runs autoheader.
205eautoheader() { 255eautoheader() {
206 # Check if we should run autoheader 256 # Check if we should run autoheader
207 [[ -n $(autotools_check_macro "AC_CONFIG_HEADERS") ]] || return 0 257 [[ -n $(autotools_check_macro "AC_CONFIG_HEADERS") ]] || return 0
208 NO_FAIL=1 autotools_run_tool autoheader $(autotools_m4dir_include) "$@" 258 autotools_run_tool --at-no-fail --at-m4flags autoheader "$@"
209} 259}
210 260
211# @FUNCTION: eautoconf 261# @FUNCTION: eautoconf
212# @DESCRIPTION: 262# @DESCRIPTION:
213# Runs autoconf. 263# Runs autoconf.
217 eerror "No configure.{ac,in} present in '${PWD}'!" 267 eerror "No configure.{ac,in} present in '${PWD}'!"
218 echo 268 echo
219 die "No configure.{ac,in} present!" 269 die "No configure.{ac,in} present!"
220 fi 270 fi
221 271
222 autotools_run_tool autoconf $(autotools_m4dir_include) "$@" 272 autotools_run_tool --at-m4flags autoconf "$@"
223} 273}
224 274
225# @FUNCTION: eautomake 275# @FUNCTION: eautomake
226# @DESCRIPTION: 276# @DESCRIPTION:
227# Runs automake. 277# Runs automake.
229 local extra_opts 279 local extra_opts
230 local makefile_name 280 local makefile_name
231 281
232 # Run automake if: 282 # Run automake if:
233 # - a Makefile.am type file exists 283 # - a Makefile.am type file exists
234 # - a Makefile.in type file exists and the configure
235 # script is using the AM_INIT_AUTOMAKE directive 284 # - the configure script is using the AM_INIT_AUTOMAKE directive
236 for makefile_name in {GNUmakefile,{M,m}akefile}.{am,in} "" ; do 285 for makefile_name in {GNUmakefile,{M,m}akefile}.am "" ; do
237 [[ -f ${makefile_name} ]] && break 286 [[ -f ${makefile_name} ]] && break
238 done 287 done
239 [[ -z ${makefile_name} ]] && return 0
240 288
241 if [[ ${makefile_name} == *.in ]] ; then 289 if [[ -z ${makefile_name} ]] ; then
242 if ! grep -qs AM_INIT_AUTOMAKE configure.?? ; then 290 if ! grep -qs AM_INIT_AUTOMAKE configure.?? ; then
243 return 0 291 return 0
244 fi 292 fi
245 293
246 elif [[ -z ${FROM_EAUTORECONF} && -f ${makefile_name%.am}.in ]]; then 294 elif [[ -z ${FROM_EAUTORECONF} && -f ${makefile_name%.am}.in ]]; then
258 eautoreconf 306 eautoreconf
259 return 0 307 return 0
260 fi 308 fi
261 fi 309 fi
262 310
263 [[ -f INSTALL && -f AUTHORS && -f ChangeLog && -f NEWS ]] \ 311 [[ -f INSTALL && -f AUTHORS && -f ChangeLog && -f NEWS && -f README ]] \
264 || extra_opts="${extra_opts} --foreign" 312 || extra_opts="${extra_opts} --foreign"
265 313
266 # --force-missing seems not to be recognized by some flavours of automake 314 # --force-missing seems not to be recognized by some flavours of automake
267 autotools_run_tool automake --add-missing --copy ${extra_opts} "$@" 315 autotools_run_tool automake --add-missing --copy ${extra_opts} "$@"
268} 316}
272# Runs autopoint (from the gettext package). 320# Runs autopoint (from the gettext package).
273eautopoint() { 321eautopoint() {
274 autotools_run_tool autopoint "$@" 322 autotools_run_tool autopoint "$@"
275} 323}
276 324
325# @FUNCTION: config_rpath_update
326# @USAGE: [destination]
327# @DESCRIPTION:
328# Some packages utilize the config.rpath helper script, but don't
329# use gettext directly. So we have to copy it in manually since
330# we can't let `autopoint` do it for us.
331config_rpath_update() {
332 local dst src=$(type -P gettext | sed 's:bin/gettext:share/gettext/config.rpath:')
333
334 [[ $# -eq 0 ]] && set -- $(find -name config.rpath)
335 [[ $# -eq 0 ]] && return 0
336
337 einfo "Updating all config.rpath files"
338 for dst in "$@" ; do
339 einfo " ${dst}"
340 cp "${src}" "${dst}" || die
341 done
342}
343
277# Internal function to run an autotools' tool 344# Internal function to run an autotools' tool
278autotools_env_setup() { 345autotools_env_setup() {
279 # We do the latest → version switch here because it solves 346 # We do the "latest" → version switch here because it solves
280 # possible order problems, see bug #270010 as an example. 347 # possible order problems, see bug #270010 as an example.
281 if [[ ${WANT_AUTOMAKE} == "latest" ]]; then 348 if [[ ${WANT_AUTOMAKE} == "latest" ]]; then
282 local pv 349 local pv
283 for pv in ${_LATEST_AUTOMAKE} ; do 350 for pv in ${_LATEST_AUTOMAKE[@]/#*:} ; do
284 # has_version respects ROOT, but in this case, we don't want it to, 351 # has_version respects ROOT, but in this case, we don't want it to,
285 # thus "ROOT=/" prefix: 352 # thus "ROOT=/" prefix:
286 ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="$pv" 353 ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}"
287 done 354 done
288 [[ ${WANT_AUTOMAKE} == "latest" ]] && \ 355 [[ ${WANT_AUTOMAKE} == "latest" ]] && \
289 die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}" 356 die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}"
290 fi 357 fi
291 [[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5 358 [[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5
292} 359}
293autotools_run_tool() { 360autotools_run_tool() {
361 # Process our own internal flags first
362 local autofail=true m4flags=false
363 while [[ -n $1 ]] ; do
364 case $1 in
365 --at-no-fail) autofail=false;;
366 --at-m4flags) m4flags=true;;
367 # whatever is left goes to the actual tool
368 *) break;;
369 esac
370 shift
371 done
372
294 if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then 373 if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then
295 ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase" 374 ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase"
296 fi 375 fi
297 376
298 autotools_env_setup 377 autotools_env_setup
307 [[ -e ${STDERR_TARGET} ]] || break 386 [[ -e ${STDERR_TARGET} ]] || break
308 : $(( i++ )) 387 : $(( i++ ))
309 done 388 done
310 fi 389 fi
311 390
391 if ${m4flags} ; then
392 set -- "${1}" $(autotools_m4dir_include) "${@:2}" $(autotools_m4sysdir_include)
393 fi
394
312 printf "***** $1 *****\n***** PWD: ${PWD}\n***** $*\n\n" > "${STDERR_TARGET}" 395 printf "***** $1 *****\n***** PWD: ${PWD}\n***** $*\n\n" > "${STDERR_TARGET}"
313 396
314 ebegin "Running $@" 397 ebegin "Running $@"
315 "$@" >> "${STDERR_TARGET}" 2>&1 398 "$@" >> "${STDERR_TARGET}" 2>&1
316 eend $? 399 if ! eend $? && ${autofail} ; then
317
318 if [[ $? != 0 && ${NO_FAIL} != 1 ]] ; then
319 echo 400 echo
320 eerror "Failed Running $1 !" 401 eerror "Failed Running $1 !"
321 eerror 402 eerror
322 eerror "Include in your bugreport the contents of:" 403 eerror "Include in your bugreport the contents of:"
323 eerror 404 eerror
335 WANT_AUTOCONF="2.5" autoconf $(autotools_m4dir_include) --trace="${macro}" 2>/dev/null 416 WANT_AUTOCONF="2.5" autoconf $(autotools_m4dir_include) --trace="${macro}" 2>/dev/null
336 done 417 done
337 return 0 418 return 0
338} 419}
339 420
421# Internal function to look for a macro and extract its value
422autotools_check_macro_val() {
423 local macro=$1 scan_out
424
425 autotools_check_macro "${macro}" | \
426 gawk -v macro="${macro}" \
427 '($0 !~ /^[[:space:]]*(#|dnl)/) {
428 if (match($0, macro ":(.*)$", res))
429 print res[1]
430 }' | uniq
431
432 return 0
433}
434
340# Internal function to get additional subdirs to configure 435# Internal function to get additional subdirs to configure
341autotools_get_subdirs() { 436autotools_get_subdirs() { autotools_check_macro_val AC_CONFIG_SUBDIRS ; }
342 local subdirs_scan_out 437autotools_get_auxdir() { autotools_check_macro_val AC_CONFIG_AUX_DIR ; }
343 438
344 subdirs_scan_out=$(autotools_check_macro "AC_CONFIG_SUBDIRS")
345 [[ -n ${subdirs_scan_out} ]] || return 0
346
347 echo "${subdirs_scan_out}" | gawk \
348 '($0 !~ /^[[:space:]]*(#|dnl)/) {
349 if (match($0, /AC_CONFIG_SUBDIRS:(.*)$/, res))
350 print res[1]
351 }' | uniq
352
353 return 0
354}
355
356autotools_get_auxdir() {
357 local auxdir_scan_out
358
359 auxdir_scan_out=$(autotools_check_macro "AC_CONFIG_AUX_DIR")
360 [[ -n ${auxdir_scan_out} ]] || return 0
361
362 echo ${auxdir_scan_out} | gawk \
363 '($0 !~ /^[[:space:]]*(#|dnl)/) {
364 if (match($0, /AC_CONFIG_AUX_DIR:(.*)$/, res))
365 print res[1]
366 }' | uniq
367
368 return 0
369}
370
371autotools_m4dir_include() { 439_autotools_m4dir_include() {
372 [[ -n ${AT_M4DIR} ]] || return
373
374 local include_opts= 440 local x include_opts
375 441
376 for x in ${AT_M4DIR} ; do 442 for x in "$@" ; do
377 case "${x}" in 443 case ${x} in
378 "-I")
379 # We handle it below 444 # We handle it below
380 ;; 445 -I) ;;
381 *) 446 *)
382 [[ ! -d ${x} ]] && ewarn "autotools.eclass: '${x}' does not exist" 447 [[ ! -d ${x} ]] && ewarn "autotools.eclass: '${x}' does not exist"
383 include_opts="${include_opts} -I ${x}" 448 include_opts+=" -I ${x}"
384 ;; 449 ;;
385 esac 450 esac
386 done 451 done
387 452
388 echo $include_opts 453 echo ${include_opts}
389} 454}
455autotools_m4dir_include() { _autotools_m4dir_include ${AT_M4DIR} ; }
456autotools_m4sysdir_include() { _autotools_m4dir_include $(eval echo ${AT_SYS_M4DIR}) ; }
457
458fi

Legend:
Removed from v.1.106  
changed lines
  Added in v.1.126

  ViewVC Help
Powered by ViewVC 1.1.20