X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=b987574746a0c72d0cd8fb0e215e7b8d13097382;hp=661081cf702fe1c610dcbe7db4b3674a9d64a797;hb=b660aece99e6fbb49b21530ecfa2e30403e86689;hpb=d02f88dfc3911262174afe6017e04d70e8557a7a

diff --git a/configure.ac b/configure.ac
index 661081cf..b9875747 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"
@@ -480,7 +480,7 @@ if test "$have_curses" = "yes"; then
 	extras="$extras gui"
 	executables="$executables gui"
 else
-	AC_MSG_WARN([cannot build para_gui])
+	AC_MSG_WARN([no curses lib, cannot build para_gui])
 fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
@@ -1061,6 +1061,13 @@ AC_CHECK_HEADERS([readline/readline.h], [
 	have_readline="no"
 	AC_MSG_WARN([readline/readline.h not found, $msg])
 ])
+
+if test "$have_curses" != "yes"; then
+	have_readline="no"
+	AC_MSG_WARN([interactive cli support depends on curses,])
+	AC_MSG_WARN([but no curses lib was detected, $msg])
+fi
+
 if test "$have_readline" = "yes"; then
 	readline_libs="$readline_libs -lreadline"
 	AC_SEARCH_LIBS([rl_free_keymap], [readline], [], [have_readline="no"])
@@ -1100,6 +1107,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