X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=e423d851f11ccd2e6a950324c54c921d395581e7;hp=087002ddfa6b561ccba8ec0620192a9557053716;hb=821492dacaf35773acc59b45ef2b3c4f072581f4;hpb=0dcd678aef7c2fba0f013d808cbf1cb8da3ea330

diff --git a/configure.ac b/configure.ac
index 087002dd..e423d851 100644
--- a/configure.ac
+++ b/configure.ac
@@ -580,7 +580,11 @@ if test -n "$with_flac_libs"; then
 	LDFLAGS="$LDFLAGS $flac_libs"
 fi
 AC_CHECK_HEADER(FLAC/stream_decoder.h, [], have_flac=no)
-AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], have_flac=no, -logg -lm)
+AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], [
+	# nope, try again with -logg
+	AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [],
+		have_flac=no, -lm -logg)
+	], -lm)
 if test "$have_flac" = "yes"; then
 	AC_DEFINE(HAVE_FLAC, 1, define to 1 if you want to build the flacdec filter)
 	AC_SUBST(flac_cppflags)
@@ -728,15 +732,17 @@ AC_CHECK_HEADERS([readline/readline.h], [
 ])
 
 if test "$have_readline" = "yes"; then
-	readline_ldflags="$readline_libs -lreadline"
-	AC_SEARCH_LIBS([rl_free_keymap], [readline], [], [have_readline="no"])
+	readline_ldflags="$readline_libs"
+	AC_SEARCH_LIBS([rl_free_keymap], [readline], [
+		readline_ldflags="$readline_ldflags -lreadline"
+	], [have_readline="no"])
 	if test "$have_readline" = "no"; then # try with -lcurses
                 # clear cache
 		AC_MSG_NOTICE([trying again with -lcurses])
                 unset ac_cv_search_rl_free_keymap 2> /dev/null
 		AC_SEARCH_LIBS([rl_free_keymap], [readline], [
 			have_readline=yes
-			readline_ldflags="$readline_ldflags -lcurses"
+			readline_ldflags="$readline_ldflags -lreadline -lcurses"
 		], [], [-lcurses])
 	fi
 	if test "$have_readline" = "no"; then # try with -ltermcap
@@ -745,13 +751,21 @@ if test "$have_readline" = "yes"; then
                 unset ac_cv_search_rl_free_keymap 2> /dev/null
 		AC_SEARCH_LIBS([rl_free_keymap], [readline], [
 			have_readline=yes
-			readline_ldflags="$readline_ldflags -ltermcap"
+			readline_ldflags="$readline_ldflags -lreadline -ltermcap"
 		], [], [-ltermcap])
 	fi
 fi
 
 if test "$have_readline" = "yes"; then
-	:
+	AC_CHECK_DECL(
+		[rl_free_keymap],
+		[AC_DEFINE(RL_FREE_KEYMAP_DECLARED, 1, readline >= 6.3)],
+		[],
+		[
+			#include <stdio.h>
+			#include <readline/readline.h>
+		]
+	)
 	AC_SUBST(readline_cppflags)
 	AC_SUBST(readline_ldflags)
 	AC_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support)
@@ -924,6 +938,7 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 		amp_filter
 		udp_recv
 		prebuffer_filter
+		sync_filter
 	"
 	audiod_errlist_objs="$audiod_errlist_objs
 		audiod
@@ -961,6 +976,7 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 		wma_common
 		wmadec_filter
 		buffer_tree
+		sync_filter
 	"
 	if test "$have_openssl" = "yes"; then
 		audiod_errlist_objs="$audiod_errlist_objs crypt"
@@ -1086,6 +1102,7 @@ if test "$have_curses" = "yes"; then
 		gui
 		gui_theme
 		time
+		sched
 		version
 		ggo
 	"
@@ -1105,6 +1122,7 @@ filters="
 	fecdec
 	wmadec
 	prebuffer
+	sync
 "
 filter_errlist_objs="
 	filter_common
@@ -1129,12 +1147,14 @@ filter_errlist_objs="
 	wmadec_filter
 	buffer_tree
 	net
+	sync_filter
 "
 filter_cmdline_objs="
 	filter
 	compress_filter
 	amp_filter
 	prebuffer_filter
+	sync_filter
 "
 
 if test "$have_vorbis" = "yes"; then
@@ -1315,6 +1335,7 @@ play_errlist_objs="
 	write_common
 	file_write
 	version
+	sync_filter
 "
 play_cmdline_objs="
 	http_recv
@@ -1326,6 +1347,7 @@ play_cmdline_objs="
 	prebuffer_filter
 	file_write
 	play
+	sync_filter
 "
 if test "$have_core_audio" = "yes"; then
 	play_errlist_objs="$play_errlist_objs osx_write ipc"