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

Diff of /eclass/autotools-utils.eclass

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

Revision 1.42 Revision 1.45
1# Copyright 1999-2012 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-utils.eclass,v 1.42 2012/01/15 16:40:12 mgorny Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.45 2012/01/21 20:44:28 mgorny Exp $
4 4
5# @ECLASS: autotools-utils.eclass 5# @ECLASS: autotools-utils.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Maciej Mrozowski <reavertm@gentoo.org> 7# Maciej Mrozowski <reavertm@gentoo.org>
8# Michał Górny <mgorny@gentoo.org> 8# Michał Górny <mgorny@gentoo.org>
282 # Override this func to not require unnecessary eaclocal calls. 282 # Override this func to not require unnecessary eaclocal calls.
283 autotools_check_macro() { 283 autotools_check_macro() {
284 local x 284 local x
285 285
286 # Add a few additional variants as we don't get expansions. 286 # Add a few additional variants as we don't get expansions.
287 [[ ${1} = AC_CONFIG_HEADERS ]] && set -- "${@}" AC_CONFIG_HEADER 287 [[ ${1} = AC_CONFIG_HEADERS ]] && set -- "${@}" \
288 AC_CONFIG_HEADER AM_CONFIG_HEADER
288 289
289 for x; do 290 for x; do
290 grep -h "^${x}" configure.{ac,in} 2>/dev/null 291 grep -h "^${x}" configure.{ac,in} 2>/dev/null
291 done 292 done
292 } 293 }
357autotools-utils_src_prepare() { 358autotools-utils_src_prepare() {
358 debug-print-function ${FUNCNAME} "$@" 359 debug-print-function ${FUNCNAME} "$@"
359 360
360 local want_autoreconf=${AUTOTOOLS_AUTORECONF} 361 local want_autoreconf=${AUTOTOOLS_AUTORECONF}
361 362
363 [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
364
362 touch "${T}"/.autotools-utils.timestamp || die 365 touch "${T}"/.autotools-utils.timestamp || die
363 [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
364 epatch_user 366 epatch_user
365 if [[ ! ${want_autoreconf} ]]; then 367 if [[ ! ${want_autoreconf} ]]; then
366 if [[ $(find . -newer "${T}"/.autotools-utils.timestamp \ 368 if [[ $(find . -newer "${T}"/.autotools-utils.timestamp \
367 -a '(' -name 'Makefile.am' \ 369 -a '(' -name 'Makefile.am' \
368 -o -name 'configure.ac' \ 370 -o -name 'configure.ac' \
369 -o -name 'configure.in' ')' \ 371 -o -name 'configure.in' ')' \
370 -print -quit) ]]; then 372 -print -quit) ]]; then
371 einfo 'Will autoreconfigure due to patches applied.' 373 einfo 'Will autoreconfigure due to user patches applied.'
372 want_autoreconf=yep 374 want_autoreconf=yep
373 fi 375 fi
374 fi 376 fi
375 377
376 [[ ${want_autoreconf} ]] && autotools-utils_autoreconf 378 [[ ${want_autoreconf} ]] && autotools-utils_autoreconf
396 398
397 # Common args 399 # Common args
398 local econfargs=() 400 local econfargs=()
399 401
400 _check_build_dir 402 _check_build_dir
401 if "${ECONF_SOURCE}"/configure --help 2>&1 | grep '^ *--docdir='; then 403 if "${ECONF_SOURCE}"/configure --help 2>&1 | grep -q '^ *--docdir='; then
402 econfargs+=( 404 econfargs+=(
403 --docdir="${EPREFIX}"/usr/share/doc/${PF} 405 --docdir="${EPREFIX}"/usr/share/doc/${PF}
404 ) 406 )
405 fi 407 fi
406 408

Legend:
Removed from v.1.42  
changed lines
  Added in v.1.45

  ViewVC Help
Powered by ViewVC 1.1.20