X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=2df7339658518f5bc3b732b9b640bbc5d2fe84b3;hp=89242d969bbab440a8ac085262b3de45ea3d3392;hb=618a25011420f434f05305a4053a49824d39b4a2;hpb=ef1f130a1f9ac61a51da10ee56c5bd9ef1b52366 diff --git a/configure.ac b/configure.ac index 89242d96..2df73396 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,17 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.60) +AC_PREREQ([2.61]) -AC_INIT(paraslash, [git], maan@systemlinux.org) +AC_INIT([paraslash],[git],[maan@systemlinux.org]) AC_CONFIG_HEADER([config.h]) +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) }]) AC_PATH_PROG(UNAMEPATH, uname, no) if test "$UNAMEPATH" = "no"; then AC_MSG_ERROR(unable to determine system type) @@ -74,7 +79,6 @@ AC_FUNC_MKTIME AC_FUNC_MMAP AC_FUNC_REALLOC AC_FUNC_SELECT_ARGTYPES -AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_STRFTIME AC_FUNC_VPRINTF @@ -87,28 +91,28 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \ strncasecmp strrchr strspn alarm mkdir inet_ntoa socket], [], [AC_MSG_ERROR([function not found, cannot live without it])]) -cmdline_dir="cmdline" -AC_SUBST(cmdline_dir) AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${i}.cmdline "; done)]) -all_errlist_objs="server mp3_afh afh_common vss command net string signal time -daemon stat http_send close_on_fork ipc acl afh fade amp_filter -dccp_send fd user_list chunk_queue afs aft mood score attribute blob ringbuffer -playlist sched audiod grab_client filter_common wav_filter compress_filter -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 buffer_tree crypt_common -" - +all_errlist_objs="mp3_afh afh_common net string signal time daemon + stat afh amp_filter fd ringbuffer sched audiod + grab_client filter_common wav_filter compress_filter 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 color fec fecdec_filter + prebuffer_filter bitstream imdct + wma_afh wma_common wmadec_filter buffer_tree crypt_common + gui gui_theme sideband afh_recv" executables="recv filter audioc write client afh audiod" -recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv)" +recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv afh_recv)" + +recv_errlist_objs=" + http_recv recv_common recv time string net dccp_recv fd + sched stdout ggo udp_recv buffer_tree afh_recv afh_common + wma_afh wma_common mp3_afh +" -recv_errlist_objs="http_recv recv_common recv time string net dccp_recv - fd sched stdout ggo udp_recv fec buffer_tree" recv_ldflags="" filter_cmdline_objs="add_cmdline(filter compress_filter amp_filter prebuffer_filter)" @@ -123,10 +127,10 @@ audioc_errlist_objs="audioc string net fd" audioc_ldflags="" audiod_cmdline_objs="add_cmdline(audiod compress_filter http_recv dccp_recv file_write client amp_filter udp_recv prebuffer_filter)" -audiod_errlist_objs="audiod signal string daemon stat net crypt_common +audiod_errlist_objs="audiod signal string daemon stat net crypt_common sideband 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 fecdec_filter - client_common ggo udp_recv color fec prebuffer_filter audiod_command_list + client_common ggo udp_recv color fec prebuffer_filter bitstream imdct wma_common wmadec_filter buffer_tree" audiod_ldflags="-lm" audiod_audio_formats="wma" @@ -135,15 +139,6 @@ afh_cmdline_objs="add_cmdline(afh)" afh_errlist_objs="afh string fd mp3_afh afh_common time wma_afh wma_common" afh_ldflags="" -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 - server_command_list afs_command_list wma_afh wma_common" -server_ldflags="" -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 buffer_tree ggo" @@ -152,19 +147,13 @@ writers=" file" default_writer="FILE_WRITE" client_cmdline_objs="add_cmdline(client)" -client_errlist_objs="client net string fd sched stdin stdout time +client_errlist_objs="client net string fd sched stdin stdout time sideband client_common buffer_tree crypt_common" client_ldflags="" gui_cmdline_objs="add_cmdline(gui)" -gui_errlist_objs="exec signal string stat ringbuffer fd" -gui_other_objs="gui gui_theme" -gui_objs="$gui_cmdline_objs $gui_errlist_objs $gui_other_objs" - -fade_cmdline_objs="add_cmdline(fade)" -fade_errlist_objs="fade exec string fd" - - +gui_errlist_objs="exec signal string stat ringbuffer fd gui gui_theme" +gui_objs="$gui_cmdline_objs $gui_errlist_objs" ########################################################################### snprintf # =========================================================================== # http://www.nongnu.org/autoconf-archive/ax_func_snprintf.html @@ -194,8 +183,8 @@ 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 +[AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include int main(void) { @@ -209,12 +198,12 @@ int main(void) 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_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 +[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include #include int my_vsnprintf (char *buf, const char *tmpl, ...) @@ -239,7 +228,8 @@ int main(void) 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_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]) @@ -250,13 +240,13 @@ have_osl=yes OLD_CPPFLAGS="$CPPFLAGS" OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" -AC_ARG_WITH(osl_headers, [AC_HELP_STRING(--with-osl-headers=dir, +AC_ARG_WITH(osl_headers, [AS_HELP_STRING(--with-osl-headers=dir, [look for osl.h also in dir])]) if test -n "$with_osl_headers"; then osl_cppflags="-I$with_osl_headers" CPPFLAGS="$CPPFLAGS $osl_cppflags" fi -AC_ARG_WITH(osl_libs, [AC_HELP_STRING(--with-osl-libs=dir, +AC_ARG_WITH(osl_libs, [AS_HELP_STRING(--with-osl-libs=dir, [look for libosl also in dir])]) if test -n "$with_osl_libs"; then osl_libs="-L$with_osl_libs" @@ -275,6 +265,19 @@ or execute else 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" + 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 + acl udp_send" + + server_ldflags="" + server_audio_formats="mp3 wma" AC_SUBST(osl_cppflags) server_ldflags="$server_ldflags $osl_libs -losl" fi @@ -301,13 +304,13 @@ if test "$check_openssl" = "yes"; then OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_openssl="yes" - AC_ARG_WITH(openssl_headers, [AC_HELP_STRING(--with-openssl-headers=dir, + AC_ARG_WITH(openssl_headers, [AS_HELP_STRING(--with-openssl-headers=dir, [look for openssl headers also in dir])]) if test -n "$with_openssl_headers"; then openssl_cppflags="-I$with_openssl_headers" CPPFLAGS="$CPPFLAGS $openssl_cppflags" fi - AC_ARG_WITH(openssl_libs, [AC_HELP_STRING(--with-openssl-libs=dir, + AC_ARG_WITH(openssl_libs, [AS_HELP_STRING(--with-openssl-libs=dir, [look for openssl libraries also in dir])]) if test -n "$with_openssl_libs"; then openssl_libs="-L$with_openssl_libs" @@ -358,13 +361,13 @@ if test "$check_gcrypt" = "yes"; then OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_gcrypt="yes" - AC_ARG_WITH(gcrypt_headers, [AC_HELP_STRING(--with-gcrypt-headers=dir, + AC_ARG_WITH(gcrypt_headers, [AS_HELP_STRING(--with-gcrypt-headers=dir, [look for gcrypt headers also in dir])]) if test -n "$with_gcrypt_headers"; then gcrypt_cppflags="-I$with_gcrypt_headers" CPPFLAGS="$CPPFLAGS $gcrypt_cppflags" fi - AC_ARG_WITH(gcrypt_libs, [AC_HELP_STRING(--with-gcrypt-libs=dir, + AC_ARG_WITH(gcrypt_libs, [AS_HELP_STRING(--with-gcrypt-libs=dir, [look for libgcrypt also in dir])]) if test -n "$with_gcrypt_libs"; then gcrypt_libs="-L$with_gcrypt_libs" @@ -424,13 +427,13 @@ AC_SEARCH_LIBS([inet_ntoa],[nsl],[],[ ],[]) ########################################################################### ucred AC_MSG_CHECKING(for struct ucred) -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #define _GNU_SOURCE #include #include -],[ +]], [[ struct ucred sucred; sucred.pid=0; -],[have_ucred=yes],[have_ucred=no]) +]])],[have_ucred=yes],[have_ucred=no]) AC_MSG_RESULT($have_ucred) if test ${have_ucred} = yes; then AC_DEFINE(HAVE_UCRED, 1, define to 1 you have struct ucred) @@ -441,13 +444,13 @@ have_curses="yes" OLD_CPPFLAGS="$CPPFLAGS" OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" -AC_ARG_WITH(curses_headers, [AC_HELP_STRING(--with-curses-headers=dir, +AC_ARG_WITH(curses_headers, [AS_HELP_STRING(--with-curses-headers=dir, [look for curses.h also in dir])]) if test -n "$with_curses_headers"; then curses_cppflags="-I$with_curses_headers" CPPFLAGS="$CPPFLAGS $curses_cppflags" fi -AC_ARG_WITH(curses_libs, [AC_HELP_STRING(--with-curses-libs=dir, +AC_ARG_WITH(curses_libs, [AS_HELP_STRING(--with-curses-libs=dir, [look for libcurses also in dir])]) if test -n "$with_curses_libs"; then curses_libs="-L$with_curses_libs" @@ -473,13 +476,13 @@ LIBS="$OLD_LIBS" ########################################################################### ip_mreqn AC_MSG_CHECKING(for struct ip_mreqn (UDPv4 multicast)) -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include -],[ +]], [[ struct ip_mreqn mn; mn.imr_ifindex = 0; -],[have_ip_mreqn=yes],[have_ip_mreqn=no]) +]])],[have_ip_mreqn=yes],[have_ip_mreqn=no]) AC_MSG_RESULT($have_ip_mreqn) if test ${have_ip_mreqn} = yes; then AC_DEFINE(HAVE_IP_MREQN, 1, define to 1 you have struct ip_mreqn) @@ -487,11 +490,11 @@ fi ########################################################################### osx AC_MSG_CHECKING(for CoreAudio (MacOs)) -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include -],[ +]], [[ AudioDeviceID id; -],[have_core_audio=yes],[have_core_audio=no]) +]])],[have_core_audio=yes],[have_core_audio=no]) AC_MSG_RESULT($have_core_audio) if test ${have_core_audio} = yes; then f1="-framework CoreAudio" @@ -501,6 +504,12 @@ if test ${have_core_audio} = yes; then f="$f1 $f2 $f3 $f4" all_errlist_objs="$all_errlist_objs osx_write" + # ipc is linked into para_server server and into the osx writer. If osl + # was not found, para_server will not be built and ipc has not yet been + # added to the list of all objects, so we must add it here. + if test "$have_osl" = "no"; then + all_errlist_objs="$all_errlist_objs ipc" + fi audiod_errlist_objs="$audiod_errlist_objs osx_write ipc" audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline" audiod_ldflags="$audiod_ldflags $f" @@ -517,17 +526,17 @@ have_ogg="yes" OLD_CPPFLAGS="$CPPFLAGS" OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" -AC_ARG_WITH(ogg_headers, [AC_HELP_STRING(--with-ogg-headers=dir, +AC_ARG_WITH(ogg_headers, [AS_HELP_STRING(--with-ogg-headers=dir, [look for ogg headers also in dir])]) -AC_ARG_WITH(ogg_libs, [AC_HELP_STRING(--with-ogg-libs=dir, +AC_ARG_WITH(ogg_libs, [AS_HELP_STRING(--with-ogg-libs=dir, [look for ogg libs also in dir])]) -AC_ARG_WITH(vorbis_headers, [AC_HELP_STRING(--with-vorbis-headers=dir, +AC_ARG_WITH(vorbis_headers, [AS_HELP_STRING(--with-vorbis-headers=dir, [look for vorbis headers also in dir])]) -AC_ARG_WITH(vorbis_libs, [AC_HELP_STRING(--with-vorbis-libs=dir, +AC_ARG_WITH(vorbis_libs, [AS_HELP_STRING(--with-vorbis-libs=dir, [look for vorbis libs also in dir])]) -AC_ARG_WITH(speex_headers, [AC_HELP_STRING(--with-speex-headers=dir, +AC_ARG_WITH(speex_headers, [AS_HELP_STRING(--with-speex-headers=dir, [look for speex headers also in dir])]) -AC_ARG_WITH(speex_libs, [AC_HELP_STRING(--with-speex-libs=dir, +AC_ARG_WITH(speex_libs, [AS_HELP_STRING(--with-speex-libs=dir, [look for speex libs also in dir])]) if test -n "$with_ogg_headers"; then @@ -568,6 +577,7 @@ if test "$have_ogg" = "yes"; then AC_CHECK_LIB([speex], [speex_decoder_init], [], [ have_speex="no" ]) AC_CHECK_HEADERS([speex/speex.h], [], [ have_speex="no" ]) else + AC_MSG_WARN([vorbis/speex depend on libogg, which was not detected]) have_vorbis="no" have_speex="no" fi @@ -583,11 +593,11 @@ if test "$have_vorbis" = "yes" || test "$have_speex" = "yes"; then filter_ldflags="$filter_ldflags $ogg_libs" audiod_ldflags="$audiod_ldflags $ogg_libs" afh_ldflags="$afh_ldflags $ogg_libs" + recv_ldflags="$recv_ldflags $ogg_libs" all_errlist_objs="$all_errlist_objs ogg_afh_common" afh_errlist_objs="$afh_errlist_objs ogg_afh_common" + recv_errlist_objs="$recv_errlist_objs ogg_afh_common" server_errlist_objs="$server_errlist_objs ogg_afh_common" -else - AC_MSG_WARN([vorbis/speex require ogg]) fi if test "$have_vorbis" = "yes"; then all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh" @@ -598,11 +608,13 @@ if test "$have_vorbis" = "yes"; then filter_ldflags="$filter_ldflags $vorbis_libs" audiod_ldflags="$audiod_ldflags $vorbis_libs" afh_ldflags="$afh_ldflags $vorbis_libs" + recv_ldflags="$recv_ldflags $vorbis_libs" server_errlist_objs="$server_errlist_objs ogg_afh" filter_errlist_objs="$filter_errlist_objs oggdec_filter" audiod_errlist_objs="$audiod_errlist_objs oggdec_filter" afh_errlist_objs="$afh_errlist_objs ogg_afh" + recv_errlist_objs="$recv_errlist_objs ogg_afh" audiod_audio_formats="$audiod_audio_formats ogg" server_audio_formats="$server_audio_formats ogg" @@ -618,11 +630,13 @@ if test "$have_speex" = "yes"; then filter_ldflags="$filter_ldflags $speex_libs" audiod_ldflags="$audiod_ldflags $speex_libs" afh_ldflags="$afh_ldflags $speex_libs" + recv_ldflags="$recv_ldflags $speex_libs" server_errlist_objs="$server_errlist_objs spx_afh spx_common" filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common" audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common" afh_errlist_objs="$afh_errlist_objs spx_afh spx_common" + recv_errlist_objs="$recv_errlist_objs spx_afh spx_common" audiod_audio_formats="$audiod_audio_formats spx" server_audio_formats="$server_audio_formats spx" @@ -637,13 +651,13 @@ have_faad=yes OLD_CPPFLAGS="$CPPFLAGS" OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" -AC_ARG_WITH(faad_headers, [AC_HELP_STRING(--with-faad-headers=dir, +AC_ARG_WITH(faad_headers, [AS_HELP_STRING(--with-faad-headers=dir, [look for neaacdec.h also in dir])]) if test -n "$with_faad_headers"; then faad_cppflags="-I$with_faad_headers" CPPFLAGS="$CPPFLAGS $faad_cppflags" fi -AC_ARG_WITH(faad_libs, [AC_HELP_STRING(--with-faad-libs=dir, +AC_ARG_WITH(faad_libs, [AS_HELP_STRING(--with-faad-libs=dir, [look for libfaad also in dir])]) if test -n "$with_faad_libs"; then faad_libs="-L$with_faad_libs" @@ -658,10 +672,14 @@ if test "$have_faad" = "yes"; then afh_errlist_objs="$afh_errlist_objs aac_common aac_afh" audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common" server_errlist_objs="$server_errlist_objs aac_afh aac_common" + recv_errlist_objs="$recv_errlist_objs aac_afh aac_common" + server_ldflags="$server_ldflags $faad_libs -lfaad" filter_ldflags="$filter_ldflags $faad_libs -lfaad" audiod_ldflags="$audiod_ldflags $faad_libs -lfaad" afh_ldflags="$afh_ldflags $faad_libs -lfaad" + recv_ldflags="$afh_ldflags $faad_libs -lfaad" + audiod_audio_formats="$audiod_audio_formats aac" server_audio_formats="$server_audio_formats aac" filters="$filters aacdec" @@ -678,13 +696,13 @@ OLD_CPPFLAGS="$CPPFLAGS" OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" -AC_ARG_WITH(mad_headers, [AC_HELP_STRING(--with-mad-headers=dir, +AC_ARG_WITH(mad_headers, [AS_HELP_STRING(--with-mad-headers=dir, [look for mad.h also in dir])]) if test -n "$with_mad_headers"; then mad_cppflags="-I$with_mad_headers" CPPFLAGS="$CPPFLAGS $mad_cppflags" fi -AC_ARG_WITH(mad_libs, [AC_HELP_STRING(--with-mad-libs=dir, +AC_ARG_WITH(mad_libs, [AS_HELP_STRING(--with-mad-libs=dir, [look for libmad also in dir])]) if test -n "$with_mad_libs"; then mad_libs="-L$with_mad_libs" @@ -715,40 +733,64 @@ CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" ###################################################################### libid3tag +OLD_CPPFLAGS="$CPPFLAGS" +OLD_LD_FLAGS="$LDFLAGS" +OLD_LIBS="$LIBS" + +have_libid3tag="yes" +AC_ARG_WITH(id3tag_headers, [AS_HELP_STRING(--with-id3tag-headers=dir, + [look for id3tag header files also in dir])]) +if test -n "$with_id3tag_headers"; then + id3tag_cppflags="-I$with_id3tag_headers" + CPPFLAGS="$CPPFLAGS $id3tag_cppflags" +fi +AC_ARG_WITH(id3tag_libs, [AS_HELP_STRING(--with-id3tag-libs=dir, + [look for id3tag libs also in dir])]) +if test -n "$with_id3tag_libs"; then + id3tag_libs="-L$with_id3tag_libs" + LDFLAGS="$LDFLAGS $id3tag_libs" +fi + AC_MSG_CHECKING(for libid3tag) -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include -],[ +]], [[ struct id3_tag t = {.flags = 0}; -],[have_libid3tag=yes],[have_libid3tag=no]) +]])],[],[have_libid3tag=no]) AC_MSG_RESULT($have_libid3tag) + if test ${have_libid3tag} = yes; then AC_DEFINE(HAVE_LIBID3TAG, 1, define to 1 you have libid3tag) - server_ldflags="$server_ldflags -lid3tag" - afh_ldflags="$afh_ldflags -lid3tag" + server_ldflags="$server_ldflags $id3tag_libs -lid3tag -lz" + afh_ldflags="$afh_ldflags $id3tag_libs -lid3tag -lz" + recv_ldflags="$recv_ldflags $id3tag_libs -lid3tag" + AC_SUBST(id3tag_cppflags) else AC_MSG_WARN([no support for id3v2 tags]) fi +CPPFLAGS="$OLD_CPPFLAGS" +LDFLAGS="$OLD_LDFLAGS" +LIBS="$OLD_LIBS" ########################################################################### flac OLD_CPPFLAGS="$CPPFLAGS" OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_flac="yes" -AC_ARG_WITH(flac_headers, [AC_HELP_STRING(--with-flac-headers=dir, +AC_ARG_WITH(flac_headers, [AS_HELP_STRING(--with-flac-headers=dir, [look for flac headers also in dir])]) if test -n "$with_flac_headers"; then flac_cppflags="-I$with_flac_headers" CPPFLAGS="$CPPFLAGS $flac_cppflags" fi -AC_ARG_WITH(flac_libs, [AC_HELP_STRING(--with-flac-libs=dir, +AC_ARG_WITH(flac_libs, [AS_HELP_STRING(--with-flac-libs=dir, [look for flac libs also in dir])]) if test -n "$with_flac_libs"; then flac_libs="-L$with_flac_libs" LDFLAGS="$LDFLAGS $flac_libs" fi AC_CHECK_HEADER(FLAC/stream_decoder.h, [], have_flac=no) -AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], have_flac=no) +AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], have_flac=no, -logg -lm) if test "$have_flac" = "yes"; then AC_DEFINE(HAVE_FLAC, 1, define to 1 if you want to build the flacdec filter) all_errlist_objs="$all_errlist_objs flacdec_filter flac_afh" @@ -756,16 +798,18 @@ if test "$have_flac" = "yes"; then audiod_errlist_objs="$audiod_errlist_objs flacdec_filter" afh_errlist_objs="$afh_errlist_objs flac_afh" server_errlist_objs="$server_errlist_objs flac_afh" + recv_errlist_objs="$recv_errlist_objs flac_afh" filter_ldflags="$filter_ldflags $flac_libs -lFLAC" audiod_ldflags="$audiod_ldflags $flac_libs -lFLAC" server_ldflags="$server_ldflags $flac_libs -lFLAC" afh_ldflags="$afh_ldflags $flac_libs -lFLAC" + recv_ldflags="$afh_ldflags $flac_libs -lFLAC" filters="$filters flacdec" server_audio_formats="$server_audio_formats flac" audiod_audio_formats="$audiod_audio_formats flac" AC_SUBST(flac_cppflags) else - AC_MSG_WARN([no flac support in para_audiod/para_filter]) + AC_MSG_WARN([no flac support in para_audiod/para_filter/para_afh/para_server]) fi CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" @@ -776,23 +820,25 @@ OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_oss="yes" -msg="=> will not build para_fade/oss writer" +msg="=> will not build oss writer" AC_CHECK_HEADER(sys/soundcard.h, [ - 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)" - 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" + all_errlist_objs="$all_errlist_objs oss_write oss_mix" + writers="$writers oss" default_writer="OSS_WRITE" + mixers="${mixers}oss " + default_mixer="OSS_MIX" + AC_CHECK_LIB(ossaudio, _oss_ioctl, [ audiod_ldflags="$audiod_ldflags -lossaudio" write_ldflags="$write_ldflags -lossaudio" - fade_ldflags="$write_ldflags -lossaudio" + fade_ldflags="$fade_ldflags -lossaudio" ] ) ], @@ -831,34 +877,76 @@ if test "$have_alsa" = "yes"; then fi if test "$have_alsa" = "yes"; then - all_errlist_objs="$all_errlist_objs alsa_write" audiod_errlist_objs="$audiod_errlist_objs alsa_write" audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(alsa_write)" audiod_ldflags="$audiod_ldflags -lasound" - write_errlist_objs="$write_errlist_objs alsa_write" write_cmdline_objs="$write_cmdline_objs add_cmdline(alsa_write)" write_ldflags="$write_ldflags -lasound" + fade_errlist_objs="$fade_errlist_objs alsa_mix" + fade_ldflags="$fade_ldflags -lasound" + all_errlist_objs="$all_errlist_objs alsa_write alsa_mix" + writers="$writers alsa" default_writer="ALSA_WRITE" + mixers="${mixers}alsa " + default_mixer="ALSA_MIX" fi CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" +########################################################################### fade +if test -n "$mixers"; then + extras="$extras fade" + executables="$executables fade" + all_errlist_objs="$all_errlist_objs fade" + fade_errlist_objs="$fade_errlist_objs fade exec string fd" + fade_cmdline_objs="add_cmdline(fade)" + fade_objs="$fade_cmdline_objs $fade_errlist_objs" + AC_SUBST(fade_objs, add_dot_o($fade_objs)) + AC_SUBST(fade_ldflags, $fade_ldflags) + AC_DEFINE_UNQUOTED(INIT_FADE_ERRLISTS, + objlist_to_errlist($fade_errlist_objs), + errors used by para_fade) + enum="$( + for i in $mixers; do + printf "${i}_MIX, " | tr '[a-z]' '[A-Z]' + done + )" + AC_DEFINE_UNQUOTED(MIXER_ENUM, $enum NUM_SUPPORTED_MIXERS, + enum of supported mixers) + AC_DEFINE_UNQUOTED(DEFAULT_MIXER, $default_mixer, + use this mixer if none was specified) + names="$(for i in $mixers; do printf \"$i\",' ' ; done)" + AC_DEFINE_UNQUOTED(MIXER_NAMES, $names, supported mixer names) + inits="$( + for i in $mixers; do + printf 'extern void '$i'_mix_init(struct mixer *); ' + done + )" + AC_DEFINE_UNQUOTED(DECLARE_MIXER_INITS, $inits, + init functions of the supported mixers) + array="$(for i in $mixers; do printf '{.init = '$i'_mix_init},'; done)" + AC_DEFINE_UNQUOTED(MIXER_ARRAY, $array, array of supported mixers) + mixer_summary="supported mixers:: $mixers, default: $default_mixer" +else + AC_MSG_WARN([no mixer support]) + mixer_summary="para_fade: no" +fi ########################################################################### libao OLD_CPPFLAGS="$CPPFLAGS" OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_ao="yes" -AC_ARG_WITH(ao_headers, [AC_HELP_STRING(--with-ao-headers=dir, +AC_ARG_WITH(ao_headers, [AS_HELP_STRING(--with-ao-headers=dir, [look for ao/ao.h also in dir])]) if test -n "$with_ao_headers"; then ao_cppflags="-I$with_ao_headers" CPPFLAGS="$CPPFLAGS $ao_cppflags" fi -AC_ARG_WITH(ao_libs, [AC_HELP_STRING(--with-ao-libs=dir, +AC_ARG_WITH(ao_libs, [AS_HELP_STRING(--with-ao-libs=dir, [look for libao also in dir])]) if test -n "$with_ao_libs"; then ao_libs="-L$with_ao_libs" @@ -911,14 +999,14 @@ OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_readline="yes" -AC_ARG_WITH(readline_headers, [AC_HELP_STRING(--with-readline-headers=dir, +AC_ARG_WITH(readline_headers, [AS_HELP_STRING(--with-readline-headers=dir, [look for libreadline header files also in dir])]) if test -n "$with_readline_headers"; then readline_cppflags="-I$with_readline_headers" CPPFLAGS="$CPPFLAGS $readline_cppflags" fi -AC_ARG_WITH(readline_libs, [AC_HELP_STRING(--with-readline-libs=dir, +AC_ARG_WITH(readline_libs, [AS_HELP_STRING(--with-readline-libs=dir, [look for readline library also in dir])]) if test -n "$with_readline_libs"; then readline_libs="-L$with_readline_libs" @@ -967,16 +1055,6 @@ fi CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_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_MSG_NOTICE(creating error2.h) for i in $executables; do @@ -1028,7 +1106,6 @@ write_objs="$write_cmdline_objs $write_errlist_objs" client_objs="$client_cmdline_objs $client_errlist_objs" audioc_objs="$audioc_cmdline_objs $audioc_errlist_objs" afh_objs="$afh_cmdline_objs $afh_errlist_objs" -fade_objs="$fade_cmdline_objs $fade_errlist_objs" AC_SUBST(recv_objs, add_dot_o($recv_objs)) AC_SUBST(recv_ldflags, $recv_ldflags) @@ -1074,12 +1151,6 @@ AC_SUBST(gui_objs, add_dot_o($gui_objs)) AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS, objlist_to_errlist($gui_errlist_objs), errors used by para_gui) -AC_SUBST(fade_objs, add_dot_o($fade_objs)) -AC_SUBST(fade_ldflags, $fade_ldflags) -AC_DEFINE_UNQUOTED(INIT_FADE_ERRLISTS, - objlist_to_errlist($fade_errlist_objs), errors used by para_fade) - - enum="$(for i in $filters; do printf "${i}_FILTER, " | tr '[a-z]' '[A-Z]'; done)" AC_DEFINE_UNQUOTED(FILTER_ENUM, $enum NUM_SUPPORTED_FILTERS, enum of supported filters) @@ -1116,4 +1187,5 @@ id3 version2 support: $have_libid3tag filters supported by para_audiod/para_filter: $filters writers supported by para_audiod/para_write: $writers optional executables: $extras +$mixer_summary ])