X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=c80fe96903318fa1891fccae26afa7023f32c696;hp=47dc6ace9817b4da10d296b8995935100e93e447;hb=191e65bdb00536514b8051b6d8e5b4d6772e948f;hpb=06b3e7bc1b04def7488a5c5cd65de00aca655612

diff --git a/configure.ac b/configure.ac
index 47dc6ace..c80fe969 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ([2.61])
 
 
-AC_INIT([paraslash],[git],[maan@systemlinux.org])
+AC_INIT([paraslash],[0.4.14],[maan@systemlinux.org])
 AC_CONFIG_HEADER([config.h])
 
 AC_CONFIG_FILES([Makefile])
@@ -124,7 +124,14 @@ filter_ldflags="-lm"
 filters=" compress wav amp fecdec wmadec prebuffer"
 
 audioc_cmdline_objs="add_cmdline(audioc)"
-audioc_errlist_objs="audioc string net fd version"
+audioc_errlist_objs="
+	audioc
+	string
+	net
+	fd
+	version
+	ggo
+"
 audioc_ldflags=""
 
 audiod_cmdline_objs="add_cmdline(audiod compress_filter http_recv dccp_recv file_write client amp_filter udp_recv prebuffer_filter)"
@@ -138,7 +145,7 @@ audiod_audio_formats="wma"
 
 afh_cmdline_objs="add_cmdline(afh)"
 afh_errlist_objs="afh string fd mp3_afh afh_common time wma_afh wma_common
-	version"
+	version ggo"
 afh_ldflags=""
 
 write_cmdline_objs="add_cmdline(write file_write)"
@@ -149,12 +156,38 @@ writers=" file"
 default_writer="FILE_WRITE"
 
 client_cmdline_objs="add_cmdline(client)"
-client_errlist_objs="client net string fd sched stdin stdout time sideband
-	client_common buffer_tree crypt_common version"
+client_errlist_objs="
+	client
+	net
+	string
+	fd
+	sched
+	stdin
+	stdout
+	time
+	sideband
+	client_common
+	buffer_tree
+	crypt_common
+	version
+	ggo
+"
 client_ldflags=""
 
 gui_cmdline_objs="add_cmdline(gui)"
-gui_errlist_objs="exec signal string stat ringbuffer fd gui gui_theme version time"
+gui_errlist_objs="
+	exec
+	signal
+	string
+	stat
+	ringbuffer
+	fd
+	gui
+	gui_theme
+	time
+	version
+	ggo
+"
 gui_objs="$gui_cmdline_objs $gui_errlist_objs"
 play_errlist_objs="play fd sched ggo buffer_tree time string net
 	afh_recv afh_common
@@ -264,7 +297,7 @@ fi
 ########################################################################### osl
 have_osl=yes
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 AC_ARG_WITH(osl_headers, [AS_HELP_STRING(--with-osl-headers=dir,
 	[look for osl.h also in dir])])
@@ -292,12 +325,43 @@ else
 	extras="$extras server"
 	executables="$executables server"
 	server_cmdline_objs="add_cmdline(server)"
-	server_errlist_objs="server afh_common mp3_afh vss command net
-		string signal time daemon http_send close_on_fork mm
-		crypt_common ipc dccp_send fd user_list chunk_queue
-		afs aft mood score attribute blob playlist sched acl
-		send_common udp_send color fec wma_afh wma_common sideband
-		version"
+	server_errlist_objs="
+		server
+		afh_common
+		mp3_afh
+		vss command
+		net
+		string
+		signal
+		time
+		daemon
+		http_send
+		close_on_fork
+		mm
+		crypt_common
+		ipc dccp_send
+		fd
+		user_list
+		chunk_queue
+		afs
+		aft
+		mood
+		score
+		attribute
+		blob
+		playlist
+		sched
+		acl
+		send_common
+		udp_send
+		color
+		fec
+		wma_afh
+		wma_common
+		sideband
+		version
+		ggo
+	"
 	all_errlist_objs="$all_errlist_objs server vss command
 		http_send close_on_fork mm ipc dccp_send user_list
 		chunk_queue afs aft mood score attribute blob playlist
@@ -328,7 +392,7 @@ esac
 ###################################################################### openssl
 if test "$check_openssl" = "yes"; then
 	OLD_CPPFLAGS="$CPPFLAGS"
