X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=6f0fbc0c0423190acc9600dd4507afd9ccac5e23;hp=444f9ed112c24a499ff26e0247171a19d69d906f;hb=24758c5f;hpb=98f19256d136f8432df0228ce6406892a7d18a5b

diff --git a/configure.ac b/configure.ac
index 444f9ed1..6f0fbc0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,6 @@ AC_PREREQ([2.61])
 AC_INIT([paraslash],[git],[maan@systemlinux.org])
 AC_CONFIG_HEADER([config.h])
 
-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)])
@@ -39,6 +38,7 @@ test -z "$help2man" && AC_MSG_ERROR(
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
+AC_SUBST(install_sh, [$INSTALL])
 AC_REPLACE_FNMATCH
 
 AC_HEADER_DIRENT
@@ -100,7 +100,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 bitstream imdct
+	prebuffer_filter bitstream imdct check_wav
 	wma_afh wma_common wmadec_filter buffer_tree crypt_common
 	gui gui_theme sideband afh_recv play"
 
@@ -142,7 +142,7 @@ afh_ldflags=""
 
 write_cmdline_objs="add_cmdline(write file_write)"
 write_errlist_objs="write write_common file_write time fd string sched stdin
-	buffer_tree ggo"
+	buffer_tree ggo check_wav"
 write_ldflags=""
 writers=" file"
 default_writer="FILE_WRITE"
@@ -247,6 +247,18 @@ if test x$ac_cv_have_working_snprintf$ac_cv_have_working_vsnprintf != "xyesyes";
 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], [
+	AC_CHECK_LIB([rt], [clock_gettime], [clock_gettime_lib=rt], [], [])
+])
+if test -n "$clock_gettime_lib"; then
+	AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [
+		define to 1 if clock_gettime() is supported])
+fi
+if test "$clock_gettime_lib" = "rt"; then
+	AC_SUBST(clock_gettime_ldflags, -lrt)
+fi
 ########################################################################### osl
 have_osl=yes
 OLD_CPPFLAGS="$CPPFLAGS"
@@ -289,7 +301,7 @@ else
 		acl udp_send"
 
 	server_ldflags=""
-	server_audio_formats="mp3 wma"
+	audio_format_handlers="mp3 wma"
 	AC_SUBST(osl_cppflags)
 	server_ldflags="$server_ldflags $osl_libs -losl"
 fi
@@ -637,7 +649,7 @@ if test "$have_vorbis" = "yes"; then
 	recv_errlist_objs="$recv_errlist_objs ogg_afh"
 
 	audiod_audio_formats="$audiod_audio_formats ogg"
-	server_audio_formats="$server_audio_formats ogg"
+	audio_format_handlers="$audio_format_handlers ogg"
 else
 	AC_MSG_WARN([no ogg/vorbis $msg])
 fi
@@ -661,7 +673,7 @@ if test "$have_speex" = "yes"; then
 	recv_errlist_objs="$recv_errlist_objs spx_afh spx_common"
 
 	audiod_audio_formats="$audiod_audio_formats spx"
-	server_audio_formats="$server_audio_formats spx"
+	audio_format_handlers="$audio_format_handlers spx"
 else
 	AC_MSG_WARN([no ogg/speex $msg])
 fi
@@ -705,7 +717,7 @@ if test "$have_faad" = "yes"; then
 	recv_ldflags="$afh_ldflags $faad_libs -lfaad"
 
 	audiod_audio_formats="$audiod_audio_formats aac"
-	server_audio_formats="$server_audio_formats aac"
+	audio_format_handlers="$audio_format_handlers aac"
 	filters="$filters aacdec"
 	AC_SUBST(faad_cppflags)
 else
@@ -836,7 +848,7 @@ if test "$have_flac" = "yes"; then
 	afh_ldflags="$afh_ldflags $flac_libs -lFLAC"
 	recv_ldflags="$afh_ldflags $flac_libs -lFLAC"
 	filters="$filters flacdec"
-	server_audio_formats="$server_audio_formats flac"
+	audio_format_handlers="$audio_format_handlers flac"
 	audiod_audio_formats="$audiod_audio_formats flac"
 	AC_SUBST(flac_cppflags)
 else
@@ -1107,6 +1119,47 @@ fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
+############################################################# libsamplerate
+OLD_CPPFLAGS="$CPPFLAGS"
+OLD_LD_FLAGS="$LDFLAGS"
+OLD_LIBS="$LIBS"
+
+have_samplerate="yes"
+AC_ARG_WITH(samplerate_headers, [AS_HELP_STRING(--with-samplerate-headers=dir,
+	[look for samplerate headers also in dir])])
+if test -n "$with_samplerate_headers"; then
+	samplerate_cppflags="-I$with_samplerate_headers"
+	CPPFLAGS="$CPPFLAGS $samplerate_cppflags"
+fi
+AC_ARG_WITH(samplerate_libs, [AS_HELP_STRING(--with-samplerate-libs=dir,
+	[look for samplerate libs also in dir])])
+if test -n "$with_samplerate_libs"; then
+	samplerate_libs="-L$with_samplerate_libs"
+	LDFLAGS="$LDFLAGS $samplerate_libs"
+fi
+
+AC_CHECK_HEADER(samplerate.h, [], have_samplerate=no)
+AC_CHECK_LIB([samplerate], [src_process], [], have_samplerate=no, [])
+
+if test "$have_samplerate" = "yes"; then
+	all_errlist_objs="$all_errlist_objs resample_filter"
+	filter_errlist_objs="$filter_errlist_objs resample_filter check_wav"
+	filter_cmdline_objs="$filter_cmdline_objs add_cmdline(resample_filter)"
+	audiod_errlist_objs="$audiod_errlist_objs resample_filter check_wav"
+	audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(resample_filter)"
+	play_errlist_objs="$play_errlist_objs resample_filter check_wav"
+	play_cmdline_objs="$play_cmdline_objs add_cmdline(resample_filter)"
+	filter_ldflags="$filter_ldflags $samplerate_libs -lsamplerate"
+	audiod_ldflags="$audiod_ldflags $samplerate_libs -lsamplerate"
+	play_ldflags="$play_ldflags $samplerate_libs -lsamplerate"
+	filters="$filters resample"
+	AC_SUBST(samplerate_cppflags)
+else
+	AC_MSG_WARN([no resample support in para_audiod/para_filter])
+fi
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
 ############################################################# error2.h
 AC_MSG_NOTICE(creating error2.h)
 for i in $executables; do
@@ -1145,7 +1198,7 @@ done
 AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result],
 	[char * array of all status items])
 
-AC_DEFINE_UNQUOTED(SERVER_AUDIO_FORMATS, "$server_audio_formats",
+AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers",
 	[formats supported by para_server and para_afh])
 
 AC_SUBST(executables, add_para($executables))
@@ -1243,10 +1296,10 @@ paraslash configuration:
 ~~~~~~~~~~~~~~~~~~~~~~~~
 unix socket credentials: $have_ucred
 readline (interactive CLIs): $have_readline
-audio formats supported by para_server/para_afh: $server_audio_formats
+audio formats handlers: $audio_format_handlers
 id3 version2 support: $have_libid3tag
-filters supported by para_audiod/para_filter: $filters
-writers supported by para_audiod/para_write: $writers
+filters: $filters
+writers: $writers
 optional executables: $extras
 $mixer_summary
 ])