[xiph-commits] r3540 - in libfishsound/branches/0.9.1: . doc include include/fishsound src src/examples src/libfishsound src/tests

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-04-06 13:49:47 -0700 (Sun, 06 Apr 2008)
New Revision: 3540

Modified:
   libfishsound/branches/0.9.1/
   libfishsound/branches/0.9.1/Makefile.am
   libfishsound/branches/0.9.1/autogen.sh
   libfishsound/branches/0.9.1/doc/
   libfishsound/branches/0.9.1/include/
   libfishsound/branches/0.9.1/include/fishsound/
   libfishsound/branches/0.9.1/src/
   libfishsound/branches/0.9.1/src/examples/
   libfishsound/branches/0.9.1/src/libfishsound/
   libfishsound/branches/0.9.1/src/tests/
   libfishsound/branches/0.9.1/src/tests/encdec-comments.c
Log:
merge r3376:3429, r3431 from branches/1.0-stable (johnf build cleanups)



Property changes on: libfishsound/branches/0.9.1
___________________________________________________________________
Name: svn:ignore
   + configure
Makefile.in
*/Makefile.in
config.log
depcomp
config.guess
config.h
ltmain.sh
config.sub
oggz.pc
Makefile
config.status
fishsound.pc
stamp-h1
autom4te.cache
libtool
missing
aclocal.m4
install-sh
libfishsound-*.tar.gz


Modified: libfishsound/branches/0.9.1/Makefile.am
===================================================================
--- libfishsound/branches/0.9.1/Makefile.am	2008-04-06 20:43:55 UTC (rev 3539)
+++ libfishsound/branches/0.9.1/Makefile.am	2008-04-06 20:49:47 UTC (rev 3540)
@@ -26,8 +26,11 @@
 #  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 #  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 #  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-                                                                               ## Process this file with automake to produce Makefile.in
 
+## Process this file with automake to produce Makefile.in
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
+
 SUBDIRS = doc include src
 
 EXTRA_DIST = fishsound.pc.in README.win32 \
@@ -41,7 +44,12 @@
 	win32/encode.dsp \
 	win32/info.dsp \
 	win32/libfishsound/libfishsound.sln \
-	win32/libfishsound/libfishsound.vcproj
+	win32/libfishsound/libfishsound.vcproj \
+	symbian/bld.inf  \
+	symbian/config.h  \
+	symbian/libfishsound.mmp
 
+
+
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = fishsound.pc
\ No newline at end of file
+pkgconfig_DATA = fishsound.pc

Modified: libfishsound/branches/0.9.1/autogen.sh
===================================================================
--- libfishsound/branches/0.9.1/autogen.sh	2008-04-06 20:43:55 UTC (rev 3539)
+++ libfishsound/branches/0.9.1/autogen.sh	2008-04-06 20:49:47 UTC (rev 3540)
@@ -41,7 +41,9 @@
 #
 
 automake_version="none"
-if automake-1.9 --version >/dev/null 2>&1; then
+if automake-1.10 --version >/dev/null 2>&1; then
+  automake_version="-1.10"
+elif automake-1.9 --version >/dev/null 2>&1; then
   automake_version="-1.9"
 elif automake-1.8 --version >/dev/null 2>&1; then
   automake_version="-1.8"
@@ -60,6 +62,7 @@
     1.7*)                             automake_version="-1.7" ;;
     1.8*)                             automake_version="-1.8" ;;
     1.9*)                             automake_version="-1.9" ;;
+    1.10*)                            automake_version="-1.10" ;;
   esac
 fi
 
@@ -161,7 +164,8 @@
 
  export CPPFLAGS="-I/sw/include \$CPPFLAGS"
  export LDFLAGS="-L/sw/lib \$LDFLAGS"
- export PKG_CONFIG_PATH="/sw/lib/pkgconfig:\$PKG_CONFIG_PATH"
+ export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/sw/lib/pkgconfig:\$PKG_CONFIG_PATH"
+
  ./configure
 
 EOF


Property changes on: libfishsound/branches/0.9.1/doc
___________________________________________________________________
Name: svn:ignore
   + Makefile.in



Property changes on: libfishsound/branches/0.9.1/include
___________________________________________________________________
Name: svn:ignore
   + Makefile.in



Property changes on: libfishsound/branches/0.9.1/include/fishsound
___________________________________________________________________
Name: svn:ignore
   + Makefile.in



Property changes on: libfishsound/branches/0.9.1/src
___________________________________________________________________
Name: svn:ignore
   + Makefile.in



Property changes on: libfishsound/branches/0.9.1/src/examples
___________________________________________________________________
Name: svn:ignore
   + Makefile.in



Property changes on: libfishsound/branches/0.9.1/src/libfishsound
___________________________________________________________________
Name: svn:ignore
   + Makefile.in



Property changes on: libfishsound/branches/0.9.1/src/tests
___________________________________________________________________
Name: svn:ignore
   + Makefile.in


Modified: libfishsound/branches/0.9.1/src/tests/encdec-comments.c
===================================================================
--- libfishsound/branches/0.9.1/src/tests/encdec-comments.c	2008-04-06 20:43:55 UTC (rev 3539)
+++ libfishsound/branches/0.9.1/src/tests/encdec-comments.c	2008-04-06 20:49:47 UTC (rev 3540)
@@ -58,6 +58,9 @@
 {
   const FishSoundComment * comment;
 
+  if (fsound == NULL)
+    FAIL ("No Fish Found");
+
   INFO ("+ Retrieving first (expect ARTIST1)");
   comment = fish_sound_comment_first (fsound);