AC_PREREQ([2.61])
-
-AC_INIT([paraslash],[git],[maan@systemlinux.org])
+AC_INIT([paraslash],[0.5.0],[maan@systemlinux.org])
AC_CONFIG_HEADER([config.h])
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) }])
AC_PATH_PROG(UNAMEPATH, uname, no)
if test "$UNAMEPATH" = "no"; then
filters=" compress wav amp fecdec wmadec prebuffer"
audioc_cmdline_objs="add_cmdline(audioc)"
-audioc_errlist_objs="audioc string net fd version"
+audioc_errlist_objs="
+ audioc
+ string
+ net
+ fd
+ version
+ ggo
+"
audioc_ldflags=""
audiod_cmdline_objs="add_cmdline(audiod compress_filter http_recv dccp_recv file_write client amp_filter udp_recv prebuffer_filter)"
default_writer="FILE_WRITE"
client_cmdline_objs="add_cmdline(client)"
-client_errlist_objs="client net string fd sched stdin stdout time sideband
- client_common buffer_tree crypt_common version"
+client_errlist_objs="
+ client
+ net
+ string
+ fd
+ sched
+ stdin
+ stdout
+ time
+ sideband
+ client_common
+ buffer_tree
+ crypt_common
+ version
+ ggo
+"
client_ldflags=""
gui_cmdline_objs="add_cmdline(gui)"
-gui_errlist_objs="exec signal string stat ringbuffer fd gui gui_theme version time"
+gui_errlist_objs="
+ exec
+ signal
+ string
+ stat
+ ringbuffer
+ fd
+ gui
+ gui_theme
+ time
+ version
+ ggo
+"
gui_objs="$gui_cmdline_objs $gui_errlist_objs"
play_errlist_objs="play fd sched ggo buffer_tree time string net
afh_recv afh_common
extras="$extras server"
executables="$executables server"
server_cmdline_objs="add_cmdline(server)"
- server_errlist_objs="server afh_common mp3_afh vss command net
- string signal time daemon http_send close_on_fork mm
- crypt_common ipc dccp_send fd user_list chunk_queue
- afs aft mood score attribute blob playlist sched acl
- send_common udp_send color fec wma_afh wma_common sideband
- version"
+ server_errlist_objs="
+ server
+ afh_common
+ mp3_afh
+ vss command
+ net
+ string
+ signal
+ time
+ daemon
+ http_send
+ close_on_fork
+ mm
+ crypt_common
+ ipc dccp_send
+ fd
+ user_list
+ chunk_queue
+ afs
+ aft
+ mood
+ score
+ attribute
+ blob
+ playlist
+ sched
+ acl
+ send_common
+ udp_send
+ color
+ fec
+ wma_afh
+ wma_common
+ sideband
+ version
+ ggo
+ "
all_errlist_objs="$all_errlist_objs server vss command
http_send close_on_fork mm ipc dccp_send user_list
chunk_queue afs aft mood score attribute blob playlist
default_writer="OSX_WRITE"
AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)
fi
-########################################################### ogg/vorbis/speex
+####################################################### ogg/vorbis/speex/opus
have_ogg="yes"
OLD_CPPFLAGS="$CPPFLAGS"
OLD_LD_FLAGS="$LDFLAGS"
[look for speex headers also in dir])])
AC_ARG_WITH(speex_libs, [AS_HELP_STRING(--with-speex-libs=dir,
[look for speex libs also in dir])])
+AC_ARG_WITH(opus_headers, [AS_HELP_STRING(--with-opus-headers=dir,
+ [look for opus headers also in dir])])
+AC_ARG_WITH(opus_libs, [AS_HELP_STRING(--with-opus-libs=dir,
+ [look for opus libs also in dir])])
if test -n "$with_ogg_headers"; then
ogg_cppflags="-I$with_ogg_headers"
have_vorbis="yes"
have_speex="yes"
+have_opus="yes"
if test "$have_ogg" = "yes"; then
# vorbis
if test -n "$with_vorbis_headers"; then
fi
AC_CHECK_LIB([speex], [speex_decoder_init], [], [ have_speex="no" ])
AC_CHECK_HEADERS([speex/speex.h], [], [ have_speex="no" ])
+
+ # opus
+ if test -n "$with_opus_headers"; then
+ opus_cppflags="-I$with_opus_headers"
+ CPPFLAGS="$CPPFLAGS $opus_cppflags"
+ fi
+ if test -n "$with_opus_libs"; then
+ speex_libs="-L$with_opus_libs"
+ LDFLAGS="$LDFLAGS $opus_libs"
+ fi
+ AC_CHECK_LIB([opus], [opus_multistream_decode], [], [ have_opus="no" ])
+ AC_CHECK_HEADERS([opus/opus.h], [], [ have_opus="no" ])
else
- AC_MSG_WARN([vorbis/speex depend on libogg, which was not detected])
+ AC_MSG_WARN([vorbis/speex/opus depend on libogg, which was not detected])
have_vorbis="no"
have_speex="no"
+ have_opus="no"
fi
msg="support in para_server/para_filter/para_afh"
-if test "$have_vorbis" = "yes" || test "$have_speex" = "yes"; then
+if test "$have_vorbis" = "yes" || \
+ test "$have_speex" = "yes" || \
+ test "$have_opus" = "yes"; then
AC_SUBST(ogg_cppflags)
ogg_libs="$ogg_libs -logg"
if test "$OSTYPE" = "Darwin"; then
else
AC_MSG_WARN([no ogg/speex $msg])
fi
+if test "$have_opus" = "yes"; then
+ all_errlist_objs="$all_errlist_objs opusdec_filter opus_afh opus_common"
+ AC_DEFINE(HAVE_OPUS, 1, define to 1 to turn on ogg/opus support)
+ filters="$filters opusdec"
+ opus_libs="-lopus"
+ server_ldflags="$server_ldflags $opus_libs"
+ filter_ldflags="$filter_ldflags $opus_libs"
+ audiod_ldflags="$audiod_ldflags $opus_libs"
+ afh_ldflags="$afh_ldflags $opus_libs"
+ play_ldflags="$play_ldflags $opus_libs"
+ recv_ldflags="$recv_ldflags $opus_libs"
+
+ server_errlist_objs="$server_errlist_objs opus_afh opus_common"
+ filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common"
+ audiod_errlist_objs="$audiod_errlist_objs opusdec_filter opus_common"
+ afh_errlist_objs="$afh_errlist_objs opus_afh opus_common"
+ play_errlist_objs="$play_errlist_objs opusdec_filter opus_afh opus_common"
+ recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
+
+ audiod_audio_formats="$audiod_audio_formats opus"
+ server_audio_formats="$server_audio_formats opus"
+else
+ AC_MSG_WARN([no ogg/opus $msg])
+fi
CPPFLAGS="$OLD_CPPFLAGS"
LDFLAGS="$OLD_LDFLAGS"
LIBS="$OLD_LIBS"
write_errlist_objs="$write_errlist_objs oss_write"
write_cmdline_objs="$write_cmdline_objs add_cmdline(oss_write)"
- fade_errlist_objs="$fade_errlist_objs oss_mix version"
+ fade_errlist_objs="$fade_errlist_objs oss_mix"
all_errlist_objs="$all_errlist_objs oss_write oss_mix"
writers="$writers oss"
extras="$extras fade"
executables="$executables fade"
all_errlist_objs="$all_errlist_objs fade"
- fade_errlist_objs="$fade_errlist_objs fade exec string fd"
+ fade_errlist_objs="$fade_errlist_objs fade exec string fd version ggo"
fade_cmdline_objs="add_cmdline(fade)"
fade_objs="$fade_cmdline_objs $fade_errlist_objs"
AC_SUBST(fade_objs, add_dot_o($fade_objs))
AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers",
[formats supported by para_server and para_afh])
-AC_SUBST(executables, add_para($executables))
+AC_SUBST(executables)
recv_objs="$recv_cmdline_objs $recv_errlist_objs"
filter_objs="$filter_cmdline_objs $filter_errlist_objs"
projects / paraslash.git / blobdiff