hoepfully this is the *right* thing.

jack.

svn path=/trunk/vorbis/; revision=1020

diff --git a/configure.in b/configure.in
index aa0241a..17d99ea 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -149,7 +149,7 @@ dnl --------------------------------------------------
 AC_CHECK_LIB(m, cos, LIBS="-lm", LIBS="")
 AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :)
 
-AM_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
+AM_PATH_OGG(LIBS="$LIBS $OGG_LIBS", AC_MSG_ERROR(must have Ogg installed!))
 
 dnl --------------------------------------------------
 dnl Check for library functions
@@ -166,4 +166,4 @@ AC_SUBST(DEBUG)
 AC_SUBST(PROFILE)
 AC_SUBST(pthread_lib)
 
-AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile doc/Makefile doc/vorbisfile/Makefile include/Makefile include/vorbis/Makefile examples/Makefile)
+AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile include/Makefile include/vorbis/Makefile examples/Makefile)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3edc3e5..23f5fde 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = vorbisfile
+SUBDIRS = vorbisfile vorbisenc
 
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 

diff --git a/examples/Makefile.am b/examples/Makefile.am
index e1a96b4..3818fbf 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -7,17 +7,17 @@ INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
 noinst_PROGRAMS = decoder_example encoder_example chaining_example\
                vorbisfile_example seeking_example
 
-LDADD = ../lib/libvorbis.la $(OGG_LIBS)
+LDADD = ../lib/libvorbis.la
 
 decoder_example_SOURCES = decoder_example.c
 encoder_example_SOURCES = encoder_example.c
-encoder_example_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la $(OGG_LIBS)
+encoder_example_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la 
 chaining_example_SOURCES = chaining_example.c
-chaining_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la $(OGG_LIBS)
+chaining_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la 
 vorbisfile_example_SOURCES = vorbisfile_example.c
-vorbisfile_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la $(OGG_LIBS)
+vorbisfile_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la 
 seeking_example_SOURCES = seeking_example.c
-seeking_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la $(OGG_LIBS)
+seeking_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la 
 
 debug:
        $(MAKE) all CFLAGS="@DEBUG@"

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 64bc4a0..9cd0d3a 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -19,9 +19,11 @@ libvorbis_la_SOURCES = mdct.c smallft.c block.c envelope.c window.c lsp.c lpc.c\
 libvorbis_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
 
 libvorbisfile_la_SOURCES = vorbisfile.c
+#libvorbisfile_la_LIBADD = -L$(top_srcdir)/lib/.libs -lvorbis
 libvorbisfile_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
 
 libvorbisenc_la_SOURCES = vorbisenc.c
+#libvorbisenc_la_LIBADD = -L$(top_srcdir)/lib/.libs -lvorbis
 libvorbisenc_la_LDFLAGS = -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
 
 EXTRA_DIST = barkmel.c tone.c psytune.c lookups.pl