Commit 546dcb18 authored by Jack Moffitt's avatar Jack Moffitt
Browse files

Make lib handling more sane.

svn path=/trunk/ices/; revision=2236
parent 5285a4d3
......@@ -8,6 +8,8 @@ AM_PROG_LIBTOOL
dnl Set some options based on environment
SOCKET_LIBS=
if test -z "$GCC"; then
case $host in
*-*-irix*)
......@@ -19,7 +21,7 @@ if test -z "$GCC"; then
DEBUG="-v -g -D_REENTRANT"
CFLAGS="-xO4 -fast -w -fsimple -native -xcg92 -D_REENTRANT"
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc -D_REENTRANT"
SUN_LIBS="-lnsl -lsocket -lresolv"
SOCKET_LIBS="-lnsl -lsocket -lresolv"
;;
*)
DEBUG="-g -D_REENTRANT"
......@@ -38,7 +40,7 @@ else
DEBUG="-g -Wall -fsigned-char -mv8 -D_REENTRANT"
CFLAGS="-O20 -ffast-math -fsigned-char -mv8 -D_REENTRANT"
PROFILE="-pg -g -O20 -fsigned-char -mv8 -D_REENTRANT"
SUN_LIBS="-lnsl -lsocket -lresolv"
SOCKET_LIBS="-lnsl -lsocket -lresolv"
;;
*)
DEBUG="-g -Wall -fsigned-char -D_REENTRANT"
......@@ -117,11 +119,11 @@ AM_PATH_SHOUT(, AC_MSG_ERROR(must have libshout installed!))
dnl Make substitutions
LIBS="$LIBS $XML_LIBS $OGG_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SHOUT_LIBS"
AC_SUBST(OSS_CFLAGS)
AC_SUBST(SUN_CFLAGS)
AC_SUBST(SUN_LIBS)
AC_SUBST(SOCKET_LIBS)
AC_SUBST(XML_LIBS)
AC_SUBST(SHOUT_LIBS)
AC_SUBST(LIBTOOL_DEPS)
AC_SUBST(OPT)
AC_SUBST(LIBS)
......
......@@ -25,7 +25,9 @@ ices_SOURCES = input.c config.c stream.c ices.c signals.c im_playlist.c reencode
ices_LDADD = net/libicenet.la thread/libicethread.la log/libicelog.la\
avl/libiceavl.la timing/libicetiming.la
LIBS = -lpthread $(SUN_LIBS)
LIBS = -lpthread @SOCKET_LIBS@ @XML_LIBS@ @OGG_LIBS@ @VORBIS_LIBS@\
@VORBISENC_LIBS@ @SHOUT_LIBS@
INCLUDES = -Inet -Ithread -Iavl -Ilog -Itiming $(OSS_CFLAGS) $(SUN_CFLAGS)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment