X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=16927c58e2aed1ec5e8f8a4d8ce32170312fdab8;hb=737d415498a91833cc7964fe7f8f8ff158be023b;hp=07ecffdd71f31e1246d8262bda5fbdd762212f99;hpb=334062fce5430ca7f5c63eaedb5fe0bcbdaf5a7f;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index 07ecffdd..16927c58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -440,6 +440,7 @@ if test "$have_vorbis" = "yes" || \
 fi
 if test "$have_vorbis" = "yes"; then
 	AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg/vorbis support)
+	AC_SUBST(vorbis_cppflags)
 	vorbis_ldflags="$vorbis_libs -lvorbis -lvorbisfile"
 	AC_SUBST(vorbis_ldflags)
 fi
@@ -757,7 +758,15 @@ if test "$have_readline" = "yes"; then
 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)
@@ -978,7 +987,7 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 	fi
 	if test "$have_core_audio" = "yes"; then
 		audiod_errlist_objs="$audiod_errlist_objs osx_write ipc"
-		audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline"
+		audiod_cmdline_objs="$audiod_cmdline_objs osx_write"
 	fi
 	if test "$have_vorbis" = "yes"; then
 		audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
@@ -1094,6 +1103,7 @@ if test "$have_curses" = "yes"; then
 		gui
 		gui_theme
 		time
+		sched
 		version
 		ggo
 	"
@@ -1342,7 +1352,7 @@ play_cmdline_objs="
 "
 if test "$have_core_audio" = "yes"; then
 	play_errlist_objs="$play_errlist_objs osx_write ipc"
-	play_cmdline_objs="$play_cmdline_objs osx_write.cmdline"
+	play_cmdline_objs="$play_cmdline_objs osx_write"
 fi
 if test "$have_vorbis" = "yes" || \
 		test "$have_speex" = "yes" || \
@@ -1416,7 +1426,7 @@ default_writer="FILE_WRITE"
 
 if test "$have_core_audio" = "yes"; then
 	write_errlist_objs="$write_errlist_objs osx_write ipc"
-	write_cmdline_objs="$write_cmdline_objs osx_write.cmdline"
+	write_cmdline_objs="$write_cmdline_objs osx_write"
 	writers="$writers osx"
 	default_writer="OSX_WRITE"
 fi