configure.ac: Remove some unused AC_SUBST() exports.
[paraslash.git] / configure.ac
index cd096dc8a8fe00e641fe2834463aac7ed48b645c..6e3ab366e4ad26ab2dd2bcb27d798e345ac81cc3 100644 (file)
@@ -4,7 +4,7 @@
 AC_PREREQ(2.60)
 
 
-AC_INIT(paraslash, [0.3.6], maan@systemlinux.org)
+AC_INIT(paraslash, [git], maan@systemlinux.org)
 AC_CONFIG_HEADER([config.h])
 
 AC_PATH_PROG(UNAMEPATH, uname, no)
@@ -78,82 +78,116 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
        strncasecmp strrchr strspn alarm mkdir rmdir], [],
        [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 crypt http_send close_on_fork ipc acl afh fade amp_filter
-dccp_send fd user_list chunk_queue afs osl aft mood score attribute blob ringbuffer
-playlist sha1 rbtree sched audiod grab_client filter_common wav_filter compress_filter
+dccp_send fd user_list chunk_queue afs aft mood score attribute blob ringbuffer
+playlist sha1 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 fsck exec send_common ggo
-udp_recv udp_send color fec fecdec_filter prebuffer_filter"
+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
+"
+
+executables="server recv filter audioc write client afh audiod"
 
-all_executables="server recv filter audioc write client fsck afh"
+recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv)"
 
-recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline udp_recv.cmdline"
 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="filter.cmdline compress_filter.cmdline amp_filter.cmdline
-       prebuffer_filter.cmdline"
+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"
-filter_ldflags=""
-filters=" compress wav amp fecdec prebuffer"
+       prebuffer_filter time bitstream imdct wma_common wmadec_filter buffer_tree"
+filter_ldflags="-lm"
+filters=" compress wav amp fecdec wmadec prebuffer"
 
-audioc_cmdline_objs="audioc.cmdline"
+audioc_cmdline_objs="add_cmdline(audioc)"
 audioc_errlist_objs="audioc string net fd"
 audioc_ldflags=""
 
-audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
-       http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline
-       audiod_command_list amp_filter.cmdline udp_recv.cmdline
-       prebuffer_filter.cmdline"
+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
        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"
-audiod_ldflags=""
-audiod_audio_formats=""
+       client_common ggo udp_recv color fec prebuffer_filter sha1 audiod_command_list
+       bitstream imdct wma_common wmadec_filter buffer_tree"
+audiod_ldflags="-lm"
+audiod_audio_formats="wma"
 
-afh_cmdline_objs="afh.cmdline"
-afh_errlist_objs="afh string fd mp3_afh afh_common time"
+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="server.cmdline server_command_list afs_command_list"
+server_cmdline_objs="add_cmdline(server)"
 server_errlist_objs="server afh_common mp3_afh vss command net string signal
-       time daemon stat crypt http_send close_on_fork
-       ipc dccp_send fd user_list chunk_queue afs osl aft mood score attribute
-       blob playlist sha1 rbtree sched acl send_common udp_send color fec"
-server_ldflags=""
-server_audio_formats=" mp3"
-
-write_cmdline_objs="write.cmdline file_write.cmdline"
-write_errlist_objs="write write_common file_write time fd string sched stdin ggo"
+       time daemon crypt http_send close_on_fork mm
+       ipc dccp_send fd user_list chunk_queue afs aft mood score attribute
+       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 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"
 write_ldflags=""
 writers=" file"
 default_writer="FILE_WRITE"
 
-client_cmdline_objs="client.cmdline"
-client_errlist_objs="client net string crypt fd sched stdin stdout client_common"
+client_cmdline_objs="add_cmdline(client)"
+client_errlist_objs="client net string crypt fd sched stdin stdout time
+       client_common sha1 buffer_tree"
 client_ldflags=""
 
-fsck_cmdline_objs="fsck.cmdline"
-fsck_errlist_objs="osl rbtree fsck string sha1 fd"
-
-gui_cmdline_objs="gui.cmdline"
+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="fade.cmdline"
+fade_cmdline_objs="add_cmdline(fade)"
 fade_errlist_objs="fade exec string fd"
 
 
+########################################################################### osl
+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,
+       [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,
+       [look for libosl also in dir])])
+if test -n "$with_osl_libs"; then
+       osl_libs="-L$with_osl_libs"
+       LDFLAGS="$LDFLAGS $osl_libs"
+fi
 
+AC_CHECK_HEADER(osl.h, [], have_osl=no)
+AC_CHECK_LIB([osl], [osl_open_table], [], have_osl=no)
+if test "$have_osl" = "no"; then
+       AC_MSG_ERROR([libosl not found, download it at
+       http://systemlinux.org/~maan/osl
+or execute
+       git clone git://git.tuebingen.mpg.de/osl
+       ])
+fi
+AC_SUBST(osl_cppflags)
+server_ldflags="$server_ldflags -L$with_osl_libs"
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
 ########################################################################### ssl
 dnl @synopsis CHECK_SSL
 dnl
@@ -184,19 +218,15 @@ 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,
        [Search for openssl also in path.])])
 if test "$enable_ssldir" = "yes"; then enable_ssldir=""; fi
 CHECK_SSL($enable_ssldir)
