From: levill_r <levill_r@4aad255d-cdde-0310-9447-f3009e2ae8c0> * bootstrap: Handle glibtoolize. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4643 4aad255d-cdde-0310-9447-f3009e2ae8c0 --- dynamic-use-of-static-c++/ChangeLog | 6 ++++++ dynamic-use-of-static-c++/bootstrap | 13 +++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dynamic-use-of-static-c++/ChangeLog b/dynamic-use-of-static-c++/ChangeLog index e9619f4..41fce8c 100644 --- a/dynamic-use-of-static-c++/ChangeLog +++ b/dynamic-use-of-static-c++/ChangeLog @@ -1,3 +1,9 @@ +2009-10-13 Roland Levillain <roland@lrde.epita.fr> + + Make bootstrap compatible with Mac OS X. + + * bootstrap: Handle glibtoolize. + 2006-01-15 Nicolas Pouillard <ertai@lrde.epita.fr> Add another version of libiberty. diff --git a/dynamic-use-of-static-c++/bootstrap b/dynamic-use-of-static-c++/bootstrap index 8bd6e9e..e4a288a 100755 --- a/dynamic-use-of-static-c++/bootstrap +++ b/dynamic-use-of-static-c++/bootstrap @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh # Failures do matter. set -e @@ -8,8 +8,17 @@ set -x mkdir -p _config touch _config/local-config.rb.in +libtoolize=libtoolize +for l in "$LIBTOOLIZE" glibtoolize libtoolize; +do + if ($l --version) >/dev/null 2>&1; then + libtoolize=$l + break + fi +done +export LIBTOOLIZE=$libtoolize # Make the libtool with ltdl -libtoolize --force --copy --automake --ltdl +"$libtoolize" --force --copy --automake --ltdl # Finally, install the GNU Build System. autoreconf -f -v -i -- 1.6.5