X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=46985f02005acadb01c2ac6f0763c6722d5b44e2;hp=c616b0a5ce67ebf7e82bfb279984c167286313df;hb=072f54fe7a75e48d539213f2ae04a64c7eb86a4d;hpb=128c594f32be41d928df432298a013a168891ab7 diff --git a/configure.ac b/configure.ac index c616b0a5..46985f02 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ # -*- 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_PATH_PROG(UNAMEPATH, uname, no) @@ -74,7 +74,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,8 +86,6 @@ 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)]) @@ -98,7 +95,7 @@ all_errlist_objs="mp3_afh afh_common net string signal time daemon 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 audiod_command_list bitstream imdct + prebuffer_filter bitstream imdct wma_afh wma_common wmadec_filter buffer_tree crypt_common gui gui_theme sideband" @@ -125,7 +122,7 @@ audiod_cmdline_objs="add_cmdline(audiod compress_filter http_recv dccp_recv file 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" @@ -183,8 +180,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) { @@ -198,12 +195,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, ...) @@ -228,7 +225,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]) @@ -239,13 +237,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" @@ -269,13 +267,11 @@ else 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 sideband" - + 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_command_list afs_command_list" + acl udp_send" server_ldflags="" server_audio_formats="mp3 wma" @@ -305,13 +301,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" @@ -362,13 +358,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" @@ -428,13 +424,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) @@ -445,13 +441,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" @@ -477,13 +473,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) @@ -491,11 +487,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" @@ -527,17 +523,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 @@ -646,13 +642,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" @@ -687,13 +683,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" @@ -729,13 +725,13 @@ OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_libid3tag="yes" -AC_ARG_WITH(id3tag_headers, [AC_HELP_STRING(--with-id3tag-headers=dir, +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, [AC_HELP_STRING(--with-id3tag-libs=dir, +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" @@ -743,11 +739,11 @@ if test -n "$with_id3tag_libs"; then fi AC_MSG_CHECKING(for libid3tag) -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include -],[ +]], [[ struct id3_tag t = {.flags = 0}; -],[], [have_libid3tag=no]) +]])],[],[have_libid3tag=no]) AC_MSG_RESULT($have_libid3tag) if test ${have_libid3tag} = yes; then @@ -767,13 +763,13 @@ 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" @@ -824,7 +820,7 @@ AC_CHECK_HEADER(sys/soundcard.h, [ 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" ] ) ], @@ -884,13 +880,13 @@ 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" @@ -943,14 +939,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"