Commit 08c3bdbd authored by giles's avatar giles
Browse files

Don't require a threaded libshout and instead build our own.

Unfortunately the local build has local dependencies (avl) so this doesn't entirely return us to a working compile.

svn path=/trunk/ices/; revision=5096
parent bcdfe38b
......@@ -124,9 +124,6 @@ XIPH_VAR_APPEND([XIPH_CFLAGS], [$XML_CFLAGS])
XIPH_VAR_PREPEND([XIPH_LIBS], [$XML_LIBS])
XIPH_PATH_SHOUT(, AC_MSG_ERROR([must have libshout installed!]))
if test "$SHOUT_THREADED" = "no"; then
AC_MSG_ERROR([libshout found does not have thread support])
fi
XIPH_VAR_APPEND([XIPH_CPPFLAGS], [$SHOUT_CPPFLAGS])
XIPH_VAR_APPEND([XIPH_CFLAGS], [$SHOUT_CFLAGS])
XIPH_VAR_PREPEND([XIPH_LIBS], [$SHOUT_LIBS])
......@@ -153,4 +150,5 @@ AC_OUTPUT(
src/Makefile
src/log/Makefile
src/timing/Makefile
src/thread/Makefile
)
......@@ -2,8 +2,7 @@
AUTOMAKE_OPTIONS = foreign 1.6
SUBDIRS = log timing
EXTRA_DIST = thread/thread.h
SUBDIRS = log timing thread
bin_PROGRAMS = ices
AM_CPPFLAGS = @XIPH_CPPFLAGS@
......@@ -27,7 +26,7 @@ dist_noinst_HEADERS = cfgparse.h input.h inputmodule.h im_playlist.h signals.h s
ices_SOURCES = input.c cfgparse.c stream.c ices.c signals.c im_playlist.c reencode.c encode.c playlist_basic.c im_stdinpcm.c stream_shared.c metadata.c playlist_script.c audio.c resample.c $(oss) $(sun) $(alsa)
ices_LDADD = log/libicelog.la timing/libicetiming.la @ALSA_LIBS@ @XIPH_LIBS@
ices_LDADD = log/libicelog.la timing/libicetiming.la thread/libicethread.la @ALSA_LIBS@ @XIPH_LIBS@
debug:
$(MAKE) all CFLAGS="@DEBUG@"
......
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