[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

["Fabian Groffen (grobian)" <grobian@gentoo.org>]

grobian     09/04/04 17:45:43

  Modified:             autotools.eclass
  Log:
  backport Darwin fixes from Prefix

Revision  Changes    Path
1.83                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.83&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.83&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.82&r2=1.83

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- autotools.eclass	4 Jan 2009 16:54:10 -0000	1.82
+++ autotools.eclass	4 Apr 2009 17:45:42 -0000	1.83
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.82 2009/01/04 16:54:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.83 2009/04/04 17:45:42 grobian Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -80,7 +80,7 @@
 # Should do a full autoreconf - normally what most people will be interested in.
 # Also should handle additional directories specified by AC_CONFIG_SUBDIRS.
 eautoreconf() {
-	local pwd=$(pwd) x auxdir
+	local pwd=$(pwd) x auxdir g=
 
 	if [[ -z ${AT_NO_RECURSIVE} ]]; then
 		# Take care of subdirs
@@ -98,7 +98,8 @@
 	einfo "Running eautoreconf in '$(pwd)' ..."
 	[[ -n ${auxdir} ]] && mkdir -p ${auxdir}
 	eaclocal
-	if ${LIBTOOLIZE:-libtoolize} -n --install >& /dev/null ; then
+	[[ ${CHOST} == *-darwin* ]] && g=g
+	if ${LIBTOOLIZE:-${g}libtoolize} -n --install >& /dev/null ; then
 		_elibtoolize --copy --force --install
 	else
 		_elibtoolize --copy --force
@@ -157,7 +158,7 @@
 # Runs libtoolize.  Note the '_' prefix .. to not collide with elibtoolize() from
 # libtool.eclass.
 _elibtoolize() {
-	local opts
+	local opts g=
 
 	# Check if we should run libtoolize (AM_PROG_LIBTOOL is an older macro,
 	# check for both it and the current AC_PROG_LIBTOOL)
@@ -165,8 +166,8 @@
 
 	[[ -f GNUmakefile.am || -f Makefile.am ]] && opts="--automake"
 
-	[[ "${USERLAND}" == "Darwin" ]] && LIBTOOLIZE="glibtoolize"
-	autotools_run_tool ${LIBTOOLIZE:-libtoolize} "$@" ${opts}
+	[[ ${CHOST} == *-darwin* ]] && g=g
+	autotools_run_tool ${LIBTOOLIZE:-${g}libtoolize} "$@" ${opts}
 
 	# Need to rerun aclocal
 	eaclocal