X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=d993e526c8a30bdab55da1dd5a9df6f1ead5b320;hp=a589613b5ad5f000edb65f77e6f73101f1d34ae2;hb=HEAD;hpb=8d106ca317a2c42f35a86ba244f843688f6939e6 diff --git a/configure.ac b/configure.ac index a589613b..92560e00 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,6 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile]) AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)]) -AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${i}.cmdline "; done)]) AC_DEFUN([LIB_ARG_WITH], [ AC_ARG_WITH($1-headers, [AS_HELP_STRING(--with-$1-headers=dir, [look for $1 headers in dir])]) @@ -47,21 +46,21 @@ AC_DEFUN([LIB_SUBST_FLAGS], [ AC_SUBST($1_cppflags) AC_SUBST($1_ldflags) ]) +AC_DEFUN([REQUIRE_EXECUTABLE], [ + AC_PATH_PROG(m4_toupper([$1]), [$1]) + test -z "$m4_toupper([$1])" && AC_MSG_ERROR( + [$1 is required to build this package]) +]) AC_USE_SYSTEM_EXTENSIONS AC_C_BIGENDIAN() - -AC_PATH_PROG([M4], [m4]) -test -z "$M4" && AC_MSG_ERROR( - [The m4 macro processor is required to build this package]) - -AC_PATH_PROG([lopsubgen], [lopsubgen]) -test -z "$lopsubgen" && AC_MSG_ERROR( - [lopsubgen is required to build this package]) - AC_PROG_CC AC_PROG_CPP +REQUIRE_EXECUTABLE([bison]) +REQUIRE_EXECUTABLE([flex]) +REQUIRE_EXECUTABLE([m4]) + executables="recv filter audioc write afh play" ########################################################################### osl STASH_FLAGS @@ -72,11 +71,13 @@ AC_CHECK_LIB([osl], [osl_open_table], [], [HAVE_OSL=no]) LIB_SUBST_FLAGS(osl) UNSTASH_FLAGS ######################################################################## lopsub +HAVE_LOPSUB=yes +AC_PATH_PROG([LOPSUBGEN], [lopsubgen]) +test -z "$LOPSUBGEN" && HAVE_LOPSUB=no STASH_FLAGS LIB_ARG_WITH([lopsub], [-llopsub]) -HAVE_LOPSUB=yes AC_CHECK_HEADER(lopsub.h, [], [HAVE_LOPSUB=no]) -AC_CHECK_LIB([lopsub], [lls_merge], [], [HAVE_LOPSUB=yes]) +AC_CHECK_LIB([lopsub], [lls_merge], [], [HAVE_LOPSUB=no]) if test $HAVE_LOPSUB = no; then AC_MSG_ERROR([ The lopsub library is required to build this software, but the above checks indicate it is not installed on your system. @@ -95,8 +96,38 @@ AC_CHECK_HEADER(openssl/ssl.h, [], [HAVE_OPENSSL=no]) AC_CHECK_LIB([crypto], [RAND_bytes], [], [HAVE_OPENSSL=no]) LIB_SUBST_FLAGS(openssl) if test $HAVE_OPENSSL = yes; then - AC_CHECK_LIB([crypto], [RSA_set0_key], - AC_DEFINE([HAVE_RSA_SET0_KEY], [1], [openssl-1.1])) + HAVE_RSA_SET0_KEY=yes + AC_CHECK_DECL([RSA_set0_key], [], [], [#include ]) + AC_CHECK_LIB([crypto], [RSA_set0_key], [], []) + if test "$ac_cv_have_decl_RSA_set0_key" != "$ac_cv_lib_crypto_RSA_set0_key"; then + AC_MSG_ERROR([openssl header/library mismatch]) + fi + if test "$ac_cv_have_decl_RSA_set0_key" = yes; then + AC_DEFINE([HAVE_RSA_SET0_KEY], [1], [openssl >= 1.1]) + else + AC_MSG_WARN([ + Old openssl library detected. Support for openssl-1.0 and earlier + will be removed in the next major paraslash release. Please upgrade + your openssl installation.]) + fi + HAVE_CRYPTO_CLEANUP_ALL_EX_DATA=yes + AC_CHECK_DECL([CRYPTO_cleanup_all_ex_data], [], + [HAVE_CRYPTO_CLEANUP_ALL_EX_DATA=no], + [#include ]) + AC_CHECK_LIB([crypto], [CRYPTO_cleanup_all_ex_data], [], + [HAVE_CRYPTO_CLEANUP_ALL_EX_DATA=no]) + test $HAVE_CRYPTO_CLEANUP_ALL_EX_DATA = yes && + AC_DEFINE([HAVE_CRYPTO_CLEANUP_ALL_EX_DATA], [1], + [not available on FreeBSD 12]) + HAVE_OPENSSL_THREAD_STOP=yes + AC_CHECK_DECL([OPENSSL_thread_stop], [], + [HAVE_OPENSSL_THREAD_STOP=no], + [#include ]) + AC_CHECK_LIB([crypto], [OPENSSL_thread_stop], [], + [HAVE_OPENSSL_THREAD_STOP=no]) + test $HAVE_OPENSSL_THREAD_STOP = yes && + AC_DEFINE([HAVE_OPENSSL_THREAD_STOP], [1], + [not available on openssl-1.0]) fi UNSTASH_FLAGS ######################################################################### gcrypt @@ -166,16 +197,22 @@ AC_DEFINE_UNQUOTED(ICONV_CAST, $cast, [cast for second arg to iconv()]) AC_MSG_RESULT($msg) UNSTASH_FLAGS ########################################################################### ucred -AC_MSG_CHECKING(for struct ucred) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +AC_CHECK_TYPE([struct ucred], [ + AC_DEFINE(HAVE_UCRED, 1, define to 1 you have struct ucred) +], [], [ #include #include +]) +################################################################### FNM_EXTMATCH +AC_MSG_CHECKING(for extended wildcard pattern matching) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #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) + unsigned n = FNM_EXTMATCH; +]])], [have_fnm_extmatch=yes], [have_fnm_extmatch=no]) +AC_MSG_RESULT($have_fnm_extmatch) +if test $have_fnm_extmatch = yes; then + AC_DEFINE(HAVE_FNM_EXTMATCH, 1, define to 1 if FNM_EXTMATCH is defined) fi ########################################################################### curses STASH_FLAGS @@ -187,18 +224,12 @@ curses_ldflags="$curses_ldflags $LIBS" LIB_SUBST_FLAGS(curses) UNSTASH_FLAGS ########################################################################### ip_mreqn -AC_MSG_CHECKING(for struct ip_mreqn (UDPv4 multicast)) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +AC_CHECK_TYPE([struct ip_mreqn], [ + AC_DEFINE(HAVE_IP_MREQN, 1, define to 1 if you have struct ip_mreqn) +], [], [ #include #include -]], [[ - struct ip_mreqn mn; - mn.imr_ifindex = 0; -]])],[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) -fi +]) ########################################################################### ogg STASH_FLAGS LIB_ARG_WITH([ogg], [-logg]) @@ -265,12 +296,10 @@ AC_DEFUN([NEED_FLAC_OBJECTS], [{ }]) ########################################################################### faad STASH_FLAGS -LIB_ARG_WITH([faad], [-lfaad -lmp4ff]) +LIB_ARG_WITH([faad], [-lfaad]) HAVE_FAAD=yes AC_CHECK_HEADER(neaacdec.h, [], HAVE_FAAD=no) -AC_CHECK_HEADER(mp4ff.h, [], HAVE_FAAD=no) AC_CHECK_LIB([faad], [NeAACDecOpen], [], HAVE_FAAD=no) -AC_CHECK_LIB([mp4ff], [mp4ff_meta_get_artist], [], HAVE_FAAD=no) LIB_SUBST_FLAGS(faad) UNSTASH_FLAGS ########################################################################### mad @@ -347,10 +376,16 @@ AC_CHECK_HEADER(samplerate.h, [], HAVE_SAMPLERATE=no) AC_CHECK_LIB([samplerate], [src_process], [], HAVE_SAMPLERATE=no) LIB_SUBST_FLAGS(samplerate) UNSTASH_FLAGS +######################################################################### ubsan +AC_ARG_ENABLE([ubsan], [AS_HELP_STRING(--enable-ubsan, + [Detect and report undefined behaviour.])], + [ENABLE_UBSAN=yes], [ENABLE_UBSAN=no]) +AC_SUBST(ENABLE_UBSAN) ######################################################################### server -if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then +if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes && test -n "$BISON" && \ + test -n "$FLEX"; then build_server="yes" - executables="$executables server" + executables="$executables server upgrade_db" server_errlist_objs=" server afh_common @@ -364,7 +399,6 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then daemon http_send close_on_fork - mm crypt_common base64 ipc @@ -375,6 +409,7 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then afs aft mood + mp score attribute blob @@ -389,9 +424,10 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then wma_common sideband version + lsu " if test "$CRYPTOLIB" = openssl; then - server_errlist_objs="$server_errlist_objs crypt" + server_errlist_objs="$server_errlist_objs openssl" else server_errlist_objs="$server_errlist_objs gcrypt" fi @@ -401,13 +437,24 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then NEED_OPUS_OBJECTS() && server_errlist_objs="$server_errlist_objs opus_afh opus_common" NEED_FLAC_OBJECTS && server_errlist_objs="$server_errlist_objs flac_afh" if test $HAVE_FAAD = yes; then - server_errlist_objs="$server_errlist_objs aac_afh" + server_errlist_objs="$server_errlist_objs aac_afh mp4" fi server_objs="$server_errlist_objs" AC_SUBST(server_objs, add_dot_o($server_objs)) else build_server="no" fi +############################################################# upgrade_db +upgrade_db_objs=' + crypt_common + exec + fd + string + upgrade_db + version + base64 +' +AC_SUBST(upgrade_db_objs, add_dot_o($upgrade_db_objs)) ############################################################# client if test -n "$CRYPTOLIB"; then build_client="yes" @@ -417,6 +464,7 @@ if test -n "$CRYPTOLIB"; then net string fd + lsu sched stdin stdout @@ -429,7 +477,7 @@ if test -n "$CRYPTOLIB"; then version " if test "$CRYPTOLIB" = openssl; then - client_errlist_objs="$client_errlist_objs crypt" + client_errlist_objs="$client_errlist_objs openssl" else client_errlist_objs="$client_errlist_objs gcrypt" fi @@ -483,9 +531,10 @@ if test -n "$CRYPTOLIB"; then wmadec_filter buffer_tree sync_filter + lsu " if test "$CRYPTOLIB" = openssl; then - audiod_errlist_objs="$audiod_errlist_objs crypt" + audiod_errlist_objs="$audiod_errlist_objs openssl" else audiod_errlist_objs="$audiod_errlist_objs gcrypt" fi @@ -540,7 +589,7 @@ fi if test $HAVE_OSS = yes -o $HAVE_ALSA = yes; then build_mixer="yes" executables="$executables mixer" - mixer_errlist_objs="mixer exec string fd version" + mixer_errlist_objs="mixer exec string fd time lsu version" if test $HAVE_OSS = yes; then mixer_errlist_objs="$mixer_errlist_objs oss_mix" fi @@ -566,6 +615,7 @@ if test $HAVE_CURSES = yes; then fd gui gui_theme + lsu time sched version @@ -590,6 +640,7 @@ filter_errlist_objs=" amp_filter fecdec_filter fec + lsu version prebuffer_filter time @@ -645,7 +696,7 @@ NEED_OPUS_OBJECTS && recv_errlist_objs="$recv_errlist_objs opus_afh opus_common" NEED_FLAC_OBJECTS && recv_errlist_objs="$recv_errlist_objs flac_afh" if test $HAVE_FAAD = yes; then - recv_errlist_objs="$recv_errlist_objs aac_afh" + recv_errlist_objs="$recv_errlist_objs aac_afh mp4" fi recv_objs="$recv_errlist_objs" AC_SUBST(recv_objs, add_dot_o($recv_objs)) @@ -680,7 +731,7 @@ NEED_FLAC_OBJECTS && { audio_format_handlers="$audio_format_handlers flac" } if test $HAVE_FAAD = yes; then - afh_errlist_objs="$afh_errlist_objs aac_afh" + afh_errlist_objs="$afh_errlist_objs aac_afh mp4" audio_format_handlers="$audio_format_handlers aac" fi @@ -719,6 +770,7 @@ play_errlist_objs=" file_write version sync_filter + lsu " NEED_OGG_OBJECTS && play_errlist_objs="$play_errlist_objs ogg_afh_common" NEED_VORBIS_OBJECTS && { @@ -737,7 +789,7 @@ NEED_FLAC_OBJECTS && { play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh" } if test $HAVE_FAAD = yes; then - play_errlist_objs="$play_errlist_objs aac_afh aacdec_filter" + play_errlist_objs="$play_errlist_objs aac_afh aacdec_filter mp4" fi if test $HAVE_MAD = yes; then play_errlist_objs="$play_errlist_objs mp3dec_filter" @@ -790,8 +842,10 @@ AC_SUBST(write_objs, add_dot_o($write_objs)) audioc_errlist_objs=" audioc string + lsu net fd + time version " if test $HAVE_READLINE = yes; then @@ -799,38 +853,13 @@ if test $HAVE_READLINE = yes; then buffer_tree interactive sched - time " fi audioc_objs="$audioc_errlist_objs" AC_SUBST(audioc_objs, add_dot_o($audioc_objs)) -################################################################## status items - -status_items="basename status num_played mtime bitrate frequency file_size -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 artist title year album -comment max_chunk_size" - -result= -for i in $status_items; do - result="$result SI_$(echo $i | tr 'a-z' 'A-Z'), " -done -AC_DEFINE_UNQUOTED(STATUS_ITEM_ENUM, [$result], - [enum of all status items]) - -result= -for i in $status_items; do - result="$result \"$i\", " -done -AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result], - [char * array of all status items]) AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers", [formats supported by para_server and para_afh]) - AC_SUBST(executables) AC_OUTPUT @@ -844,6 +873,7 @@ id3 version 2 support: $HAVE_ID3TAG faad: $HAVE_FAAD audio format handlers: $audio_format_handlers +exe: $executables para_server: $build_server para_gui: $build_gui para_mixer: $build_mixer