This patch fixes a few autotools issues with vorbis svn

* error out on autotools failures so warnings are caught early on
* move around AC_CANONICAL_HOST to squash warning
* add AC_CANONICAL_TARGET
* don't squash LIBS but set VORBIS_LIBS instead
* clean up AC_OUTPUT
* AUTOMAKE_OPTIONS = foreign only needs to be done toplevel
  (this can be verified by checking Makefile's generated in other directories
   and seeing that the var isn't used)
* use OGG_LIBS and VORBIS_LIBS in Makefile.am

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

diff --git a/autogen.sh b/autogen.sh
index 6d1cf74..eb4d01c 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -61,15 +61,15 @@ fi
 echo "Generating configuration files for $package, please wait...."
 
 echo "  aclocal $ACLOCAL_FLAGS"
-aclocal $ACLOCAL_FLAGS
+aclocal $ACLOCAL_FLAGS || exit 1
 #echo "  autoheader"
 #autoheader
 echo "  $LIBTOOLIZE --automake"
-$LIBTOOLIZE --automake
+$LIBTOOLIZE --automake || exit 1
 echo "  automake --add-missing $AUTOMAKE_FLAGS"
-automake --add-missing $AUTOMAKE_FLAGS 
+automake --add-missing $AUTOMAKE_FLAGS || exit 1
 echo "  autoconf"
-autoconf
+autoconf || exit 1
 
 cd $olddir
 $srcdir/configure "$@" && echo

diff --git a/configure.in b/configure.in
index 3758a9d..cfe3ca5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,6 +5,10 @@ dnl Initialization and Versioning
 dnl ------------------------------------------------
 
 AC_INIT(lib/mdct.c)
+
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
 AM_INIT_AUTOMAKE(libvorbis,1.0.1)
 AM_MAINTAINER_MODE
 
@@ -67,8 +71,6 @@ dnl --------------------------------------------------
 dnl Set build flags based on environment
 dnl --------------------------------------------------
 
-AC_CANONICAL_HOST
-
 dnl Set some target options
 
 cflags_save="$CFLAGS"
@@ -182,12 +184,14 @@ dnl --------------------------------------------------
 dnl Check for libraries
 dnl --------------------------------------------------
 
-AC_CHECK_LIB(m, cos, LIBS="-lm", LIBS="")
+AC_CHECK_LIB(m, cos, VORBIS_LIBS="-lm", VORBIS_LIBS="")
 AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :)
 
 XIPH_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
-LIBS="$LIBS $OGG_LIBS"
+libs_save=$LIBS
+LIBS="$OGG_LIBS $VORBIS_LIBS"
 AC_CHECK_FUNC(oggpack_writealign, , AC_MSG_ERROR(Ogg >= 1.0 required !))
+LIBS=$libs_save
 
 dnl --------------------------------------------------
 dnl Check for library functions
@@ -200,9 +204,26 @@ dnl --------------------------------------------------
 dnl Do substitutions
 dnl --------------------------------------------------
 
-AC_SUBST(LIBS)
+AC_SUBST(VORBIS_LIBS)
 AC_SUBST(DEBUG)
 AC_SUBST(PROFILE)
 AC_SUBST(pthread_lib)
 
-AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile lib/books/coupled/Makefile lib/books/uncoupled/Makefile lib/books/floor/Makefile doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile include/Makefile include/vorbis/Makefile examples/Makefile win32/Makefile debian/Makefile vq/Makefile vorbis.pc vorbisenc.pc vorbisfile.pc)
+AC_OUTPUT([
+Makefile
+lib/Makefile
+lib/modes/Makefile
+lib/books/Makefile
+lib/books/coupled/Makefile
+lib/books/uncoupled/Makefile
+lib/books/floor/Makefile
+doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile
+include/Makefile include/vorbis/Makefile
+examples/Makefile
+win32/Makefile
+debian/Makefile
+vq/Makefile
+vorbis.pc
+vorbisenc.pc
+vorbisfile.pc
+])

diff --git a/debian/Makefile.am b/debian/Makefile.am
index 6f44e30..b89b605 100644 (file)
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 EXTRA_DIST = changelog control copyright libvorbis-dev.docs \
        libvorbis-dev.examples libvorbis-dev.install libvorbis0a.install \
        libvorbisenc2.install libvorbisfile3.install rules

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1808a84..e726868 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 SUBDIRS = vorbisfile vorbisenc
 
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)

diff --git a/doc/vorbisenc/Makefile.am b/doc/vorbisenc/Makefile.am
index a9f7809..331feef 100644 (file)
--- a/doc/vorbisenc/Makefile.am
+++ b/doc/vorbisenc/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc
 
 doc_DATA = index.html overview.html reference.html style.css\

diff --git a/doc/vorbisfile/Makefile.am b/doc/vorbisfile/Makefile.am
index d4fadc2..64cfa52 100644 (file)
--- a/doc/vorbisfile/Makefile.am
+++ b/doc/vorbisfile/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile
 
 doc_DATA = OggVorbis_File.html callbacks.html chaining_example_c.html\

diff --git a/include/Makefile.am b/include/Makefile.am
index 756b65f..0f34fab 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,5 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 SUBDIRS = vorbis

diff --git a/include/vorbis/Makefile.am b/include/vorbis/Makefile.am
index 794e8cd..cb45cf7 100644 (file)
--- a/include/vorbis/Makefile.am
+++ b/include/vorbis/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 includedir = $(prefix)/include/vorbis
 
 include_HEADERS = codec.h vorbisfile.h vorbisenc.h

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ac18fd3..8929e07 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 SUBDIRS = modes books
 
 INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
