Commit ed694a31 authored by Sam Hocevar's avatar Sam Hocevar

* bootstrap:

    + Run libtoolize before aclocal (when we eventually use libtool, of course).
    + Support automake 1.8.
parent e2b631a9
#! /bin/sh
## bootstrap file for libdts -- Sam Hocevar <sam@zoy.org>
## generic bootstrap file for libraries -- Sam Hocevar <sam@zoy.org>
## $Id$
set -x
......@@ -14,7 +14,9 @@ export CYGWIN
# Check for automake
amvers="no"
if automake-1.7 --version >/dev/null 2>&1; then
if automake-1.8 --version >/dev/null 2>&1; then
amvers="-1.8"
elif automake-1.7 --version >/dev/null 2>&1; then
amvers="-1.7"
elif automake-1.6 --version >/dev/null 2>&1; then
amvers="-1.6"
......@@ -54,7 +56,6 @@ rm -f aclocal.m4 configure config.guess config.log config.sub config.cache confi
rm -Rf autom4te.cache
(cd autotools && rm -f config.guess config.sub missing mkinstalldirs compile ltmain.sh depcomp install-sh)
aclocal${amvers}
#libtool# ${libtoolize} --copy --force
#libtool#
#libtool# if test -f "ltmain.sh"; then
......@@ -62,6 +63,7 @@ aclocal${amvers}
#libtool# mv ltmain.sh autotools/
#libtool# fi
aclocal${amvers}
autoconf
autoheader
automake${amvers} --add-missing --copy
......
......@@ -38,7 +38,7 @@ void dts_bitstream_init (dts_state_t * state, uint8_t * buf, int word_mode,
intptr_t align;
align = (uintptr_t)buf & 3;
state->buffer_start = (uint32_t *) (buf - align);
state->buffer_start = (uint32_t *) ((uintptr_t)buf - align);
state->bits_left = 0;
state->current_word = 0;
state->word_mode = word_mode;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment