client_common recv stdout filter stdin audioc write client exec send_common ggo
udp_recv udp_send color fec fecdec_filter prebuffer_filter mm
server_command_list afs_command_list audiod_command_list bitstream imdct wma_afh
-wma_common wmadec_filter
+wma_common wmadec_filter buffer_tree
"
-all_executables="server recv filter audioc write client afh"
+executables="server recv filter audioc write client afh audiod"
recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv)"
recv_errlist_objs="http_recv recv_common recv time string net dccp_recv
- fd sched stdout ggo udp_recv fec"
+ fd sched stdout ggo udp_recv fec buffer_tree"
recv_ldflags=""
-receivers=" http dccp udp"
-senders=" http dccp udp"
-
filter_cmdline_objs="add_cmdline(filter compress_filter amp_filter prebuffer_filter)"
filter_errlist_objs="filter_common wav_filter compress_filter filter string
stdin stdout sched fd amp_filter ggo fecdec_filter fec
- prebuffer_filter time bitstream imdct wma_common wmadec_filter"
+ prebuffer_filter time bitstream imdct wma_common wmadec_filter buffer_tree"
filter_ldflags="-lm"
filters=" compress wav amp fecdec wmadec prebuffer"
time grab_client filter_common wav_filter compress_filter amp_filter http_recv dccp_recv
recv_common fd sched write_common file_write audiod_command crypt fecdec_filter
client_common ggo udp_recv color fec prebuffer_filter sha1 audiod_command_list
- bitstream imdct wma_common wmadec_filter"
+ bitstream imdct wma_common wmadec_filter buffer_tree"
audiod_ldflags="-lm"
audiod_audio_formats="wma"
blob playlist sha1 sched acl send_common udp_send color fec
server_command_list afs_command_list wma_afh wma_common"
server_ldflags="-losl"
-server_audio_formats=" mp3"
+server_audio_formats=" mp3 wma"
write_cmdline_objs="add_cmdline(write file_write)"
-write_errlist_objs="write write_common file_write time fd string sched stdin ggo"
+write_errlist_objs="write write_common file_write time fd string sched stdin
+ buffer_tree ggo"
write_ldflags=""
writers=" file"
default_writer="FILE_WRITE"
client_cmdline_objs="add_cmdline(client)"
-client_errlist_objs="client net string crypt fd sched stdin stdout
- client_common sha1"
+client_errlist_objs="client net string crypt fd sched stdin stdout time
+ client_common sha1 buffer_tree"
client_ldflags=""
gui_cmdline_objs="add_cmdline(gui)"
fade_errlist_objs="fade exec string fd"
+########################################################################### snprintf
+# ===========================================================================
+# http://www.nongnu.org/autoconf-archive/ax_func_snprintf.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_FUNC_SNPRINTF
+#
+# DESCRIPTION
+#
+# Checks for a fully C99 compliant snprintf, in particular checks whether
+# it does bounds checking and returns the correct string length; does the
+# same check for vsnprintf. If no working snprintf or vsnprintf is found,
+# it prints an error message and aborts.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Ruediger Kuhlmann <info@ruediger-kuhlmann.de>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved.
+
+AU_ALIAS([AC_FUNC_SNPRINTF], [AX_FUNC_SNPRINTF])
+AC_DEFUN([AX_FUNC_SNPRINTF],
+[AC_CHECK_FUNCS(snprintf vsnprintf)
+AC_MSG_CHECKING(for working snprintf)
+AC_CACHE_VAL(ac_cv_have_working_snprintf,
+[AC_TRY_RUN(
+[#include <stdio.h>
+
+int main(void)
+{
+ char bufs[5] = { 'x', 'x', 'x', '\0', '\0' };
+ char bufd[5] = { 'x', 'x', 'x', '\0', '\0' };
+ int i;
+ i = snprintf (bufs, 2, "%s", "111");
+ if (strcmp (bufs, "1")) exit (1);
+ if (i != 3) exit (1);
+ i = snprintf (bufd, 2, "%d", 111);
+ if (strcmp (bufd, "1")) exit (1);
+ if (i != 3) exit (1);
+ exit(0);
+}], ac_cv_have_working_snprintf=yes, ac_cv_have_working_snprintf=no, ac_cv_have_working_snprintf=cross)])
+AC_MSG_RESULT([$ac_cv_have_working_snprintf])
+AC_MSG_CHECKING(for working vsnprintf)
+AC_CACHE_VAL(ac_cv_have_working_vsnprintf,
+[AC_TRY_RUN(
+[#include <stdio.h>
+#include <stdarg.h>
+
+int my_vsnprintf (char *buf, const char *tmpl, ...)
+{
+ int i;
+ va_list args;
+ va_start (args, tmpl);
+ i = vsnprintf (buf, 2, tmpl, args);
+ va_end (args);
+ return i;
+}
+
+int main(void)
+{
+ char bufs[5] = { 'x', 'x', 'x', '\0', '\0' };
+ char bufd[5] = { 'x', 'x', 'x', '\0', '\0' };
+ int i;
+ i = my_vsnprintf (bufs, "%s", "111");
+ if (strcmp (bufs, "1")) exit (1);
+ if (i != 3) exit (1);
+ i = my_vsnprintf (bufd, "%d", 111);
+ if (strcmp (bufd, "1")) exit (1);
+ if (i != 3) exit (1);
+ exit(0);
+}], ac_cv_have_working_vsnprintf=yes, ac_cv_have_working_vsnprintf=no, ac_cv_have_working_vsnprintf=cross)])
+AC_MSG_RESULT([$ac_cv_have_working_vsnprintf])
+if test x$ac_cv_have_working_snprintf$ac_cv_have_working_vsnprintf != "xyesyes"; then
+AC_MSG_ERROR([fatal: buggy snprintf() detected])
+fi])
+AX_FUNC_SNPRINTF()
########################################################################### osl
have_osl=yes
OLD_CPPFLAGS="$CPPFLAGS"
SSL_LDFLAGS="-L$ssldir/lib";
fi
AC_SUBST(SSL_CPPFLAGS)
- AC_SUBST(SSL_CFLAGS)
- AC_SUBST(SSL_LIBS)
- AC_SUBST(SSL_LDFLAGS)
])dnl
AC_ARG_ENABLE(ssldir, [AS_HELP_STRING(--enable-ssldir=path,
])
if test "$have_ncurses" = "yes"; then
AC_SUBST(ncurses_cppflags)
- AC_SUBST(ncurses_libs)
AC_DEFINE(HAVE_NCURSES, 1, [define to 1 to turn on ncurses support])
- extras="$extras para_gui"
- all_executables="$all_executables gui"
+ extras="$extras gui"
+ executables="$executables gui"
else
AC_MSG_WARN([cannot build para_gui])
fi
audiod_ldflags="$audiod_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
afh_ldflags="$afh_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
- filter_cmdline_objs="$filter_cmdline_objs add_cmdline(oggdec_filter)"
- audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(oggdec_filter)"
-
server_errlist_objs="$server_errlist_objs ogg_afh"
filter_errlist_objs="$filter_errlist_objs oggdec_filter"
audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
audiod_audio_formats="$audiod_audio_formats ogg"
server_audio_formats="$server_audio_formats ogg"
AC_SUBST(oggvorbis_cppflags)
- AC_SUBST(oggvorbis_libs)
else
AC_MSG_WARN([no ogg vorbis support in para_server/para_filter])
fi
server_audio_formats="$server_audio_formats aac"
filters="$filters aacdec"
AC_SUBST(faad_cppflags)
- AC_SUBST(faad_libs)
else
AC_MSG_WARN([no aac support in para_audiod/para_filter])
fi
audiod_audio_formats="$audiod_audio_formats mp3"
filters="$filters mp3dec"
AC_SUBST(mad_cppflags)
- AC_SUBST(mad_libs)
else
AC_MSG_WARN([no mp3dec support in para_audiod/para_filter])
fi
-if test -n "$audiod_audio_formats"; then
- extras="$extras para_audiod"
- all_executables="$all_executables audiod"
-else
- AC_MSG_WARN([can not build para_audiod (no supported audio formats)])
-fi
CPPFLAGS="$OLD_CPPFLAGS"
LDFLAGS="$OLD_LDFLAGS"
LIBS="$OLD_LIBS"
msg="=> will not build para_fade/oss writer"
AC_CHECK_HEADER(sys/soundcard.h, [
- extras="$extras para_fade"
- all_executables="$all_executables fade"
+ extras="$extras fade"
+ executables="$executables fade"
all_errlist_objs="$all_errlist_objs oss_write"
audiod_errlist_objs="$audiod_errlist_objs oss_write"
audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(oss_write)"
LDFLAGS="$OLD_LDFLAGS"
LIBS="$OLD_LIBS"
-AC_SUBST(extra_binaries, [$extras])
-AC_SUBST(extra_filter_objs, [$extra_filter_objs])
-AC_SUBST(extra_filter_libs, [$extra_filter_libs])
AC_SUBST(install_sh, [$INSTALL])
AC_CONFIG_FILES([Makefile])
AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)])
+AC_DEFUN([add_para],[$(for i in $@; do printf "para_$i "; done)])
AC_DEFUN([objlist_to_errlist],[$(for i in $@; do printf "DEFINE_ERRLIST($(echo $i| tr 'a-z' 'A-Z'));"; done) [const char **para_errlist[[]]] = {$(for i in $@; do printf "PARA_ERRLIST($(echo $i | tr 'a-z' 'A-Z')), "; done) }])
-
############################################################# error2.h
-AC_DEFUN([define_safe_error_enums],
-[
- exe=""
- for i in $all_executables; do
-# eval echo checking if $1 is linked into $i
- for j in $(eval echo \$${i}_errlist_objs); do
- if test $j = $1; then
- exe="$exe $i"
- break;
- fi
- done
- done
- #echo "$1 gets linked into $exe"
- safe_errlists=""
- for i in $all_errlist_objs; do
- for j in $exe; do
- found=0
- for k in $(eval echo \$${j}_errlist_objs); do
- if test $k = $i; then
- found=1
- break;
- fi
- done
- if test $found -eq 0; then
- break;
- fi
- done
- if test $found -eq 1; then
- safe_errlists="$safe_errlists $i"
- fi
- done
- #echo "safe errlists for $1: $safe_errlists"
- ss_defs=""
- for i in $safe_errlists; do
- echo "SS_ENUM($(echo $i | tr 'a-z' 'A-Z'));"
- done
-]
-)
-
-
AC_MSG_NOTICE(creating error2.h)
+for i in $executables; do
+ echo "$i: "
+ eval echo \$${i}_errlist_objs
+done | ./error2.pl > error2.h
for obj in $all_errlist_objs; do
SS="$SS SS_$(echo $obj | tr 'a-z' 'A-Z'),"
- echo "#ifdef MAIN_INPUT_FILE_IS_$obj"
- define_safe_error_enums($obj)
- echo "#endif"
-done > error2.h
+done
AC_DEFINE_UNQUOTED(DEFINE_ERRLIST_OBJECT_ENUM,
[enum {$SS NUM_SS}],
[list of all objects that use paraslash's error facility]
)
+AC_SUBST(executables, add_para($executables))
+
recv_objs="$recv_cmdline_objs $recv_errlist_objs"
filter_objs="$filter_cmdline_objs $filter_errlist_objs"
audiod_objs="$audiod_cmdline_objs $audiod_errlist_objs"
unix socket credentials: $have_ucred
audio formats supported by para_server/para_afh: $server_audio_formats
id3 version2 support: $have_libid3tag
-senders supported by para_server: $senders
-receivers supported by para_audiod/para_recv: $receivers
filters supported by para_audiod/para_filter: $filters
writers supported by para_audiod/para_write: $writers
optional executables: $extras
projects / paraslash.git / blobdiff