Really fix libshout detection for solaris. Also update stream.c for

the minor libshout api change.

svn path=/trunk/ices/; revision=2215

acinclude.m4

@@ -219,10 +219,14 @@ AC_ARG_ENABLE(shouttest, [  --disable-shouttest       Do not try to compile and
 
   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"
     ac_save_LIBS="$LIBS"

configure.in

@@ -115,7 +115,7 @@ fi
 
 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
 

src/stream.c

 /* 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@labyrinth.net.au>
  *
@@ -147,7 +147,7 @@ void *ices_instance_stream(void *arg)
             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 @@ void *ices_instance_stream(void *arg)
 						{
 							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 @@ void *ices_instance_stream(void *arg)
 	{
 		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);