mirror of
https://gitlab.xiph.org/xiph/icecast-server.git
synced 2024-12-04 14:46:30 -05:00
Merge branch 'autotools-cleanup'
This commit is contained in:
Philipp Schafft
commit
194aa161e9
12
Makefile.am
12
Makefile.am
@ -1,23 +1,13 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign dist-zip
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
SUBDIRS = src conf doc web admin win32 examples tests
|
||||
|
||||
EXTRA_DIST = README.md HACKING m4/acx_pthread.m4 m4/ogg.m4 \
|
||||
m4/theora.m4 m4/vorbis.m4 m4/speex.m4 \
|
||||
m4/xiph_compiler.m4 m4/xiph_curl.m4 m4/xiph_net.m4 \
|
||||
m4/xiph_types.m4 m4/xiph_xml2.m4
|
||||
EXTRA_DIST = README.md HACKING
|
||||
|
||||
docdir = $(datadir)/doc/$(PACKAGE)
|
||||
doc_DATA = README.md AUTHORS COPYING NEWS ChangeLog
|
||||
|
||||
debug:
|
||||
$(MAKE) all CFLAGS="@DEBUG@"
|
||||
|
||||
profile:
|
||||
$(MAKE) all CFLAGS="@PROFILE@"
|
||||
|
||||
static:
|
||||
$(MAKE) all LDFLAGS="${LDFLAGS} -all-static"
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
SUBDIRS = includes
|
||||
|
||||
admindir = $(pkgdatadir)/admin
|
||||
dist_admin_DATA = listclients.xsl listmounts.xsl moveclients.xsl response.xsl \
|
||||
stats.xsl manageauth.xsl updatemetadata.xsl xspf.xsl vclt.xsl
|
||||
nobase_dist_admin_DATA = listclients.xsl listmounts.xsl moveclients.xsl response.xsl \
|
||||
stats.xsl manageauth.xsl updatemetadata.xsl xspf.xsl vclt.xsl includes/footer.xsl \
|
||||
includes/head.xsl includes/header.xsl includes/page.xsl includes/mountnav.xsl
|
||||
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
admindir = $(pkgdatadir)/admin
|
||||
otheradmindir = $(admindir)/includes
|
||||
otheradmin_DATA = footer.xsl head.xsl header.xsl page.xsl mountnav.xsl
|
||||
|
||||
EXTRA_DIST = $(otheradmin_DATA)
|
||||
@ -1,7 +1,5 @@
|
||||
## Process this with automake to create Makefile.in
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
EXTRA_DIST = icecast.xml.in icecast_minimal.xml.in icecast_shoutcast_compat.xml.in icecast_urlauth.xml.in
|
||||
DISTCLEANFILES = icecast.xml.dist icecast_minimal.xml.dist icecast_shoutcast_compat.xml.dist icecast_urlauth.xml.dist
|
||||
|
||||
|
||||
343
configure.ac
343
configure.ac
@ -1,168 +1,269 @@
|
||||
AC_INIT([Icecast], [2.4.99.2], [icecast@xiph.org])
|
||||
|
||||
AC_PREREQ([2.54])
|
||||
|
||||
AC_CONFIG_SRCDIR([src/main.c])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AC_REQUIRE_AUX_FILE([tap-driver.sh])
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
|
||||
AM_INIT_AUTOMAKE
|
||||
AM_CONFIG_HEADER([config.h])
|
||||
AM_MAINTAINER_MODE
|
||||
AC_CONFIG_AUX_DIR([build-aux])
|
||||
|
||||
AC_PROG_CC
|
||||
AC_PROG_AWK
|
||||
AC_CANONICAL_HOST
|
||||
AC_PROG_LIBTOOL
|
||||
|
||||
AX_CHECK_COMPILE_FLAG([-std=c99], [
|
||||
AX_APPEND_FLAG([-std=c99])
|
||||
], [
|
||||
AC_MSG_WARN([Compiler does not accept -std=c99 flag!])
|
||||
])
|
||||
|
||||
AC_PROG_CC_C99
|
||||
|
||||
AS_IF([test "${ac_cv_prog_cc_c99}" = "no"], [
|
||||
AC_MSG_ERROR([No C99 compiler found!])
|
||||
])
|
||||
|
||||
AC_SYS_LARGEFILE
|
||||
AC_DEFINE([_GNU_SOURCE], 1, [Define to include GNU extensions to POSIX])
|
||||
|
||||
dnl Set some options based on environment
|
||||
dnl Set build/host to default values
|
||||
AC_CANONICAL_HOST
|
||||
AC_CANONICAL_BUILD
|
||||
|
||||
DEBUG="-g"
|
||||
if test -z "$GCC"; then
|
||||
XIPH_CPPFLAGS="-D_REENTRANT"
|
||||
PROFILE="-g -p"
|
||||
else
|
||||
XIPH_CPPFLAGS="-Wall -ffast-math -fsigned-char"
|
||||
PROFILE="-pg -g"
|
||||
AC_DEFINE([_GNU_SOURCE], 1, [Define to include GNU extensions to POSIX])
|
||||
fi
|
||||
|
||||
dnl Checks for programs.
|
||||
AM_INIT_AUTOMAKE([tar-ustar foreign dist-zip])
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
|
||||
dnl Checks for libraries.
|
||||
AM_MAINTAINER_MODE([enable])
|
||||
|
||||
LT_INIT
|
||||
|
||||
dnl Checks for header files.
|
||||
AC_HEADER_ASSERT
|
||||
AC_HEADER_STDC
|
||||
AC_HEADER_TIME
|
||||
|
||||
AC_CHECK_HEADERS([alloca.h sys/timeb.h])
|
||||
AC_CHECK_HEADERS([pwd.h unistd.h grp.h sys/types.h],,,AC_INCLUDES_DEFAULT)
|
||||
AC_CHECK_HEADERS([stdint.h inttypes.h], [
|
||||
ice_found_int_headers="yes";
|
||||
break;
|
||||
])
|
||||
|
||||
AS_IF([test "$ice_found_int_headers" != "yes"], [
|
||||
AC_MSG_ERROR([Unable to find the standard integers headers])
|
||||
])
|
||||
|
||||
AC_CHECK_HEADERS([sys/types.h])
|
||||
AC_CHECK_HEADERS([sys/timeb.h])
|
||||
AC_CHECK_HEADERS([sys/socket.h])
|
||||
AC_CHECK_HEADERS([pwd.h grp.h])
|
||||
|
||||
XIPH_NET
|
||||
|
||||
dnl Check for functions
|
||||
AC_FUNC_FORK
|
||||
AC_FUNC_CHOWN
|
||||
|
||||
AC_CHECK_FUNCS([setuid])
|
||||
AC_CHECK_FUNCS([chroot])
|
||||
AC_CHECK_FUNCS([chown])
|
||||
AC_CHECK_FUNCS([strcasestr])
|
||||
AC_CHECK_FUNCS([gethostname])
|
||||
AC_CHECK_FUNCS([uname])
|
||||
AC_CHECK_FUNCS([setenv])
|
||||
AC_CHECK_FUNCS([setresuid])
|
||||
AC_CHECK_FUNCS([setresgid])
|
||||
AC_CHECK_FUNCS([localtime_r])
|
||||
AC_CHECK_FUNCS([poll])
|
||||
AC_CHECK_FUNCS([gettimeofday])
|
||||
AC_CHECK_FUNCS([ftime])
|
||||
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
XIPH_C__FUNC__
|
||||
AC_SEARCH_LIBS([nanosleep], [rt posix4], [
|
||||
AC_DEFINE([HAVE_NANOSLEEP], [1], [Define if you have nanosleep])
|
||||
])
|
||||
|
||||
dnl Check for types
|
||||
dnl Checks for types and typedefs
|
||||
AC_TYPE_OFF_T
|
||||
AC_TYPE_PID_T
|
||||
AC_TYPE_SIZE_T
|
||||
AC_TYPE_SSIZE_T
|
||||
AC_TYPE_UID_T
|
||||
|
||||
dnl Checks for library functions.
|
||||
AC_CHECK_FUNCS([localtime_r poll gettimeofday ftime])
|
||||
dnl Checks for required libraries
|
||||
|
||||
AC_SEARCH_LIBS([nanosleep], [rt posix4], AC_DEFINE([HAVE_NANOSLEEP], [1], [Define if you have nanosleep]))
|
||||
XIPH_NET
|
||||
dnl
|
||||
dnl libxml2
|
||||
dnl
|
||||
PKG_CHECK_MODULES([LIBXML2], [libxml-2.0], [], [
|
||||
AC_MSG_ERROR([${LIBXML2_PKG_ERRORS}. libxml2 is required.])
|
||||
])
|
||||
|
||||
dnl -- configure options --
|
||||
CFLAGS="${CFLAGS} ${LIBXML2_CFLAGS}"
|
||||
LIBS="${LIBS} ${LIBXML2_LIBS}"
|
||||
|
||||
XIPH_PATH_XSLT
|
||||
XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$XSLT_CFLAGS])
|
||||
XIPH_VAR_PREPEND([XIPH_LIBS],[$XSLT_LIBS])
|
||||
|
||||
XIPH_PATH_VORBIS([
|
||||
XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$VORBIS_CFLAGS])
|
||||
XIPH_VAR_PREPEND([XIPH_LIBS],[$VORBIS_LIBS])
|
||||
XIPH_VAR_APPEND([XIPH_LDFLAGS],[$VORBIS_LDFLAGS])
|
||||
ICECAST_OPTIONAL="$ICECAST_OPTIONAL format_vorbis.o"
|
||||
],
|
||||
[AC_MSG_ERROR([must have Ogg Vorbis v1.0 or above installed])
|
||||
])
|
||||
dnl
|
||||
dnl libxslt
|
||||
dnl
|
||||
PKG_CHECK_MODULES([LIBXSLT], [libxslt], [], [
|
||||
AC_MSG_ERROR([${LIBXSLT_PKG_ERRORS}. libxslt is required.])
|
||||
])
|
||||
|
||||
XIPH_PATH_THEORA([
|
||||
XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$THEORA_CFLAGS])
|
||||
XIPH_VAR_APPEND([XIPH_LDFLAGS],[$THEORA_LDFLAGS])
|
||||
XIPH_VAR_PREPEND([XIPH_LIBS],[$THEORA_LIBS])
|
||||
ICECAST_OPTIONAL="$ICECAST_OPTIONAL format_theora.o"
|
||||
],
|
||||
[ AC_MSG_WARN([Theora disabled!])
|
||||
])
|
||||
CFLAGS="${CFLAGS} ${LIBXSLT_CFLAGS}"
|
||||
LIBS="${LIBS} ${LIBXSLT_LIBS}"
|
||||
|
||||
XIPH_PATH_SPEEX(
|
||||
[ XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$SPEEX_CFLAGS])
|
||||
XIPH_VAR_PREPEND([XIPH_LIBS],[$SPEEX_LIBS])
|
||||
XIPH_VAR_APPEND([XIPH_LDFLAGS],[$SPEEX_LDFLAGS])
|
||||
ICECAST_OPTIONAL="$ICECAST_OPTIONAL format_speex.o"
|
||||
],
|
||||
[ AC_MSG_WARN([Speex support disabled!])
|
||||
])
|
||||
|
||||
AC_CHECK_LIB(kate, kate_decode_init,[have_kate=yes],[have_kate=no], -logg)
|
||||
if test "x$have_kate" == "xyes"
|
||||
then
|
||||
AC_CHECK_LIB(oggkate, kate_ogg_decode_headerin,[have_kate=yes],[have_kate=no],-lkate -logg)
|
||||
if test "x$have_kate" == "xyes"
|
||||
then
|
||||
KATE_LIBS="-loggkate -lkate -logg"
|
||||
AC_DEFINE([HAVE_KATE],[1],[Define if you have libkate])
|
||||
fi
|
||||
fi
|
||||
dnl
|
||||
dnl libvorbis
|
||||
dnl
|
||||
PKG_CHECK_MODULES([VORBIS], [vorbis >= 1.0], [], [
|
||||
AC_MSG_ERROR([${VORBIS_PKG_ERRORS}. Must have libvorbis v1.0 or above installed.])
|
||||
])
|
||||
|
||||
CFLAGS="${CFLAGS} ${VORBIS_CFLAGS}"
|
||||
LIBS="${LIBS} ${VORBIS_LIBS}"
|
||||
|
||||
|
||||
dnl Checks for optional libraries
|
||||
|
||||
dnl
|
||||
dnl libogg
|
||||
dnl
|
||||
PKG_HAVE_WITH_MODULES([OGG], [ogg], [
|
||||
CFLAGS="${CFLAGS} ${OGG_CFLAGS}"
|
||||
LIBS="${LIBS} ${OGG_LIBS}"
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl libtheora
|
||||
dnl
|
||||
PKG_HAVE_WITH_MODULES([THEORA], [theora], [
|
||||
CFLAGS="${CFLAGS} ${THEORA_CFLAGS}"
|
||||
LIBS="${LIBS} ${THEORA_LIBS}"
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl libspeex
|
||||
dnl
|
||||
PKG_HAVE_WITH_MODULES([SPEEX], [speex], [
|
||||
CFLAGS="${CFLAGS} ${SPEEX_CFLAGS}"
|
||||
LIBS="${LIBS} ${SPEEX_LIBS}"
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl libcurl
|
||||
dnl
|
||||
PKG_HAVE_WITH_MODULES([CURL], [libcurl], [
|
||||
CFLAGS="${CFLAGS} ${CURL_CFLAGS}"
|
||||
LIBS="${LIBS} ${CURL_LIBS}"
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl openssl
|
||||
dnl
|
||||
PKG_HAVE_WITH_MODULES([OPENSSL], [openssl], [
|
||||
CFLAGS="${CFLAGS} ${OPENSSL_CFLAGS}"
|
||||
LIBS="${LIBS} ${OPENSSL_LIBS}"
|
||||
])
|
||||
|
||||
dnl Check for library-specific functions
|
||||
AC_CHECK_FUNCS([xsltSaveResultToString])
|
||||
|
||||
dnl we still use format_kate as it doesn't need libkate to work
|
||||
#ICECAST_OPTIONAL="$ICECAST_OPTIONAL format_kate.o"
|
||||
|
||||
ACX_PTHREAD(, AC_MSG_ERROR([POSIX threads missing]))
|
||||
XIPH_VAR_APPEND([XIPH_CFLAGS],[$PTHREAD_CFLAGS])
|
||||
XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$PTHREAD_CPPFLAGS])
|
||||
XIPH_VAR_PREPEND([XIPH_LIBS],[$PTHREAD_LIBS])
|
||||
ACX_PTHREAD([], [AC_MSG_ERROR([POSIX threads missing])])
|
||||
|
||||
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
|
||||
CPPFLAGS="${CPPFLAGS} ${PTHREAD_CPPFLAGS}"
|
||||
LIBS="${LIBS} ${PTHREAD_LIBS}"
|
||||
|
||||
dnl Feature enable/disable arguments
|
||||
|
||||
XIPH_PATH_CURL([
|
||||
AC_CHECK_DECL([CURLOPT_NOSIGNAL],
|
||||
[ AC_DEFINE([HAVE_AUTH_URL], 1, [Define to compile in auth URL support code])
|
||||
AC_CHECK_FUNCS([curl_global_init])
|
||||
ICECAST_OPTIONAL="$ICECAST_OPTIONAL auth_url.o event_url.o curl.o"
|
||||
enable_curl="yes"
|
||||
XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$CURL_CFLAGS])
|
||||
XIPH_VAR_PREPEND([XIPH_LIBS],[$CURL_LIBS])
|
||||
], [ AC_MSG_NOTICE([Your curl dev files are too old (7.10 or above required)])
|
||||
], [#include <curl/curl.h>
|
||||
])
|
||||
],[ AC_MSG_NOTICE([libcurl not found])
|
||||
])
|
||||
dnl -- YP support --
|
||||
AC_ARG_ENABLE([yp],
|
||||
AC_HELP_STRING([--disable-yp],[disable YP directory support]),
|
||||
enable_yp="$enableval",
|
||||
enable_yp="yes")
|
||||
if test "x$enable_yp" = "xyes" -a "x$enable_curl" = xyes
|
||||
then
|
||||
AC_DEFINE([USE_YP], 1, [Define to compile in YP support code])
|
||||
ICECAST_OPTIONAL="$ICECAST_OPTIONAL yp.o"
|
||||
else
|
||||
AC_MSG_NOTICE([YP support disabled])
|
||||
fi
|
||||
XIPH_PATH_OPENSSL([
|
||||
XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$OPENSSL_CFLAGS])
|
||||
XIPH_VAR_APPEND([XIPH_LDFLAGS],[$OPENSSL_LDFLAGS])
|
||||
XIPH_VAR_PREPEND([XIPH_LIBS],[$OPENSSL_LIBS])
|
||||
],
|
||||
[ AC_MSG_NOTICE([SSL disabled!])
|
||||
AS_HELP_STRING([--enable-yp],
|
||||
[enable yellowpage directory listing support (default: auto)])
|
||||
)
|
||||
|
||||
AS_IF([test "x$enable_yp" != "xno"], [
|
||||
AS_IF([test "x$have_curl" != "xyes"], [
|
||||
AS_IF([test "x$enable_yp" == "xyes"], [
|
||||
AC_MSG_ERROR([cURL is required for YP support])
|
||||
])
|
||||
enable_yp="no"
|
||||
], [
|
||||
AC_DEFINE([USE_YP], 1, [Define to compile in YP support code])
|
||||
enable_yp="yes"
|
||||
])
|
||||
])
|
||||
|
||||
AM_CONDITIONAL([ENABLE_YP],
|
||||
[test "x$enable_yp" = "xyes"])
|
||||
|
||||
|
||||
AC_ARG_ENABLE([client-tests],
|
||||
AS_HELP_STRING([--enable-client-tests],
|
||||
[enable client tests module (default: disabled)])
|
||||
)
|
||||
|
||||
AS_IF([test "x$enable_client_tests" == "xyes"], [
|
||||
AC_DEFINE([ENABLE_MODULE_CLIENT_TESTS], 1, [Define to compile client test module])
|
||||
], [enable_client_tests="no"])
|
||||
|
||||
AM_CONDITIONAL([ENABLE_MODULE_CLIENT_TESTS],
|
||||
[test "x$enable_client_tests" = "xyes"])
|
||||
|
||||
AC_ARG_WITH([default-config],
|
||||
AS_HELP_STRING([--with-default-config=PATH],
|
||||
[Sets default Icecast configuration file (used when no configuration file is given)]),
|
||||
[], [with_default_config=no]
|
||||
)
|
||||
|
||||
AS_IF([test "$with_default_config" != "no"], [
|
||||
|
||||
AS_IF([test "$with_default_config" = "yes"], [
|
||||
AC_MSG_ERROR([You need to supply a path as value for --with-default-config])
|
||||
])
|
||||
|
||||
AC_DEFINE_UNQUOTED([ICECAST_DEFAULT_CONFIG], ["$with_default_config"], [Define to default config file path])
|
||||
|
||||
])
|
||||
|
||||
dnl Make substitutions
|
||||
|
||||
AC_SUBST(XIPH_LIBS)
|
||||
AC_SUBST(XIPH_CPPFLAGS)
|
||||
AC_SUBST(XIPH_CFLAGS)
|
||||
AC_SUBST(XIPH_LIBS)
|
||||
AC_SUBST(XIPH_LDFLAGS)
|
||||
AC_SUBST(PTHREAD_CPPFLAGS)
|
||||
AC_SUBST(PTHREAD_CFLAGS)
|
||||
AC_SUBST(PTHREAD_LIBS)
|
||||
AC_SUBST(LIBTOOL_DEPS)
|
||||
AC_SUBST(LIBS)
|
||||
AC_SUBST(DEBUG)
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(PROFILE)
|
||||
AC_SUBST(ICECAST_OPTIONAL)
|
||||
AC_SUBST(HAVE_KATE)
|
||||
AC_SUBST(KATE_LIBS)
|
||||
|
||||
AC_OUTPUT([Makefile conf/Makefile src/Makefile src/common/avl/Makefile
|
||||
src/common/httpp/Makefile src/common/thread/Makefile src/common/log/Makefile
|
||||
src/common/net/Makefile src/common/timing/Makefile doc/Makefile web/Makefile
|
||||
web/assets/Makefile web/assets/css/Makefile web/assets/font/Makefile
|
||||
admin/Makefile admin/includes/Makefile win32/Makefile examples/Makefile tests/Makefile])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
conf/Makefile
|
||||
src/Makefile
|
||||
src/common/avl/Makefile
|
||||
src/common/httpp/Makefile
|
||||
src/common/thread/Makefile
|
||||
src/common/log/Makefile
|
||||
src/common/net/Makefile
|
||||
src/common/timing/Makefile
|
||||
doc/Makefile
|
||||
web/Makefile
|
||||
admin/Makefile
|
||||
win32/Makefile
|
||||
examples/Makefile
|
||||
tests/Makefile
|
||||
])
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
echo "
|
||||
Icecast configuration
|
||||
---------------------
|
||||
Version : ${VERSION}
|
||||
cURL : ${have_curl}
|
||||
TLS (openSSL) : ${have_openssl}
|
||||
|
||||
Format/Codec support:
|
||||
Ogg : ${have_ogg}
|
||||
Theora : ${have_theora}
|
||||
Speex : ${have_speex}
|
||||
|
||||
Features:
|
||||
YP support : ${enable_yp}
|
||||
Client tests : ${enable_client_tests}"
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
docdir = $(datadir)/doc/$(PACKAGE)
|
||||
|
||||
docdir = $(datadir)/doc/icecast
|
||||
nobase_doc_DATA = index.html \
|
||||
admin_interface/index.html \
|
||||
auth/index.html \
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
EXTRA_DIST = icecast_auth-1.0.tar.gz
|
||||
|
||||
2
m4
2
m4
@ -1 +1 @@
|
||||
Subproject commit 57027c6cc3f8b26d59e9560b4ac72a1a06d643b9
|
||||
Subproject commit 541d6079634c420ea757687715580fa199a0e3f0
|
||||
145
src/Makefile.am
145
src/Makefile.am
@ -1,41 +1,128 @@
|
||||
## Process this with automake to create Makefile.in
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
SUBDIRS = common/avl common/net common/thread common/httpp common/log common/timing
|
||||
|
||||
bin_PROGRAMS = icecast
|
||||
|
||||
noinst_HEADERS = admin.h cfgfile.h logging.h sighandler.h connection.h \
|
||||
global.h util.h errors.h curl.h slave.h source.h stats.h refbuf.h client.h playlist.h \
|
||||
compat.h fserve.h xslt.h yp.h md5.h matchfile.h tls.h \
|
||||
event.h event_log.h event_exec.h event_url.h \
|
||||
noinst_HEADERS = \
|
||||
admin.h \
|
||||
cfgfile.h \
|
||||
logging.h \
|
||||
sighandler.h \
|
||||
connection.h \
|
||||
global.h \
|
||||
util.h \
|
||||
errors.h \
|
||||
curl.h \
|
||||
slave.h \
|
||||
source.h \
|
||||
stats.h \
|
||||
refbuf.h \
|
||||
client.h \
|
||||
playlist.h \
|
||||
compat.h \
|
||||
fserve.h \
|
||||
xslt.h \
|
||||
yp.h \
|
||||
md5.h \
|
||||
matchfile.h \
|
||||
tls.h \
|
||||
event.h \
|
||||
event_log.h \
|
||||
event_exec.h \
|
||||
event_url.h \
|
||||
acl.h auth.h \
|
||||
format.h format_ogg.h format_mp3.h format_ebml.h \
|
||||
format_vorbis.h format_theora.h format_flac.h format_speex.h format_midi.h \
|
||||
format_kate.h format_skeleton.h format_opus.h
|
||||
icecast_SOURCES = cfgfile.c main.c logging.c sighandler.c connection.c global.c \
|
||||
util.c errors.c slave.c source.c stats.c refbuf.c client.c playlist.c \
|
||||
xslt.c fserve.c admin.c md5.c matchfile.c tls.c \
|
||||
format.c format_ogg.c format_mp3.c format_midi.c format_flac.c format_ebml.c \
|
||||
format_kate.c format_skeleton.c format_opus.c \
|
||||
event.c event_log.c event_exec.c \
|
||||
acl.c auth.c auth_htpasswd.c auth_anonymous.c auth_static.c
|
||||
EXTRA_icecast_SOURCES = curl.c yp.c \
|
||||
auth_url.c event_url.c \
|
||||
format_vorbis.c format_theora.c format_speex.c
|
||||
format.h \
|
||||
format_ogg.h \
|
||||
format_mp3.h \
|
||||
format_ebml.h \
|
||||
format_vorbis.h \
|
||||
format_theora.h \
|
||||
format_flac.h \
|
||||
format_speex.h \
|
||||
format_midi.h \
|
||||
format_kate.h \
|
||||
format_skeleton.h \
|
||||
format_opus.h
|
||||
|
||||
icecast_DEPENDENCIES = @ICECAST_OPTIONAL@ common/net/libicenet.la common/thread/libicethread.la \
|
||||
common/httpp/libicehttpp.la common/log/libicelog.la common/avl/libiceavl.la common/timing/libicetiming.la
|
||||
icecast_LDADD = $(icecast_DEPENDENCIES) @XIPH_LIBS@ @KATE_LIBS@
|
||||
icecast_SOURCES = \
|
||||
main.c \
|
||||
cfgfile.c \
|
||||
logging.c \
|
||||
sighandler.c \
|
||||
connection.c \
|
||||
global.c \
|
||||
util.c \
|
||||
errors.c \
|
||||
slave.c \
|
||||
source.c \
|
||||
stats.c \
|
||||
refbuf.c \
|
||||
client.c \
|
||||
playlist.c \
|
||||
xslt.c \
|
||||
fserve.c \
|
||||
admin.c \
|
||||
md5.c \
|
||||
matchfile.c \
|
||||
tls.c \
|
||||
format.c \
|
||||
format_ogg.c \
|
||||
format_mp3.c \
|
||||
format_midi.c \
|
||||
format_flac.c \
|
||||
format_ebml.c \
|
||||
format_kate.c \
|
||||
format_skeleton.c \
|
||||
format_opus.c \
|
||||
event.c \
|
||||
event_log.c \
|
||||
event_exec.c \
|
||||
acl.c \
|
||||
auth.c \
|
||||
auth_htpasswd.c \
|
||||
auth_anonymous.c \
|
||||
auth_static.c
|
||||
|
||||
AM_CFLAGS = @XIPH_CFLAGS@
|
||||
AM_CPPFLAGS = -I$(srcdir)/common/ @XIPH_CPPFLAGS@
|
||||
AM_LDFLAGS = @XIPH_LDFLAGS@ @KATE_LIBS@
|
||||
if HAVE_CURL
|
||||
icecast_SOURCES += \
|
||||
curl.c \
|
||||
auth_url.c \
|
||||
event_url.c
|
||||
endif
|
||||
|
||||
if ENABLE_YP
|
||||
icecast_SOURCES += yp.c
|
||||
endif
|
||||
|
||||
debug:
|
||||
$(MAKE) all CFLAGS="@DEBUG@"
|
||||
if HAVE_OGG
|
||||
icecast_SOURCES += format_vorbis.c
|
||||
endif
|
||||
|
||||
profile:
|
||||
$(MAKE) all CFLAGS="@PROFILE@"
|
||||
if HAVE_THEORA
|
||||
icecast_SOURCES += format_theora.c
|
||||
endif
|
||||
|
||||
if HAVE_SPEEX
|
||||
icecast_SOURCES += format_speex.c
|
||||
endif
|
||||
|
||||
EXTRA_icecast_SOURCES = \
|
||||
curl.c \
|
||||
yp.c \
|
||||
auth_url.c \
|
||||
event_url.c \
|
||||
format_vorbis.c \
|
||||
format_theora.c \
|
||||
format_speex.c
|
||||
|
||||
icecast_DEPENDENCIES = \
|
||||
common/net/libicenet.la \
|
||||
common/thread/libicethread.la \
|
||||
common/httpp/libicehttpp.la \
|
||||
common/log/libicelog.la \
|
||||
common/avl/libiceavl.la \
|
||||
common/timing/libicetiming.la
|
||||
|
||||
icecast_LDADD = $(icecast_DEPENDENCIES)
|
||||
icecast_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/common
|
||||
|
||||
@ -438,7 +438,7 @@ static int get_authenticator (auth_t *auth, config_options_t *options)
|
||||
ICECAST_LOG_DEBUG("type is %s", auth->type);
|
||||
|
||||
if (strcmp(auth->type, AUTH_TYPE_URL) == 0) {
|
||||
#ifdef HAVE_AUTH_URL
|
||||
#ifdef HAVE_CURL
|
||||
if (auth_get_url_auth(auth, options) < 0)
|
||||
return -1;
|
||||
break;
|
||||
|
||||
@ -47,11 +47,12 @@
|
||||
# define PRId64 "I64d"
|
||||
#else
|
||||
# define PATH_SEPARATOR "/"
|
||||
# if defined(HAVE_INTTYPES_H)
|
||||
# include <inttypes.h>
|
||||
# elif defined(HAVE_STDINT_H)
|
||||
# ifdef HAVE_STDINT_H
|
||||
# include <stdint.h>
|
||||
# endif
|
||||
# ifdef HAVE_INTTYPES_H
|
||||
# include <inttypes.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* some defaults if not provided above */
|
||||
|
||||
@ -247,7 +247,7 @@ event_registration_t * event_new_from_xml_node(xmlNodePtr node) {
|
||||
rv = event_get_log(ret, options);
|
||||
} else if (strcmp(ret->type, EVENT_TYPE_EXEC) == 0) {
|
||||
rv = event_get_exec(ret, options);
|
||||
#ifdef HAVE_AUTH_URL
|
||||
#ifdef HAVE_CURL
|
||||
} else if (strcmp(ret->type, EVENT_TYPE_URL) == 0) {
|
||||
rv = event_get_url(ret, options);
|
||||
#endif
|
||||
|
||||
@ -21,8 +21,6 @@
|
||||
#include <ogg/ogg.h>
|
||||
#include <string.h>
|
||||
|
||||
typedef struct source_tag source_t;
|
||||
|
||||
#include "refbuf.h"
|
||||
#include "format_ogg.h"
|
||||
#include "client.h"
|
||||
|
||||
@ -20,11 +20,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ogg/ogg.h>
|
||||
#ifdef HAVE_KATE
|
||||
#include <kate/oggkate.h>
|
||||
#endif
|
||||
|
||||
typedef struct source_tag source_t;
|
||||
|
||||
#include "refbuf.h"
|
||||
#include "format_ogg.h"
|
||||
@ -39,10 +34,6 @@ typedef struct source_tag source_t;
|
||||
typedef struct _kate_codec_tag
|
||||
{
|
||||
int headers_done;
|
||||
#ifdef HAVE_KATE
|
||||
kate_info ki;
|
||||
kate_comment kc;
|
||||
#endif
|
||||
int num_headers;
|
||||
int granule_shift;
|
||||
ogg_int64_t last_iframe;
|
||||
@ -61,10 +52,6 @@ static void kate_codec_free (ogg_state_t *ogg_info, ogg_codec_t *codec)
|
||||
stats_event (ogg_info->mount, "frame_rate", NULL);
|
||||
stats_event (ogg_info->mount, "frame_size", NULL);
|
||||
*/
|
||||
#ifdef HAVE_KATE
|
||||
kate_info_clear (&kate->ki);
|
||||
kate_comment_clear (&kate->kc);
|
||||
#endif
|
||||
ogg_stream_clear (&codec->os);
|
||||
free (kate);
|
||||
free (codec);
|
||||
@ -93,35 +80,6 @@ static refbuf_t *process_kate_page (ogg_state_t *ogg_info, ogg_codec_t *codec, o
|
||||
{
|
||||
if (!kate->headers_done)
|
||||
{
|
||||
#ifdef HAVE_KATE
|
||||
int ret = kate_ogg_decode_headerin (&kate->ki, &kate->kc, &packet);
|
||||
if (ret < 0)
|
||||
{
|
||||
ogg_info->error = 1;
|
||||
ICECAST_LOG_WARN("problem with kate header");
|
||||
return NULL;
|
||||
}
|
||||
header_page = 1;
|
||||
kate->num_headers = kate->ki.num_headers;
|
||||
codec->headers++;
|
||||
if (ret > 0)
|
||||
{
|
||||
kate->headers_done = 1;
|
||||
/* TODO: what to replace this with ?
|
||||
ogg_info->bitrate += theora->ti.target_bitrate;
|
||||
stats_event_args (ogg_info->mount, "video_bitrate", "%ld",
|
||||
(long)theora->ti.target_bitrate);
|
||||
stats_event_args (ogg_info->mount, "video_quality", "%ld",
|
||||
(long)theora->ti.quality);
|
||||
stats_event_args (ogg_info->mount, "frame_size", "%ld x %ld",
|
||||
(long)theora->ti.frame_width,
|
||||
(long)theora->ti.frame_height);
|
||||
stats_event_args (ogg_info->mount, "frame_rate", "%.2f",
|
||||
(float)theora->ti.fps_numerator/theora->ti.fps_denominator);
|
||||
*/
|
||||
}
|
||||
continue;
|
||||
#else
|
||||
header_page = (packet.bytes > 0 && (packet.packet[0] & 0x80));
|
||||
if (!header_page)
|
||||
break;
|
||||
@ -133,7 +91,6 @@ static refbuf_t *process_kate_page (ogg_state_t *ogg_info, ogg_codec_t *codec, o
|
||||
kate->num_headers = packet.packet[11];
|
||||
}
|
||||
continue;
|
||||
#endif
|
||||
}
|
||||
|
||||
if (codec->headers < kate->num_headers)
|
||||
@ -189,25 +146,9 @@ ogg_codec_t *initial_kate_page(format_plugin_t *plugin, ogg_page *page)
|
||||
ogg_stream_init(&codec->os, ogg_page_serialno(page));
|
||||
ogg_stream_pagein(&codec->os, page);
|
||||
|
||||
#ifdef HAVE_KATE
|
||||
kate_info_init (&kate_codec->ki);
|
||||
kate_comment_init (&kate_codec->kc);
|
||||
#endif
|
||||
|
||||
ogg_stream_packetout(&codec->os, &packet);
|
||||
|
||||
ICECAST_LOG_DEBUG("checking for kate codec");
|
||||
#ifdef HAVE_KATE
|
||||
if (kate_ogg_decode_headerin (&kate_codec->ki, &kate_codec->kc, &packet) < 0)
|
||||
{
|
||||
kate_info_clear (&kate_codec->ki);
|
||||
kate_comment_clear (&kate_codec->kc);
|
||||
ogg_stream_clear (&codec->os);
|
||||
free (kate_codec);
|
||||
free (codec);
|
||||
return NULL;
|
||||
}
|
||||
#else
|
||||
/* we don't have libkate, so we examine the packet magic by hand */
|
||||
if ((packet.bytes<9) || memcmp(packet.packet, "\x80kate\0\0\0\0", 9))
|
||||
{
|
||||
@ -216,7 +157,6 @@ ogg_codec_t *initial_kate_page(format_plugin_t *plugin, ogg_page *page)
|
||||
free (codec);
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
ICECAST_LOG_INFO("seen initial kate header");
|
||||
codec->specific = kate_codec;
|
||||
|
||||
@ -21,8 +21,6 @@
|
||||
#include <ogg/ogg.h>
|
||||
#include <string.h>
|
||||
|
||||
typedef struct source_tag source_t;
|
||||
|
||||
#include "refbuf.h"
|
||||
#include "format_ogg.h"
|
||||
#include "client.h"
|
||||
|
||||
@ -20,8 +20,6 @@
|
||||
#include <string.h>
|
||||
#include <ogg/ogg.h>
|
||||
|
||||
typedef struct source_tag source_t;
|
||||
|
||||
#include "format_opus.h"
|
||||
#include "stats.h"
|
||||
#include "refbuf.h"
|
||||
|
||||
@ -21,8 +21,6 @@
|
||||
#include <string.h>
|
||||
#include <ogg/ogg.h>
|
||||
|
||||
typedef struct source_tag source_t;
|
||||
|
||||
#include "refbuf.h"
|
||||
#include "format_ogg.h"
|
||||
#include "format_skeleton.h"
|
||||
|
||||
@ -21,8 +21,6 @@
|
||||
#include <ogg/ogg.h>
|
||||
#include <speex/speex_header.h>
|
||||
|
||||
typedef struct source_tag source_t;
|
||||
|
||||
#include "format_speex.h"
|
||||
#include "refbuf.h"
|
||||
#include "client.h"
|
||||
|
||||
@ -21,8 +21,6 @@
|
||||
#include <ogg/ogg.h>
|
||||
#include <theora/theora.h>
|
||||
|
||||
typedef struct source_tag source_t;
|
||||
|
||||
#include "refbuf.h"
|
||||
#include "format_ogg.h"
|
||||
#include "format_theora.h"
|
||||
|
||||
@ -1,19 +1,31 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
SUBDIRS = assets
|
||||
|
||||
webdir = $(pkgdatadir)/web
|
||||
web_DATA = status.xsl \
|
||||
favicon.ico \
|
||||
icecast.png \
|
||||
style.css \
|
||||
auth.xsl \
|
||||
server_version.xsl \
|
||||
tunein.png \
|
||||
key.png \
|
||||
status-json.xsl \
|
||||
xml2json.xslt
|
||||
|
||||
EXTRA_DIST = $(web_DATA)
|
||||
nobase_web_DATA = \
|
||||
status.xsl \
|
||||
favicon.ico \
|
||||
icecast.png \
|
||||
style.css \
|
||||
auth.xsl \
|
||||
server_version.xsl \
|
||||
tunein.png \
|
||||
key.png \
|
||||
status-json.xsl \
|
||||
xml2json.xslt \
|
||||
assets/css/style.css \
|
||||
assets/font/FiraMono-Bold.eot \
|
||||
assets/font/FiraMono-Regular.eot \
|
||||
assets/font/FiraSans-Bold.eot \
|
||||
assets/font/FiraSans-BoldItalic.woff \
|
||||
assets/font/FiraSans-Italic.eot \
|
||||
assets/font/FiraSans-Regular.eot \
|
||||
assets/font/FiraMono-Bold.woff \
|
||||
assets/font/FiraMono-Regular.woff \
|
||||
assets/font/FiraSans-BoldItalic.eot \
|
||||
assets/font/FiraSans-Bold.woff \
|
||||
assets/font/FiraSans-Italic.woff \
|
||||
assets/font/FiraSans-Regular.woff
|
||||
|
||||
|
||||
EXTRA_DIST = $(nobase_web_DATA)
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
SUBDIRS = css font
|
||||
@ -1,10 +0,0 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
webdir = $(pkgdatadir)/web
|
||||
otherwebdir = $(webdir)/assets/css
|
||||
|
||||
otherweb_DATA = style.css
|
||||
|
||||
EXTRA_DIST = $(otherweb_DATA)
|
||||
@ -1,15 +0,0 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
webdir = $(pkgdatadir)/web
|
||||
otherwebdir = $(webdir)/assets/font
|
||||
|
||||
otherweb_DATA = FiraMono-Bold.eot FiraMono-Regular.eot \
|
||||
FiraSans-Bold.eot FiraSans-BoldItalic.woff \
|
||||
FiraSans-Italic.eot FiraSans-Regular.eot \
|
||||
FiraMono-Bold.woff FiraMono-Regular.woff \
|
||||
FiraSans-BoldItalic.eot FiraSans-Bold.woff \
|
||||
FiraSans-Italic.woff FiraSans-Regular.woff
|
||||
|
||||
EXTRA_DIST = $(otherweb_DATA)
|
||||
@ -1,6 +1,4 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
EXTRA_DIST = dllbundler.sh icecast2logo2.bmp icecast2logo3.bmp \
|
||||
icecast2title.bmp icecast.ico icecast.nsis
|
||||
|
||||
Loading…
Reference in New Issue
Block a user