X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=80eaf095372b8bcd1663254b380e5203085bf53c;hp=da9c5dbcc928a650fe4ebe9c9b0447e070d712d9;hb=98f2c8aea52a49fad3fd6df67b1eb32c1499176c;hpb=05527588bd503e4748d801b641a9e3a6556525ad

diff --git a/configure.ac b/configure.ac
index da9c5dbc..80eaf095 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,24 +91,21 @@ http_recv dccp_recv recv_common write_common file_write audiod_command
 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"
 
@@ -121,8 +118,8 @@ audiod_errlist_objs="audiod signal string daemon stat net
 	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"
-audiod_ldflags=""
+	bitstream imdct wma_common wmadec_filter buffer_tree"
+audiod_ldflags="-lm"
 audiod_audio_formats="wma"
 
 afh_cmdline_objs="add_cmdline(afh)"
@@ -136,17 +133,18 @@ server_errlist_objs="server afh_common mp3_afh vss command net string signal
 	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)"
@@ -158,6 +156,86 @@ fade_cmdline_objs="add_cmdline(fade)"
 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"
@@ -220,9 +298,6 @@ AC_DEFUN([CHECK_SSL],
 		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,
@@ -297,10 +372,9 @@ AC_CHECK_LIB([ncurses], [initscr], [], [
 ])
 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
@@ -393,7 +467,6 @@ if test "$have_ogg" = "yes"; then
 	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
@@ -434,7 +507,6 @@ if test "$have_faad" = "yes"; then
 	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
@@ -477,16 +549,9 @@ if test "$have_mad" = "yes"; then
 	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"
@@ -514,8 +579,8 @@ have_oss="yes"
 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)"
@@ -582,21 +647,18 @@ CPPFLAGS="$OLD_CPPFLAGS"
 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
+	for i in $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
@@ -679,6 +741,8 @@ AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY,
 )
 
 
+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"
@@ -771,8 +835,6 @@ paraslash configuration:
 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