-	OLD_LD_FLAGS="$LDFLAGS"
+	OLD_LDFLAGS="$LDFLAGS"
 	OLD_LIBS="$LIBS"
 	have_openssl="yes"
 	AC_ARG_WITH(openssl_headers, [AS_HELP_STRING(--with-openssl-headers=dir,
@@ -385,7 +449,7 @@ fi
 ########################################################################### gcrypt
 if test "$check_gcrypt" = "yes"; then
 	OLD_CPPFLAGS="$CPPFLAGS"
-	OLD_LD_FLAGS="$LDFLAGS"
+	OLD_LDFLAGS="$LDFLAGS"
 	OLD_LIBS="$LIBS"
 	have_gcrypt="yes"
 	AC_ARG_WITH(gcrypt_headers, [AS_HELP_STRING(--with-gcrypt-headers=dir,
@@ -465,11 +529,19 @@ AC_MSG_RESULT($have_ucred)
 if test ${have_ucred} = yes; then
 	AC_DEFINE(HAVE_UCRED, 1, define to 1 you have struct ucred)
 fi
-
+########################################################################### gengetopt
+echo 'option "z" z "" flag off' | $gengetopt --file-name conftest-ggo &&
+AC_CHECK_DECL(
+	[gengetopt_args_info_description],
+	[ggo_descriptions_declared=yes],
+	[ggo_descriptions_declared=no],
+	[#include "conftest-ggo.h"]
+)
+AC_SUBST(ggo_descriptions_declared)
 ########################################################################### curses
 have_curses="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 AC_ARG_WITH(curses_headers, [AS_HELP_STRING(--with-curses-headers=dir,
 	[look for curses.h also in dir])])
@@ -557,10 +629,10 @@ if test ${have_core_audio} = yes; then
 	default_writer="OSX_WRITE"
 	AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)
 fi
-########################################################### ogg/vorbis/speex
+####################################################### ogg/vorbis/speex/opus
 have_ogg="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 AC_ARG_WITH(ogg_headers, [AS_HELP_STRING(--with-ogg-headers=dir,
 	[look for ogg headers also in dir])])
@@ -574,6 +646,10 @@ AC_ARG_WITH(speex_headers, [AS_HELP_STRING(--with-speex-headers=dir,
 	[look for speex headers also in dir])])
 AC_ARG_WITH(speex_libs, [AS_HELP_STRING(--with-speex-libs=dir,
 	[look for speex libs also in dir])])
+AC_ARG_WITH(opus_headers, [AS_HELP_STRING(--with-opus-headers=dir,
+	[look for opus headers also in dir])])
+AC_ARG_WITH(opus_libs, [AS_HELP_STRING(--with-opus-libs=dir,
+	[look for opus libs also in dir])])
 
 if test -n "$with_ogg_headers"; then
 	ogg_cppflags="-I$with_ogg_headers"
@@ -588,6 +664,7 @@ AC_CHECK_LIB([ogg], [ogg_stream_init], [], [ have_ogg="no" ])
 
 have_vorbis="yes"
 have_speex="yes"
+have_opus="yes"
 if test "$have_ogg" = "yes"; then
 	# vorbis
 	if test -n "$with_vorbis_headers"; then
@@ -612,14 +689,29 @@ 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" ])
+
+	# opus
+	if test -n "$with_opus_headers"; then
+		opus_cppflags="-I$with_opus_headers"
+		CPPFLAGS="$CPPFLAGS $opus_cppflags"
+	fi
+	if test -n "$with_opus_libs"; then
+		opus_libs="-L$with_opus_libs"
+		LDFLAGS="$LDFLAGS $opus_libs"
+	fi
+	AC_CHECK_LIB([opus], [opus_multistream_decode], [], [ have_opus="no" ])
+	AC_CHECK_HEADERS([opus/opus.h], [], [ have_opus="no" ])
 else
-	AC_MSG_WARN([vorbis/speex depend on libogg, which was not detected])
+	AC_MSG_WARN([vorbis/speex/opus depend on libogg, which was not detected])
 	have_vorbis="no"
 	have_speex="no"
+	have_opus="no"
 fi
 
 msg="support in para_server/para_filter/para_afh"
-if test "$have_vorbis" = "yes" || test "$have_speex" = "yes"; then
+if test "$have_vorbis" = "yes" || \
+		test "$have_speex" = "yes" || \
+		test "$have_opus" = "yes"; then
 	AC_SUBST(ogg_cppflags)
 	ogg_libs="$ogg_libs -logg"
 	if test "$OSTYPE" = "Darwin"; then
