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

Diff of /eclass/autotools.eclass

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

Revision 1.112 Revision 1.113
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2011 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.112 2011/12/13 21:44:22 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.113 2011/12/13 21:57:05 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
105# XXX: M4DIR should be deprecated 105# XXX: M4DIR should be deprecated
106# @ECLASS-VARIABLE: AT_M4DIR 106# @ECLASS-VARIABLE: AT_M4DIR
107# @DESCRIPTION: 107# @DESCRIPTION:
108# Additional director(y|ies) aclocal should search 108# Additional director(y|ies) aclocal should search
109: ${AT_M4DIR:=${M4DIR}} 109: ${AT_M4DIR:=${M4DIR}}
110
111# @ECLASS-VARIABLE: AT_SYS_M4DIR
112# @INTERNAL
113# @DESCRIPTION:
114# For system integrators, a list of additional aclocal search paths.
115# This variable gets eval-ed, so you can use variables in the definition
116# that may not be valid until eautoreconf & friends are run.
117: ${AT_SYS_M4DIR:=}
110 118
111# @FUNCTION: eautoreconf 119# @FUNCTION: eautoreconf
112# @DESCRIPTION: 120# @DESCRIPTION:
113# This function mimes the behavior of autoreconf, but uses the different 121# This function mimes the behavior of autoreconf, but uses the different
114# eauto* functions to run the tools. It doesn't accept parameters, but 122# eauto* functions to run the tools. It doesn't accept parameters, but
369# Internal function to get additional subdirs to configure 377# Internal function to get additional subdirs to configure
370autotools_get_subdirs() { autotools_check_macro_val AC_CONFIG_SUBDIRS ; } 378autotools_get_subdirs() { autotools_check_macro_val AC_CONFIG_SUBDIRS ; }
371autotools_get_auxdir() { autotools_check_macro_val AC_CONFIG_AUX_DIR ; } 379autotools_get_auxdir() { autotools_check_macro_val AC_CONFIG_AUX_DIR ; }
372 380
373autotools_m4dir_include() { 381autotools_m4dir_include() {
374 [[ -n ${AT_M4DIR} ]] || return
375
376 local include_opts= 382 local x include_opts
377 383
378 for x in ${AT_M4DIR} ; do 384 for x in ${AT_M4DIR} $(eval echo ${AT_SYS_M4DIR}) ; do
379 case "${x}" in 385 case "${x}" in
380 "-I") 386 "-I")
381 # We handle it below 387 # We handle it below
382 ;; 388 ;;
383 *) 389 *)
384 [[ ! -d ${x} ]] && ewarn "autotools.eclass: '${x}' does not exist" 390 [[ ! -d ${x} ]] && ewarn "autotools.eclass: '${x}' does not exist"
385 include_opts="${include_opts} -I ${x}" 391 include_opts+=" -I ${x}"
386 ;; 392 ;;
387 esac 393 esac
388 done 394 done
389 395
390 echo $include_opts 396 echo ${include_opts}
391} 397}
392 398
393fi 399fi

Legend:
Removed from v.1.112  
changed lines
  Added in v.1.113

  ViewVC Help
Powered by ViewVC 1.1.20