--- a/configure.ac +++ b/configure.ac @@ -237,7 +237,7 @@ SHOUT_VERSION="$VERSION" SHOUT_CPPFLAGS="-I$shout_includedir $VORBIS_CFLAGS $PTHREAD_CPPFLAGS" SHOUT_CFLAGS="$PTHREAD_CFLAGS" -SHOUT_LIBS="-lshout" +SHOUT_LIBS="-lshout2" XIPH_CLEAN_CCFLAGS([$SHOUT_CPPFLAGS], [SHOUT_CPPFLAGS]) XIPH_CLEAN_CCFLAGS([$SHOUT_CFLAGS], [SHOUT_CFLAGS]) --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = foreign noinst_PROGRAMS = example nonblocking example_SOURCES = example.c -example_LDADD = $(top_builddir)/src/libshout.la @SHOUT_LIBDEPS@ +example_LDADD = $(top_builddir)/src/libshout2.la @SHOUT_LIBDEPS@ nonblocking_SOURCES = nonblocking.c -nonblocking_LDADD = $(top_builddir)/src/libshout.la @SHOUT_LIBDEPS@ +nonblocking_LDADD = $(top_builddir)/src/libshout2.la @SHOUT_LIBDEPS@ AM_CFLAGS = @XIPH_CFLAGS@ AM_CPPFLAGS = @XIPH_CPPFLAGS@ -I$(top_builddir)/include --- a/shout.pc.in +++ b/shout.pc.in @@ -11,5 +11,5 @@ Description: Audio streaming library for icecast encoders Version: @VERSION@ Requires.private: @SHOUT_REQUIRES@ -Libs: -L${libdir} -lshout +Libs: -L${libdir} -lshout2 Cflags: -I${includedir} @PTHREAD_CPPFLAGS@ @SHOUT_CFLAGS@ --- a/src/Makefile.am.orig 2022-05-23 23:03:39.086343073 +0300 +++ b/src/Makefile.am 2022-05-23 23:06:05.529032516 +0300 @@ -25,19 +25,19 @@ SUBDIRS = common/avl common/net common/timing common/httpp $(MAYBE_THREAD) -lib_LTLIBRARIES = libshout.la -libshout_la_LDFLAGS = -version-info 5:0:2 +lib_LTLIBRARIES = libshout2.la +libshout2_la_LDFLAGS = -version-info 5:0:2 EXTRA_DIST = codec_theora.c codec_speex.c tls.c noinst_HEADERS = format_ogg.h shout_private.h util.h PROTOCOLS=proto_http.c proto_xaudiocast.c proto_icy.c proto_roaraudio.c FORMATS=format_ogg.c format_webm.c format_mp3.c format_text.c CODECS=codec_opus.c $(MAYBE_VORBIS) $(MAYBE_THEORA) $(MAYBE_SPEEX) -libshout_la_SOURCES = shout.c legacy.c icy.c util.c queue.c connection.c $(PROTOCOLS) $(FORMATS) $(CODECS) $(MAYBE_TLS) +libshout2_la_SOURCES = shout.c legacy.c icy.c util.c queue.c connection.c $(PROTOCOLS) $(FORMATS) $(CODECS) $(MAYBE_TLS) AM_CFLAGS = @XIPH_CFLAGS@ AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/common @XIPH_CPPFLAGS@ -libshout_la_LIBADD = common/net/libicenet.la common/timing/libicetiming.la common/avl/libiceavl.la\ +libshout2_la_LIBADD = common/net/libicenet.la common/timing/libicetiming.la common/avl/libiceavl.la\ common/httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(OGG_LIBS) $(VORBIS_LIBS) $(SPEEX_LIBS) @XIPH_LIBS@ --- a/tools/Makefile.am.orig 2021-09-14 17:25:26.000000000 +0300 +++ b/tools/Makefile.am 2022-05-23 23:08:41.689502276 +0300 @@ -8,4 +8,4 @@ man1_MANS = shout.1 shout_SOURCES = shout.c -shout_LDADD = $(top_builddir)/src/libshout.la +shout_LDADD = $(top_builddir)/src/libshout2.la