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

Diff of /eclass/autotools.eclass

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

Revision 1.130 Revision 1.131
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.eclass,v 1.130 2012/03/22 19:16:22 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.131 2012/05/20 10:26: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
141# the directory with include files can be specified with AT_M4DIR variable. 141# the directory with include files can be specified with AT_M4DIR variable.
142# 142#
143# Should do a full autoreconf - normally what most people will be interested in. 143# Should do a full autoreconf - normally what most people will be interested in.
144# Also should handle additional directories specified by AC_CONFIG_SUBDIRS. 144# Also should handle additional directories specified by AC_CONFIG_SUBDIRS.
145eautoreconf() { 145eautoreconf() {
146 local x auxdir g 146 local x g
147 147
148 if [[ -z ${AT_NO_RECURSIVE} ]]; then 148 if [[ -z ${AT_NO_RECURSIVE} ]]; then
149 # Take care of subdirs 149 # Take care of subdirs
150 for x in $(autotools_get_subdirs); do 150 for x in $(autotools_get_subdirs); do
151 if [[ -d ${x} ]] ; then 151 if [[ -d ${x} ]] ; then
154 popd >/dev/null 154 popd >/dev/null
155 fi 155 fi
156 done 156 done
157 fi 157 fi
158 158
159 auxdir=$(autotools_get_auxdir) 159 local auxdir=$(autotools_get_auxdir)
160 local macdir=$(autotools_get_macrodir)
160 161
161 einfo "Running eautoreconf in '${PWD}' ..." 162 einfo "Running eautoreconf in '${PWD}' ..."
162 [[ -n ${auxdir} ]] && mkdir -p ${auxdir} 163 [[ -n ${auxdir}${macdir} ]] && mkdir -p ${auxdir} ${macdir}
163 eaclocal 164 eaclocal
164 [[ ${CHOST} == *-darwin* ]] && g=g 165 [[ ${CHOST} == *-darwin* ]] && g=g
165 if ${LIBTOOLIZE:-${g}libtoolize} -n --install >& /dev/null ; then 166 if ${LIBTOOLIZE:-${g}libtoolize} -n --install >& /dev/null ; then
166 _elibtoolize --copy --force --install 167 _elibtoolize --copy --force --install
167 else 168 else
426} 427}
427 428
428# Internal function to get additional subdirs to configure 429# Internal function to get additional subdirs to configure
429autotools_get_subdirs() { autotools_check_macro_val AC_CONFIG_SUBDIRS ; } 430autotools_get_subdirs() { autotools_check_macro_val AC_CONFIG_SUBDIRS ; }
430autotools_get_auxdir() { autotools_check_macro_val AC_CONFIG_AUX_DIR ; } 431autotools_get_auxdir() { autotools_check_macro_val AC_CONFIG_AUX_DIR ; }
432autotools_get_macrodir() { autotools_check_macro_val AC_CONFIG_MACRO_DIR ; }
431 433
432_autotools_m4dir_include() { 434_autotools_m4dir_include() {
433 local x include_opts 435 local x include_opts
434 436
435 for x in "$@" ; do 437 for x in "$@" ; do

Legend:
Removed from v.1.130  
changed lines
  Added in v.1.131

  ViewVC Help
Powered by ViewVC 1.1.20