@@ -685,13 +777,37 @@ if test "$have_speex" = "yes"; then
 else
 	AC_MSG_WARN([no ogg/speex $msg])
 fi
+if test "$have_opus" = "yes"; then
+	all_errlist_objs="$all_errlist_objs opusdec_filter opus_afh opus_common"
+	AC_DEFINE(HAVE_OPUS, 1, define to 1 to turn on ogg/opus support)
+	filters="$filters opusdec"
+	opus_libs="-lopus"
+	server_ldflags="$server_ldflags $opus_libs"
+	filter_ldflags="$filter_ldflags $opus_libs"
+	audiod_ldflags="$audiod_ldflags $opus_libs"
+	afh_ldflags="$afh_ldflags $opus_libs"
+	play_ldflags="$play_ldflags $opus_libs"
+	recv_ldflags="$recv_ldflags $opus_libs"
+
+	server_errlist_objs="$server_errlist_objs opus_afh opus_common"
+	filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common"
+	audiod_errlist_objs="$audiod_errlist_objs opusdec_filter opus_common"
+	afh_errlist_objs="$afh_errlist_objs opus_afh opus_common"
+	play_errlist_objs="$play_errlist_objs opusdec_filter opus_afh opus_common"
+	recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
+
+	audiod_audio_formats="$audiod_audio_formats opus"
+	audio_format_handlers="$audio_format_handlers opus"
+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"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 AC_ARG_WITH(faad_headers, [AS_HELP_STRING(--with-faad-headers=dir,
 	[look for neaacdec.h also in dir])])
@@ -737,7 +853,7 @@ LIBS="$OLD_LIBS"
 ########################################################################### mad
 have_mad="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 AC_ARG_WITH(mad_headers, [AS_HELP_STRING(--with-mad-headers=dir,
@@ -781,7 +897,7 @@ LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ###################################################################### libid3tag
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 have_libid3tag="yes"
@@ -822,7 +938,7 @@ LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ########################################################################### flac
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 have_flac="yes"
@@ -854,7 +970,7 @@ if test "$have_flac" = "yes"; then
 	play_ldflags="$play_ldflags $flac_libs -lFLAC"
 	server_ldflags="$server_ldflags $flac_libs -lFLAC"
 	afh_ldflags="$afh_ldflags $flac_libs -lFLAC"
-	recv_ldflags="$afh_ldflags $flac_libs -lFLAC"
+	recv_ldflags="$recv_ldflags $flac_libs -lFLAC"
 	filters="$filters flacdec"
 	audio_format_handlers="$audio_format_handlers flac"
 	audiod_audio_formats="$audiod_audio_formats flac"
@@ -867,7 +983,7 @@ LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ########################################################################### oss
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 have_oss="yes"
@@ -881,7 +997,7 @@ AC_CHECK_HEADER(sys/soundcard.h, [
 
 	write_errlist_objs="$write_errlist_objs oss_write"
 	write_cmdline_objs="$write_cmdline_objs add_cmdline(oss_write)"
-	fade_errlist_objs="$fade_errlist_objs oss_mix version"
+	fade_errlist_objs="$fade_errlist_objs oss_mix"
 	all_errlist_objs="$all_errlist_objs oss_write oss_mix"
 
 	writers="$writers oss"
@@ -908,7 +1024,7 @@ LIBS="$OLD_LIBS"
 
 ########################################################################### alsa
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 msg="=> no alsa support for para_audiod/para_write"
@@ -960,7 +1076,7 @@ if test -n "$mixers"; then
 	extras="$extras fade"
 	executables="$executables fade"
 	all_errlist_objs="$all_errlist_objs fade"
-	fade_errlist_objs="$fade_errlist_objs fade exec string fd"
+	fade_errlist_objs="$fade_errlist_objs fade exec string fd version ggo"
 	fade_cmdline_objs="add_cmdline(fade)"
 	fade_objs="$fade_cmdline_objs $fade_errlist_objs"
 	AC_SUBST(fade_objs, add_dot_o($fade_objs))
@@ -995,7 +1111,7 @@ else
 fi
 ########################################################################### libao
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 have_ao="yes"
@@ -1058,7 +1174,7 @@ LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ############################################################# readline
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 have_readline="yes"
@@ -1129,7 +1245,7 @@ LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ############################################################# libsamplerate
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 have_samplerate="yes"