@@ -18,6 +16,7 @@ libvorbis_la_SOURCES = mdct.c smallft.c block.c envelope.c window.c lsp.c \
                        registry.h scales.h window.h lookup.h lookup_data.h\
                        codec_internal.h backends.h bitrate.h 
 libvorbis_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
+libvorbis_la_LIBADD = @OGG_LIBS@ @VORBIS_LIBS@
 
 libvorbisfile_la_SOURCES = vorbisfile.c
 libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@

diff --git a/lib/books/Makefile.am b/lib/books/Makefile.am
index 498ec3d..3697a71 100644 (file)
--- a/lib/books/Makefile.am
+++ b/lib/books/Makefile.am
@@ -1,4 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
 SUBDIRS = coupled uncoupled floor

diff --git a/lib/books/coupled/Makefile.am b/lib/books/coupled/Makefile.am
index 135b979..7f94da5 100644 (file)
--- a/lib/books/coupled/Makefile.am
+++ b/lib/books/coupled/Makefile.am
@@ -1,5 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
-EXTRA_DIST = res_books_stereo.h
\ No newline at end of file
+EXTRA_DIST = res_books_stereo.h

diff --git a/lib/books/floor/Makefile.am b/lib/books/floor/Makefile.am
index 86e326f..272ab1a 100644 (file)
--- a/lib/books/floor/Makefile.am
+++ b/lib/books/floor/Makefile.am
@@ -1,5 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 EXTRA_DIST = floor_books.h

diff --git a/lib/books/uncoupled/Makefile.am b/lib/books/uncoupled/Makefile.am
index 3be342e..93ff417 100644 (file)
--- a/lib/books/uncoupled/Makefile.am
+++ b/lib/books/uncoupled/Makefile.am
@@ -1,5 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 EXTRA_DIST = res_books_uncoupled.h

diff --git a/lib/modes/Makefile.am b/lib/modes/Makefile.am
index b91242f..279a7f0 100644 (file)
--- a/lib/modes/Makefile.am
+++ b/lib/modes/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 EXTRA_DIST = floor_all.h psych_44.h residue_44.h setup_11.h setup_32.h \
             setup_8.h psych_11.h psych_8.h residue_44u.h setup_16.h \
             setup_44.h setup_X.h psych_16.h residue_16.h residue_8.h \

diff --git a/libvorbis.spec b/libvorbis.spec
index 2ece9cc..cb7ed18 100644 (file)
--- a/libvorbis.spec
+++ b/libvorbis.spec
@@ -1,15 +1,14 @@
 Name:          libvorbis
 Version:       1.0.1
-Release:       1
-Summary:       The Vorbis General Audio Compression Codec
+Release:       0.xiph.1
+Summary:       The Vorbis General Audio Compression Codec.
 
 Group:         System Environment/Libraries
 License:       BSD
 URL:           http://www.xiph.org/
 Vendor:                Xiph.org Foundation <team@xiph.org>
-Source:                http://www.xiph.org/pub/ogg/vorbis/download/%{name}-%{version}.tar.gz
-Prefix:                %{_prefix}
-BuildRoot:     %{_tmppath}/%{name}-root
+Source:                http://www.vorbis.com/files/1.0.1/unix/%{name}-%{version}.tar.gz
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 # We're forced to use an epoch since both Red Hat and Ximian use it in their
 # rc packages
@@ -49,24 +48,20 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --enable-static
 make
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
 %clean 
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%doc COPYING
-%doc AUTHORS
-%doc README
+%doc AUTHORS COPYING README
 %{_libdir}/libvorbis.so.*
 %{_libdir}/libvorbisfile.so.*
 %{_libdir}/libvorbisenc.so.*
@@ -78,6 +73,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %doc doc/vorbisfile
 %doc doc/vorbisenc
 %{_datadir}/aclocal/vorbis.m4
+%dir %{_includedir}/vorbis
 %{_includedir}/vorbis/codec.h
 %{_includedir}/vorbis/vorbisfile.h
 %{_includedir}/vorbis/vorbisenc.h
@@ -95,6 +91,14 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %{_libdir}/pkgconfig/vorbisenc.pc
 
 %changelog
+* Thu Jun 10 2004 Thomas Vander Stichele <thomas at apestaart dot org>
+- autogenerate from configure
+- fix download location
+- remove Prefix
+- own include dir
+- move ldconfig runs to -p scripts
+- change Release tag to include xiph
+
 * Tue Oct 07 2003 Warren Dukes <shank@xiph.org>
 - update for 1.0.1 release
 

diff --git a/vq/Makefile.am b/vq/Makefile.am
index 1832104..8cf90b7 100644 (file)
--- a/vq/Makefile.am
+++ b/vq/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
 INCLUDES = -I../lib -I$(top_srcdir)/include @OGG_CFLAGS@
 
 EXTRA_PROGRAMS = latticebuild latticepare latticehint\

diff --git a/win32/Makefile.am b/win32/Makefile.am
index 535e3b4..a356c6c 100644 (file)
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -1,8 +1,5 @@
 ## Process this with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
-
 EXTRA_DIST = vorbis.def vorbis_dynamic.dsp vorbis_static.dsp\
        vorbisfile.def vorbisfile_dynamic.dsp vorbisfile_static.dsp\
        vorbisenc.def vorbisenc_dynamic.dsp vorbisenc_static.dsp\