| 1 |
grobian 09/04/04 17:45:43 |
| 2 |
|
| 3 |
Modified: autotools.eclass |
| 4 |
Log: |
| 5 |
backport Darwin fixes from Prefix |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.83 eclass/autotools.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.83&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.83&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.82&r2=1.83 |
| 13 |
|
| 14 |
Index: autotools.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v |
| 17 |
retrieving revision 1.82 |
| 18 |
retrieving revision 1.83 |
| 19 |
diff -u -r1.82 -r1.83 |
| 20 |
--- autotools.eclass 4 Jan 2009 16:54:10 -0000 1.82 |
| 21 |
+++ autotools.eclass 4 Apr 2009 17:45:42 -0000 1.83 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2008 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.82 2009/01/04 16:54:10 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.83 2009/04/04 17:45:42 grobian Exp $ |
| 27 |
|
| 28 |
# @ECLASS: autotools.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -80,7 +80,7 @@ |
| 31 |
# Should do a full autoreconf - normally what most people will be interested in. |
| 32 |
# Also should handle additional directories specified by AC_CONFIG_SUBDIRS. |
| 33 |
eautoreconf() { |
| 34 |
- local pwd=$(pwd) x auxdir |
| 35 |
+ local pwd=$(pwd) x auxdir g= |
| 36 |
|
| 37 |
if [[ -z ${AT_NO_RECURSIVE} ]]; then |
| 38 |
# Take care of subdirs |
| 39 |
@@ -98,7 +98,8 @@ |
| 40 |
einfo "Running eautoreconf in '$(pwd)' ..." |
| 41 |
[[ -n ${auxdir} ]] && mkdir -p ${auxdir} |
| 42 |
eaclocal |
| 43 |
- if ${LIBTOOLIZE:-libtoolize} -n --install >& /dev/null ; then |
| 44 |
+ [[ ${CHOST} == *-darwin* ]] && g=g |
| 45 |
+ if ${LIBTOOLIZE:-${g}libtoolize} -n --install >& /dev/null ; then |
| 46 |
_elibtoolize --copy --force --install |
| 47 |
else |
| 48 |
_elibtoolize --copy --force |
| 49 |
@@ -157,7 +158,7 @@ |
| 50 |
# Runs libtoolize. Note the '_' prefix .. to not collide with elibtoolize() from |
| 51 |
# libtool.eclass. |
| 52 |
_elibtoolize() { |
| 53 |
- local opts |
| 54 |
+ local opts g= |
| 55 |
|
| 56 |
# Check if we should run libtoolize (AM_PROG_LIBTOOL is an older macro, |
| 57 |
# check for both it and the current AC_PROG_LIBTOOL) |
| 58 |
@@ -165,8 +166,8 @@ |
| 59 |
|
| 60 |
[[ -f GNUmakefile.am || -f Makefile.am ]] && opts="--automake" |
| 61 |
|
| 62 |
- [[ "${USERLAND}" == "Darwin" ]] && LIBTOOLIZE="glibtoolize" |
| 63 |
- autotools_run_tool ${LIBTOOLIZE:-libtoolize} "$@" ${opts} |
| 64 |
+ [[ ${CHOST} == *-darwin* ]] && g=g |
| 65 |
+ autotools_run_tool ${LIBTOOLIZE:-${g}libtoolize} "$@" ${opts} |
| 66 |
|
| 67 |
# Need to rerun aclocal |
| 68 |
eaclocal |
Archives