--- libtheora-1.0beta3/configure.ac.alt	2008-04-17 00:25:55 +0400
+++ libtheora-1.0beta3/configure.ac	2008-04-17 22:36:21 +0400
@@ -405,10 +405,10 @@ AC_OUTPUT([
   theoraenc-uninstalled.pc
 ])
 
-AS_AC_EXPAND(LIBDIR, ${libdir})
-AS_AC_EXPAND(INCLUDEDIR, ${includedir})
-AS_AC_EXPAND(BINDIR, ${bindir})
-AS_AC_EXPAND(DOCDIR, ${datadir}/doc)
+dnl AS_AC_EXPAND(LIBDIR, ${libdir})
+dnl AS_AC_EXPAND(INCLUDEDIR, ${includedir})
+dnl AS_AC_EXPAND(BINDIR, ${bindir})
+dnl AS_AC_EXPAND(DOCDIR, ${datadir}/doc)
 
 if test $HAVE_DOXYGEN = "false"; then
   doc_build="no"
--- libtheora-1.0beta3/lib/Makefile.am.alt	2008-04-17 00:25:54 +0400
+++ libtheora-1.0beta3/lib/Makefile.am	2008-04-17 22:56:02 +0400
@@ -20,7 +20,7 @@ EXTRA_DIST = \
         enc/encode.c \
         enc/encoder_toplevel.c
 
-lib_LTLIBRARIES = libtheoradec.la libtheoraenc.la libtheora.la
+lib_LTLIBRARIES = libtheora.la libtheoradec.la libtheoraenc.la
 
 if THEORA_DISABLE_ENCODE
 encoder_sources = \
@@ -127,6 +127,17 @@ noinst_HEADERS = \
 	dec/quant.h \
 	dec/x86/x86int.h
 
+libtheora_la_SOURCES = \
+  cpu.c \
+	$(decoder_arch_sources) \
+	$(decoder_sources) \
+	$(encoder_arch_sources) \
+	$(encoder_sources) \
+  Version_script
+libtheora_la_LDFLAGS = \
+  -version-info @TH_LIB_CURRENT@:@TH_LIB_REVISION@:@TH_LIB_AGE@ \
+  @THEORA_LDFLAGS@ $(OGG_LIBS)
+
 libtheoradec_la_SOURCES = \
   cpu.c \
 	$(decoder_arch_sources) \
@@ -144,17 +155,7 @@ libtheoraenc_la_SOURCES = \
 libtheoraenc_la_LDFLAGS = \
   -version-info @THENC_LIB_CURRENT@:@THENC_LIB_REVISION@:@THENC_LIB_AGE@ \
   @THEORAENC_LDFLAGS@ $(OGG_LIBS)
-
-libtheora_la_SOURCES = \
-  cpu.c \
-	$(decoder_arch_sources) \
-	$(decoder_sources) \
-	$(encoder_arch_sources) \
-	$(encoder_sources) \
-  Version_script
-libtheora_la_LDFLAGS = \
-  -version-info @TH_LIB_CURRENT@:@TH_LIB_REVISION@:@TH_LIB_AGE@ \
-  @THEORA_LDFLAGS@ $(OGG_LIBS)
+libtheoraenc_la_LIBADD = libtheora.la
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"