diff -urN ac3dec-0.6.1.org/Makefile.am ac3dec-0.6.1/Makefile.am
--- ac3dec-0.6.1.org/Makefile.am	Wed Mar 14 14:54:26 2001
+++ ac3dec-0.6.1/Makefile.am	Wed Mar 14 15:11:12 2001
@@ -1,15 +1,15 @@
 # # Process this file with automake to produce Makefile.in.
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-CFLAGS = -Wall -Werror -O3 -g
+CFLAGS = @CFLAGS@ -Wall -Werror
 
 bin_PROGRAMS = ac3dec 
 
-ac3dec_LDADD= -L./libac3 -lac3 -lm 
+ac3dec_LDADD= ./libac3/libac3.la -lm 
 
 noinst_HEADERS = output.h
 ac3dec_SOURCES = ac3dec.c output.c
-ac3dec_DEPENDENCIES = libac3/libac3.a
+ac3dec_DEPENDENCIES = libac3/libac3.la
 
 
 EXTRA_DIST = README Changelog TODO plot_spectrum.m autogen.sh\
diff -urN ac3dec-0.6.1.org/configure.in ac3dec-0.6.1/configure.in
--- ac3dec-0.6.1.org/configure.in	Wed Mar 14 14:54:26 2001
+++ ac3dec-0.6.1/configure.in	Wed Mar 14 15:13:23 2001
@@ -11,7 +11,7 @@
 AM_MAINTAINER_MODE
 AC_PROG_CC
 AC_PROG_GCC_TRADITIONAL
-AC_PROG_RANLIB
+AM_PROG_LIBTOOL
 
 AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBS="$LIBS -lossaudio")
 
diff -urN ac3dec-0.6.1.org/libac3/Makefile.am ac3dec-0.6.1/libac3/Makefile.am
--- ac3dec-0.6.1.org/libac3/Makefile.am	Wed Mar 14 14:54:26 2001
+++ ac3dec-0.6.1/libac3/Makefile.am	Wed Mar 14 15:14:57 2001
@@ -1,15 +1,16 @@
 # # Process this file with automake to produce Makefile.in.
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-CFLAGS = -Wall -Werror -O1 -g
+CFLAGS = @CFLAGS@ -Wall -Werror
 
-noinst_LIBRARIES = libac3.a
+lib_LTLIBRARIES = libac3.la
 
-libac3_a_SOURCES = bitstream.c decode.c imdct.c coeff.c exponent.c stats.c\
+libac3_la_SOURCES = bitstream.c decode.c imdct.c coeff.c exponent.c stats.c\
 	bit_allocate.c  parse.c crc.c debug.c rematrix.c downmix.c dither.c \
 	sanity_check.c
 
-noinst_HEADERS = ac3_internal.h bitstream.h decode.h imdct.h ac3.h stats.h coeff.h\
+ac3includedir = $(includedir)/ac3
+ac3include_HEADERS = ac3_internal.h bitstream.h decode.h imdct.h ac3.h stats.h coeff.h\
 	exponent.h bit_allocate.h parse.h crc.h debug.h rematrix.h downmix.h dither.h \
 	sanity_check.h
 
diff -urN ac3dec-0.6.1.org/libac3/bitstream.c ac3dec-0.6.1/libac3/bitstream.c
--- ac3dec-0.6.1.org/libac3/bitstream.c	Wed Mar 14 14:54:26 2001
+++ ac3dec-0.6.1/libac3/bitstream.c	Wed Mar 14 14:55:10 2001
@@ -23,6 +23,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "ac3.h"
 #include "ac3_internal.h"
diff -urN ac3dec-0.6.1.org/tools/Makefile.am ac3dec-0.6.1/tools/Makefile.am
--- ac3dec-0.6.1.org/tools/Makefile.am	Wed Mar 14 14:54:26 2001
+++ ac3dec-0.6.1/tools/Makefile.am	Wed Mar 14 14:56:18 2001
@@ -1,7 +1,7 @@
 # # Process this file with automake to produce Makefile.in.
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-CFLAGS = -Wall -Werror -O3 -g 
+CFLAGS = @CFLAGS@ -Wall -Werror
 
 bin_PROGRAMS = extract_ac3