X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=6f8878a3e09c5b8b30f4f42f4a43825000b3c7a9;hp=07ecffdd71f31e1246d8262bda5fbdd762212f99;hb=c685233a75d7c592ce0574382bc876d88def2a5b;hpb=56df9bb38aa4725f9244a7898d765608d8a1fffa

diff --git a/configure.ac b/configure.ac
index 07ecffdd..6f8878a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 
 AC_PREREQ([2.61])
 
-AC_INIT([paraslash],[git],[maan@systemlinux.org])
-AC_CONFIG_HEADER([config.h])
+AC_INIT([paraslash],[git],[maan@tuebingen.mpg.de])
+AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_FILES([Makefile])
 AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)])
@@ -143,7 +143,7 @@ if test "$have_osl" = "yes"; then
 else
 	AC_MSG_WARN([libosl not found, can not build para_server.
 Download libosl at
-	http://systemlinux.org/~maan/osl
+	http://people.tuebingen.mpg.de/maan/osl/
 or execute
 	git clone git://git.tuebingen.mpg.de/osl
 	])
@@ -380,11 +380,17 @@ if test -n "$with_ogg_libs"; then
 fi
 AC_CHECK_HEADERS([ogg/ogg.h], [], [ have_ogg="no"; ])
 AC_CHECK_LIB([ogg], [ogg_stream_init], [], [ have_ogg="no" ])
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
 
 have_vorbis="yes"
 have_speex="yes"
 have_opus="yes"
 if test "$have_ogg" = "yes"; then
+	OLD_CPPFLAGS="$CPPFLAGS"
+	OLD_LDFLAGS="$LDFLAGS"
+	OLD_LIBS="$LIBS"
 	# vorbis
 	if test -n "$with_vorbis_headers"; then
 		vorbis_cppflags="-I$with_vorbis_headers"
@@ -396,8 +402,14 @@ if test "$have_ogg" = "yes"; then
 	fi
 	AC_CHECK_HEADERS([vorbis/codec.h], [], [ have_vorbis="no" ])
 	AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [ have_vorbis="no" ])
+	CPPFLAGS="$OLD_CPPFLAGS"
+	LDFLAGS="$OLD_LDFLAGS"
+	LIBS="$OLD_LIBS"
 
 	# speex
+	OLD_CPPFLAGS="$CPPFLAGS"
+	OLD_LDFLAGS="$LDFLAGS"
+	OLD_LIBS="$LIBS"
 	if test -n "$with_speex_headers"; then
 		speex_cppflags="-I$with_speex_headers"
 		CPPFLAGS="$CPPFLAGS $speex_cppflags"
@@ -408,8 +420,14 @@ if test "$have_ogg" = "yes"; then
 	fi
 	AC_CHECK_LIB([speex], [speex_decoder_init], [], [ have_speex="no" ])
 	AC_CHECK_HEADERS([speex/speex.h], [], [ have_speex="no" ])
+	CPPFLAGS="$OLD_CPPFLAGS"
+	LDFLAGS="$OLD_LDFLAGS"
+	LIBS="$OLD_LIBS"
 
 	# opus
+	OLD_CPPFLAGS="$CPPFLAGS"
+	OLD_LDFLAGS="$LDFLAGS"
+	OLD_LIBS="$LIBS"
 	if test -n "$with_opus_headers"; then
 		opus_cppflags="-I$with_opus_headers"
 		CPPFLAGS="$CPPFLAGS $opus_cppflags"
@@ -420,6 +438,9 @@ if test "$have_ogg" = "yes"; then
 	fi
 	AC_CHECK_LIB([opus], [opus_multistream_decode], [], [ have_opus="no" ])
 	AC_CHECK_HEADERS([opus/opus.h], [], [ have_opus="no" ])
+	CPPFLAGS="$OLD_CPPFLAGS"
+	LDFLAGS="$OLD_LDFLAGS"
+	LIBS="$OLD_LIBS"
 else
 	AC_MSG_WARN([vorbis/speex/opus depend on libogg, which was not detected])
 	have_vorbis="no"
@@ -440,6 +461,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
@@ -460,9 +482,6 @@ if test "$have_opus" = "yes"; then
 else
 	AC_MSG_WARN([no ogg/opus $msg])
 fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
 ########################################################################### faad
 have_faad=yes
 OLD_CPPFLAGS="$CPPFLAGS"
@@ -757,7 +776,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 +1005,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 +1121,7 @@ if test "$have_curses" = "yes"; then
 		gui
 		gui_theme
 		time
+		sched
 		version
 		ggo
 	"
@@ -1342,7 +1370,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 +1444,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