X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=61b1808ae74a48d71584230f186227808c84d1ee;hp=d22818a591d3bf52fb13c785cf71b806aaec225a;hb=67f005d3ea1afbc498feddb70977f4c8252351e0;hpb=71a55a1d4db03ecc7adb7236f45109efffda75c2 diff --git a/configure.ac b/configure.ac index d22818a5..61b1808a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ(2.53) -AC_INIT(paraslash, [0.2.11], maan@systemlinux.org) +AC_INIT(paraslash, [git], maan@systemlinux.org) AC_CONFIG_HEADER([config.h]) ########################################################################### generic @@ -51,31 +51,35 @@ AC_CHECK_FUNCS([atexit dup2 gethostbyname inet_ntoa memchr memmove memset \ AC_CHECK_LIB([ncurses], [initscr], [], [AC_MSG_ERROR([libncurses not found])]) -AC_CHECK_LIB([readline], [readline], [], - [AC_MSG_ERROR([libreadline not found])]) AC_CHECK_LIB([menu], [new_menu], [extras="$extras para_dbadm"], [AC_MSG_WARN([libmenu not found, cannot build para_dbadm])]) -########################################################################### -recv_cmdline_objs="recv.cmdline http_recv.cmdline" -recv_errlist_objs="http_recv recv_common recv time string net" + +recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline" +recv_errlist_objs="http_recv recv_common recv time string net dccp_recv + dccp fd" recv_ldflags="" filter_cmdline_objs="filter.cmdline compress_filter.cmdline" filter_errlist_objs="filter_chain wav compress filter string" filter_ldflags="" -audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline - http_recv.cmdline" -audiod_errlist_objs="audiod exec close_on_fork signal string daemon stat net - time grab_client filter_chain wav compress http_recv recv_common ringbuffer" +audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline + http_recv.cmdline dccp_recv.cmdline" +audiod_errlist_objs="audiod exec close_on_fork signal string daemon stat net + time grab_client filter_chain wav compress http_recv dccp dccp_recv recv_common fd" audiod_ldflags="" server_cmdline_objs="server.cmdline" server_errlist_objs="server mp3 afs command net string signal random_selector - time daemon stat crypt http_send db close_on_fork playlist_selector ipc" + time daemon stat crypt http_send db close_on_fork playlist_selector + ipc dccp dccp_send fd" server_ldflags="" +play_cmdline_objs="play.cmdline" +play_errlist_objs="play time fd string" +play_ldflags="" + ########################################################################### ssl dnl @synopsis CHECK_SSL dnl @@ -124,6 +128,20 @@ if test "$enable_ssldir" = "yes"; then enable_ssldir=""; fi CHECK_SSL($enable_ssldir) server_ldflags="$srver_ldflags $SSL_LDFLAGS $SSL_LIBS" +########################################################################### ucred + +AC_MSG_CHECKING(for struct ucred) +AC_TRY_LINK([ + #include + #include +],[ + struct ucred sucred; sucred.pid=0; +],[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) +fi + ########################################################################### gtk2 pkg_modules="gtk+-2.0 >= 2.0.0" @@ -199,26 +217,22 @@ else AC_MSG_WARN([no mp3dec support in para_audiod/para_filter]) fi ########################################################################### alsa -play="para_play" -msg="will not build para_play" +have_alsa="yes" +msg="=> no para_play" AC_CHECK_HEADERS([alsa/asoundlib.h], [], [ - AC_MSG_WARN([no alsa/asoundlib, $msg]) - play="" + AC_MSG_WARN([no alsa/asoundlib $msg]) + have_alsa="no" ]) AC_CHECK_LIB([asound], [snd_pcm_open], [], [ - AC_MSG_WARN([no libasound, $msg]) - play="" + AC_MSG_WARN([no libasound $msg]) + have_alsa="no" ]) -extras="$extras $play" - - +if test "$have_alsa" = "yes"; then + extras="$extras para_play" + play_ldflags="$play_ldflags -lasound" +fi ########################################################################### ortp have_ortp="yes" -pkg_modules="glib-2.0 >= 2.0.4" -PKG_CHECK_MODULES(GLIB, [$pkg_modules], [], [ - have_ortp="no" -]) -CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS" AC_CHECK_HEADERS([ortp/ortp.h], [], [ have_ortp="no" ]) @@ -234,9 +248,9 @@ if test "$have_ortp" = "yes"; then server_errlist_objs="$server_errlist_objs ortp_send" - recv_ldflags="$recv_ldflags $GLIB_LIBS -lortp" - server_ldflags="$server_ldflags $GLIB_LIBS -lortp" - audiod_ldflags="$audiod_ldflags $GLIB_LIBS -lortp" + recv_ldflags="$recv_ldflags -lortp" + server_ldflags="$server_ldflags -lortp" + audiod_ldflags="$audiod_ldflags -lortp" AC_DEFINE(HAVE_ORTP, 1, [define to 1 to turn on ortp support]) else @@ -279,6 +293,7 @@ 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" +play_objs="$play_cmdline_objs $play_errlist_objs" AC_SUBST(recv_objs, add_dot_o($recv_objs)) AC_SUBST(recv_ldflags, $recv_ldflags) @@ -287,7 +302,7 @@ AC_DEFINE_UNQUOTED(INIT_RECV_ERRLISTS, objlist_to_errlist($recv_errlist_objs), AC_SUBST(filter_objs, add_dot_o($filter_objs)) AC_SUBST(filter_ldflags, $filter_ldflags) -AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS, +AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS, objlist_to_errlist($filter_errlist_objs), errors used by para_filter) AC_SUBST(audiod_objs, add_dot_o($audiod_objs)) @@ -297,8 +312,22 @@ AC_DEFINE_UNQUOTED(INIT_AUDIOD_ERRLISTS, objlist_to_errlist($audiod_errlist_objs AC_SUBST(server_objs, add_dot_o($server_objs)) AC_SUBST(server_ldflags, $server_ldflags) -AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS, +AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS, objlist_to_errlist($server_errlist_objs), errors used by para_server) + +AC_SUBST(play_objs, add_dot_o($play_objs)) +AC_SUBST(play_ldflags, $play_ldflags) +AC_DEFINE_UNQUOTED(INIT_PLAY_ERRLISTS, + objlist_to_errlist($play_errlist_objs), errors used by para_play) + +gui_cmdline_objs="gui.cmdline" +gui_errlist_objs="exec close_on_fork signal string stat ringbuffer fd" +gui_other_objs="gui gui_common gui_theme" +gui_objs="$gui_cmdline_objs $gui_errlist_objs $gui_other_objs" +AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS, + objlist_to_errlist($gui_errlist_objs), errors used by para_gui) +AC_SUBST(gui_objs, add_dot_o($gui_objs)) + AC_OUTPUT AC_MSG_NOTICE([creating Makefile.deps]) gcc -MM -MG *.c > Makefile.deps @@ -309,4 +338,6 @@ mysql support: $have_mysql ogg vorbis support: $have_ogg mp3dec support (libmad): $have_mad ortp support: $have_ortp +unix socket credentials: $have_ucred +alsa support (para_play): $have_alsa ])