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

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

  ViewVC Help
Powered by ViewVC 1.1.20