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

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

  ViewVC Help
Powered by ViewVC 1.1.20