X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=47817e8265261bf0f49570987b1724acb2c44467;hp=e6647e22859b58e9e6a0c41f19f157bd16c3eaee;hb=4ec04c614fc2e835a2d106ee61482ba0c729f5e6;hpb=263a00133b367572d0a8124fcb67225797e640e7 diff --git a/configure.ac b/configure.ac index e6647e22..47817e82 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.61]) -AC_INIT([paraslash],[0.5.0],[maan@systemlinux.org]) +AC_INIT([paraslash],[git],[maan@systemlinux.org]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_FILES([Makefile]) @@ -199,87 +199,6 @@ play_errlist_objs="play fd sched ggo buffer_tree time string net " play_cmdline_objs="add_cmdline(http_recv dccp_recv udp_recv afh_recv compress_filter amp_filter prebuffer_filter file_write play)" play_ldflags="-lm" -########################################################################### 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 -# -# 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_RUN_IFELSE([AC_LANG_SOURCE([[ -#include - -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_RUN_IFELSE([AC_LANG_SOURCE([[#include -#include - -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() ################################################################## clock_gettime clock_gettime_lib= AC_CHECK_LIB([c], [clock_gettime], [clock_gettime_lib=c], [ @@ -295,7 +214,7 @@ fi ########################################################################### osl have_osl=yes OLD_CPPFLAGS="$CPPFLAGS" -OLD_LD_FLAGS="$LDFLAGS" +OLD_LDFLAGS="$LDFLAGS" OLD_LIBS="$LIBS" AC_ARG_WITH(osl_headers, [AS_HELP_STRING(--with-osl-headers=dir, [look for osl.h also in dir])]) @@ -313,6 +232,7 @@ 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 + build_server="no" AC_MSG_WARN([libosl not found, can not build para_server. Download libosl at http://systemlinux.org/~maan/osl @@ -320,7 +240,7 @@ or execute git clone git://git.tuebingen.mpg.de/osl ]) else - extras="$extras server" + build_server="yes" executables="$executables server" server_cmdline_objs="add_cmdline(server)" server_errlist_objs=" @@ -390,7 +310,7 @@ esac ###################################################################### openssl if test "$check_openssl" = "yes"; then OLD_CPPFLAGS="$CPPFLAGS" - OLD_LD_FLAGS="$LDFLAGS" + OLD_LDFLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_openssl="yes" AC_ARG_WITH(openssl_headers, [AS_HELP_STRING(--with-openssl-headers=dir, @@ -447,7 +367,7 @@ fi ########################################################################### gcrypt if test "$check_gcrypt" = "yes"; then OLD_CPPFLAGS="$CPPFLAGS" - OLD_LD_FLAGS="$LDFLAGS" + OLD_LDFLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_gcrypt="yes" AC_ARG_WITH(gcrypt_headers, [AS_HELP_STRING(--with-gcrypt-headers=dir, @@ -539,7 +459,7 @@ AC_SUBST(ggo_descriptions_declared) ########################################################################### curses have_curses="yes" OLD_CPPFLAGS="$CPPFLAGS" -OLD_LD_FLAGS="$LDFLAGS" +OLD_LDFLAGS="$LDFLAGS" OLD_LIBS="$LIBS" AC_ARG_WITH(curses_headers, [AS_HELP_STRING(--with-curses-headers=dir, [look for curses.h also in dir])]) @@ -567,9 +487,10 @@ AC_CHECK_LIB([ncursesw], [initscr], ) if test "$have_curses" = "yes"; then AC_SUBST(curses_cppflags) - extras="$extras gui" + build_gui="yes" executables="$executables gui" else + build_gui="no" AC_MSG_WARN([no curses lib, cannot build para_gui]) fi CPPFLAGS="$OLD_CPPFLAGS" @@ -630,7 +551,7 @@ fi ####################################################### ogg/vorbis/speex/opus have_ogg="yes" OLD_CPPFLAGS="$CPPFLAGS" -OLD_LD_FLAGS="$LDFLAGS" +OLD_LDFLAGS="$LDFLAGS" OLD_LIBS="$LIBS" AC_ARG_WITH(ogg_headers, [AS_HELP_STRING(--with-ogg-headers=dir, [look for ogg headers also in dir])]) @@ -694,7 +615,7 @@ if test "$have_ogg" = "yes"; then CPPFLAGS="$CPPFLAGS $opus_cppflags" fi if test -n "$with_opus_libs"; then - speex_libs="-L$with_opus_libs" + opus_libs="-L$with_opus_libs" LDFLAGS="$LDFLAGS $opus_libs" fi AC_CHECK_LIB([opus], [opus_multistream_decode], [], [ have_opus="no" ]) @@ -795,7 +716,7 @@ if test "$have_opus" = "yes"; then recv_errlist_objs="$recv_errlist_objs opus_afh opus_common" audiod_audio_formats="$audiod_audio_formats opus" - server_audio_formats="$server_audio_formats opus" + audio_format_handlers="$audio_format_handlers opus" else AC_MSG_WARN([no ogg/opus $msg]) fi @@ -805,7 +726,7 @@ LIBS="$OLD_LIBS" ########################################################################### faad have_faad=yes OLD_CPPFLAGS="$CPPFLAGS" -OLD_LD_FLAGS="$LDFLAGS" +OLD_LDFLAGS="$LDFLAGS" OLD_LIBS="$LIBS" AC_ARG_WITH(faad_headers, [AS_HELP_STRING(--with-faad-headers=dir, [look for neaacdec.h also in dir])]) @@ -851,7 +772,7 @@ LIBS="$OLD_LIBS" ########################################################################### mad have_mad="yes" OLD_CPPFLAGS="$CPPFLAGS" -OLD_LD_FLAGS="$LDFLAGS" +OLD_LDFLAGS="$LDFLAGS" OLD_LIBS="$LIBS" AC_ARG_WITH(mad_headers, [AS_HELP_STRING(--with-mad-headers=dir, @@ -895,7 +816,7 @@ LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" ###################################################################### libid3tag OLD_CPPFLAGS="$CPPFLAGS" -OLD_LD_FLAGS="$LDFLAGS" +OLD_LDFLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_libid3tag="yes" @@ -936,7 +857,7 @@ LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" ########################################################################### flac OLD_CPPFLAGS="$CPPFLAGS" -OLD_LD_FLAGS="$LDFLAGS" +OLD_LDFLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_flac="yes" @@ -968,7 +889,7 @@ if test "$have_flac" = "yes"; then play_ldflags="$play_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" + recv_ldflags="$recv_ldflags $flac_libs -lFLAC" filters="$filters flacdec" audio_format_handlers="$audio_format_handlers flac" audiod_audio_formats="$audiod_audio_formats flac" @@ -981,7 +902,7 @@ LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" ########################################################################### oss OLD_CPPFLAGS="$CPPFLAGS" -OLD_LD_FLAGS="$LDFLAGS" +OLD_LDFLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_oss="yes" @@ -1022,7 +943,7 @@ LIBS="$OLD_LIBS" ########################################################################### alsa OLD_CPPFLAGS="$CPPFLAGS" -OLD_LD_FLAGS="$LDFLAGS" +OLD_LDFLAGS="$LDFLAGS" OLD_LIBS="$LIBS" msg="=> no alsa support for para_audiod/para_write" @@ -1071,7 +992,7 @@ LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" ########################################################################### fade if test -n "$mixers"; then - extras="$extras fade" + build_fade="yes" executables="$executables fade" all_errlist_objs="$all_errlist_objs fade" fade_errlist_objs="$fade_errlist_objs fade exec string fd version ggo" @@ -1104,12 +1025,13 @@ if test -n "$mixers"; then AC_DEFINE_UNQUOTED(MIXER_ARRAY, $array, array of supported mixers) mixer_summary="supported mixers:: $mixers, default: $default_mixer" else + build_fade="no" AC_MSG_WARN([no mixer support]) mixer_summary="para_fade: no" fi ########################################################################### libao OLD_CPPFLAGS="$CPPFLAGS" -OLD_LD_FLAGS="$LDFLAGS" +OLD_LDFLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_ao="yes" @@ -1172,7 +1094,7 @@ LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" ############################################################# readline OLD_CPPFLAGS="$CPPFLAGS" -OLD_LD_FLAGS="$LDFLAGS" +OLD_LDFLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_readline="yes" @@ -1243,7 +1165,7 @@ LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" ############################################################# libsamplerate OLD_CPPFLAGS="$CPPFLAGS" -OLD_LD_FLAGS="$LDFLAGS" +OLD_LDFLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_samplerate="yes" @@ -1421,6 +1343,9 @@ audio formats handlers: $audio_format_handlers id3 version2 support: $have_libid3tag filters: $filters writers: $writers -optional executables: $extras + $mixer_summary +para_server: $build_server +para_gui: $build_gui +para_fade: $build_fade ])