-server_ldflags="$srver_ldflags $SSL_LDFLAGS $SSL_LIBS"
+server_ldflags="$server_ldflags $SSL_LDFLAGS $SSL_LIBS"
 client_ldflags="$client_ldflags $SSL_LDFLAGS $SSL_LIBS"
 audiod_ldflags="$audiod_ldflags $SSL_LDFLAGS $SSL_LIBS"
-fsck_ldflags="$fsck_ldflags $SSL_LDFLAGS $SSL_LIBS"
 
 ########################################################################### libsocket
 AC_CHECK_LIB([c], [socket],
@@ -262,10 +292,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
@@ -347,18 +376,17 @@ if test "$have_ogg" = "yes"; then
        audiod_ldflags="$audiod_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
        afh_ldflags="$afh_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
 
-       filter_cmdline_objs="$filter_cmdline_objs oggdec_filter.cmdline"
-       audiod_cmdline_objs="$audiod_cmdline_objs oggdec_filter.cmdline"
+       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"
        afh_errlist_objs="$afh_errlist_objs ogg_afh"
 
-       audiod_audio_formats="ogg"
+       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
@@ -399,7 +427,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
@@ -432,8 +459,8 @@ AC_CHECK_LIB([mad], [mad_stream_init], [], [
 ])
 if test "$have_mad" = "yes"; then
        AC_DEFINE(HAVE_MAD, 1, define to 1 if you want to build the mp3dec filter)
-       filter_cmdline_objs="$filter_cmdline_objs mp3dec_filter.cmdline"
-       audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter.cmdline"
+       filter_cmdline_objs="$filter_cmdline_objs add_cmdline(mp3dec_filter)"
+       audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(mp3dec_filter)"
        all_errlist_objs="$all_errlist_objs mp3dec_filter"
        filter_errlist_objs="$filter_errlist_objs mp3dec_filter"
        audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter"
@@ -442,16 +469,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"
@@ -479,14 +499,14 @@ 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 oss_write.cmdline"
+       audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(oss_write)"
 
        write_errlist_objs="$write_errlist_objs oss_write"
-       write_cmdline_objs="$write_cmdline_objs oss_write.cmdline"
+       write_cmdline_objs="$write_cmdline_objs add_cmdline(oss_write)"
        writers="$writers oss"
        default_writer="OSS_WRITE"
        AC_CHECK_LIB(ossaudio, _oss_ioctl, [
@@ -533,11 +553,11 @@ 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 alsa_write.cmdline"
+       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 alsa_write.cmdline"
+       write_cmdline_objs="$write_cmdline_objs add_cmdline(alsa_write)"
        write_ldflags="$write_ldflags -lasound"
        writers="$writers alsa"
        default_writer="ALSA_WRITE"
@@ -547,21 +567,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
@@ -613,11 +630,12 @@ AC_DEFINE_UNQUOTED(DEFINE_ERRLIST_OBJECT_ENUM,
 ################################################################## status items
 
 status_items="basename status num_played mtime bitrate frequency file_size
-status_flags format score audio_file_info taginfo1 taginfo2 afs_mode
+status_flags format score techinfo afs_mode
 attributes_txt decoder_flags audiod_status play_time attributes_bitmap
 offset seconds_total stream_start current_time audiod_uptime image_id
 lyrics_id duration directory lyrics_name image_name path hash channels
-last_played num_chunks chunk_time amplification"
+last_played num_chunks chunk_time amplification artist title year album
+comment"
 
 # $1: prefix, $2: items
 AC_DEFUN([make_enum_items], [$(
@@ -643,13 +661,14 @@ 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"
 server_objs="$server_cmdline_objs $server_errlist_objs"
 write_objs="$write_cmdline_objs $write_errlist_objs"
 client_objs="$client_cmdline_objs $client_errlist_objs"
-fsck_objs="$fsck_cmdline_objs $fsck_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"
@@ -689,11 +708,6 @@ AC_SUBST(client_ldflags, $client_ldflags)
 AC_DEFINE_UNQUOTED(INIT_CLIENT_ERRLISTS,
        objlist_to_errlist($client_errlist_objs), errors used by para_client)
 
-AC_SUBST(fsck_objs, add_dot_o($fsck_objs))
-AC_SUBST(fsck_ldflags, $fsck_ldflags)
-AC_DEFINE_UNQUOTED(INIT_FSCK_ERRLISTS,
-       objlist_to_errlist($fsck_errlist_objs), errors used by para_fsck)
-
 AC_SUBST(audioc_objs, add_dot_o($audioc_objs))
 AC_SUBST(audioc_ldflags, $audioc_ldflags)
 AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
@@ -735,16 +749,12 @@ names="$(for i in $audiod_audio_formats; do printf \"$i\",' ' ; done)"
 AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMAT_ARRAY, $names, array of audio formats supported by audiod)
 
 AC_OUTPUT
-AC_MSG_NOTICE([creating Makefile.deps])
-gcc -MM -MG $faad_cppflags $mad_cppflags $oggvorbis_cppflags *.c > Makefile.deps
 AC_MSG_NOTICE([
 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