diff options
author | Mark Wielaard <mark@klomp.org> | 2005-05-01 21:16:31 +0000 |
---|---|---|
committer | Mark Wielaard <mark@klomp.org> | 2005-05-01 21:16:31 +0000 |
commit | 3678ea7e00b2815d883ef71323b311c0e4af201e (patch) | |
tree | bf766ba0b18e95d24215cec8681388b947c73ae8 | |
parent | 5e0c9d87e8d45b33cdc34574b31a094e7b4e577a (diff) | |
download | classpath-3678ea7e00b2815d883ef71323b311c0e4af201e.tar.gz |
2005-05-01 Andreas Tobler <toa@pop.agri.ch>
* autogen.sh: Use glibtoolize on Darwin.
-rw-r--r-- | ChangeLog | 4 | ||||
-rwxr-xr-x | autogen.sh | 17 |
2 files changed, 17 insertions, 4 deletions
@@ -1,3 +1,7 @@ +2005-05-01 Andreas Tobler <toa@pop.agri.ch> + + * autogen.sh: Use glibtoolize on Darwin. + 2005-05-01 Mark Wielaard <mark@klomp.org> * configure.ac: Set version to 0.15+cvs. diff --git a/autogen.sh b/autogen.sh index cc6d2839d..644b15581 100755 --- a/autogen.sh +++ b/autogen.sh @@ -12,9 +12,18 @@ FILE=java/lang/Object.java DIE=0 -have_libtool=false -if libtoolize --version < /dev/null > /dev/null 2>&1 ; then - libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` +case `uname -s` in +Darwin) + LIBTOOLIZE=glibtoolize + ;; +*) + LIBTOOLIZE=libtoolize + ;; +esac + +have_libtool=true +if ${LIBTOOLIZE} --version < /dev/null > /dev/null 2>&1 ; then + libtool_version=`${LIBTOOLIZE} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` case $libtool_version in 1.5*) have_libtool=true @@ -108,7 +117,7 @@ fi # Use the "-I m4 flag in order to include pkg.m4 and other .m4 files. $ACLOCAL -I m4 $ACLOCAL_FLAGS || exit $? -libtoolize --force || exit $? +${LIBTOOLIZE} --force || exit $? autoheader || exit $? |