[xiph-cvs] cvs commit: ices/src stream.c

[Jack Moffitt]

jack        01/10/20 15:07:17

  Modified:    .        acinclude.m4 configure.in
               src      stream.c
  Log:
  Really fix libshout detection for solaris.  Also update stream.c for
  the minor libshout api change.

Revision  Changes    Path
1.2       +5 -1      ices/acinclude.m4

Index: acinclude.m4
===================================================================
RCS file: /usr/local/cvsroot/ices/acinclude.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- acinclude.m4	2001/09/10 02:30:49	1.1
+++ acinclude.m4	2001/10/20 22:07:16	1.2
@@ -219,9 +219,13 @@
 
   SHOUT_LIBS="$SHOUT_LIBS -lshout"
 
+  case $host in
+  sparc-sun-*)
+  	SHOUT_LIBS="$SHOUT_LIBS -lnsl -lsocket -lresolv"
+  esac
+
   AC_MSG_CHECKING(for Shout)
   no_shout=""
-
 
   if test "x$enable_shouttest" = "xyes" ; then
     ac_save_CFLAGS="$CFLAGS"

1.4       +1 -1      ices/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ices/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.in	2001/10/20 21:50:22	1.3
+++ configure.in	2001/10/20 22:07:16	1.4
@@ -115,7 +115,7 @@
 
 AM_PATH_OGG(LIBS="$LIBS $OGG_LIBS", AC_MSG_ERROR(must have Ogg installed!))
 AM_PATH_VORBIS(LIBS="$LIBS $VORBIS_LIBS $VORBISENC_LIBS", AC_MSG_ERROR(must have Vorbis installed!))
-AM_PATH_SHOUT(LIBS="$LIBS $SUN_LIBS $SHOUT_LIBS", AC_MSG_ERROR(must have libshout installed!))
+AM_PATH_SHOUT(LIBS="$LIBS $SHOUT_LIBS", AC_MSG_ERROR(must have libshout installed!))
 
 dnl Make substitutions
 

1.6       +4 -4      ices/src/stream.c

Index: stream.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/stream.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- stream.c	2001/09/25 12:04:22	1.5
+++ stream.c	2001/10/20 22:07:16	1.6
@@ -1,7 +1,7 @@
 /* stream.c
  * - Core streaming functions/main loop.
  *
- * $Id: stream.c,v 1.5 2001/09/25 12:04:22 msmith Exp $
+ * $Id: stream.c,v 1.6 2001/10/20 22:07:16 jack Exp $
  *
  * Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -147,7 +147,7 @@
             else if(ret == 0)
                         {
                                 LOG_ERROR1("Send error: %s", 
-                        shout_strerror(&sdsc->conn, sdsc->conn.error));
+                        shout_strerror(sdsc->conn.error));
                                 if(sdsc->conn.error == SHOUTERR_SOCKET)
                                 {
                                         int i=0;
@@ -181,7 +181,7 @@
                                                 {
                                                         LOG_ERROR3("Failed to reconnect to %s:%d (%s)",
                                                                 sdsc->conn.ip,sdsc->conn.port,
-								shout_strerror(&sdsc->conn,sdsc->conn.error));
+								shout_strerror(sdsc->conn.error));
                                                         if(i==stream->reconnect_attempts)
                                                         {
                                                                 LOG_ERROR0("Reconnect failed too many times, "
@@ -204,7 +204,7 @@
         {
                 LOG_ERROR3("Failed initial connect to %s:%d (%s)", 
                                 sdsc->conn.ip,sdsc->conn.port,
-                shout_strerror(&sdsc->conn,sdsc->conn.error));
+                shout_strerror(sdsc->conn.error));
         }
         
         shout_disconnect(&sdsc->conn);

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.