X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=e3d1b40eabce19c8fc4168a59451af8a4dfc3866;hp=6f0fbc0c0423190acc9600dd4507afd9ccac5e23;hb=aa74a903545250506fd4c29791e6f4aef3a01c41;hpb=24758c5f17064273786e704b84ceff56c234e347

diff --git a/configure.ac b/configure.ac
index 6f0fbc0c..e3d1b40e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,7 +102,7 @@ all_errlist_objs="mp3_afh afh_common net string signal time daemon
 	exec send_common ggo udp_recv color fec fecdec_filter
 	prebuffer_filter bitstream imdct check_wav
 	wma_afh wma_common wmadec_filter buffer_tree crypt_common
-	gui gui_theme sideband afh_recv play"
+	gui gui_theme sideband afh_recv play version"
 
 executables="recv filter audioc write client afh audiod play"
 
@@ -111,49 +111,50 @@ recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv afh_recv)"
 recv_errlist_objs="
 	http_recv recv_common recv time string net dccp_recv fd
 	sched stdout ggo udp_recv buffer_tree afh_recv afh_common
-	wma_afh wma_common mp3_afh
+	wma_afh wma_common mp3_afh version
 "
 
 recv_ldflags=""
 
 filter_cmdline_objs="add_cmdline(filter compress_filter amp_filter prebuffer_filter)"
 filter_errlist_objs="filter_common wav_filter compress_filter filter string
-	stdin stdout sched fd amp_filter ggo fecdec_filter fec
+	stdin stdout sched fd amp_filter ggo fecdec_filter fec version
 	prebuffer_filter time bitstream imdct wma_common wmadec_filter buffer_tree"
 filter_ldflags="-lm"
 filters=" compress wav amp fecdec wmadec prebuffer"
 
 audioc_cmdline_objs="add_cmdline(audioc)"
-audioc_errlist_objs="audioc string net fd"
+audioc_errlist_objs="audioc string net fd version"
 audioc_ldflags=""
 
 audiod_cmdline_objs="add_cmdline(audiod compress_filter http_recv dccp_recv file_write client amp_filter udp_recv prebuffer_filter)"
 audiod_errlist_objs="audiod signal string daemon stat net crypt_common sideband
 	time grab_client filter_common wav_filter compress_filter amp_filter http_recv dccp_recv
 	recv_common fd sched write_common file_write audiod_command fecdec_filter
-	client_common ggo udp_recv color fec prebuffer_filter
+	client_common ggo udp_recv color fec prebuffer_filter version
 	bitstream imdct wma_common wmadec_filter buffer_tree"
 audiod_ldflags="-lm"
 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"
+afh_errlist_objs="afh string fd mp3_afh afh_common time wma_afh wma_common
+	version ggo"
 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 check_wav"
+	buffer_tree ggo check_wav version"
 write_ldflags=""
 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"
+	client_common buffer_tree crypt_common version"
 client_ldflags=""
 
 gui_cmdline_objs="add_cmdline(gui)"
-gui_errlist_objs="exec signal string stat ringbuffer fd gui gui_theme"
+gui_errlist_objs="exec signal string stat ringbuffer fd gui gui_theme version time"
 gui_objs="$gui_cmdline_objs $gui_errlist_objs"
 play_errlist_objs="play fd sched ggo buffer_tree time string net
 	afh_recv afh_common
@@ -163,6 +164,7 @@ play_errlist_objs="play fd sched ggo buffer_tree time string net
 	wav_filter compress_filter amp_filter prebuffer_filter fecdec_filter
 		wmadec_filter
 	write_common file_write
+	version
 "
 play_cmdline_objs="add_cmdline(http_recv dccp_recv udp_recv afh_recv compress_filter amp_filter prebuffer_filter file_write play)"
 play_ldflags="-lm"
@@ -294,7 +296,8 @@ else
 		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"
+		send_common udp_send color fec wma_afh wma_common sideband
+		version"
 	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
@@ -462,7 +465,15 @@ 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"
@@ -483,12 +494,17 @@ fi
 AC_CHECK_HEADER(curses.h, [], [
 	have_curses="no"
 ])
-AC_CHECK_LIB([curses], [initscr], [], [
-	have_curses="no"
-])
+gui_ldflags="$curses_libs"
+AC_CHECK_LIB([ncursesw], [initscr],
+	[gui_ldflags="$curses_libs -lncursesw"], [
+		AC_CHECK_LIB([curses], [initscr],
+			[gui_ldflags="$curses_libs -lcurses"],
+			[have_curses="no"]
+		)
+	]
+)
 if test "$have_curses" = "yes"; then
 	AC_SUBST(curses_cppflags)
-	AC_DEFINE(HAVE_NCURSES, 1, [define to 1 to turn on curses support])
 	extras="$extras gui"
 	executables="$executables gui"
 else
@@ -873,7 +889,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"
+	fade_errlist_objs="$fade_errlist_objs oss_mix version"
 	all_errlist_objs="$all_errlist_objs oss_write oss_mix"
 
 	writers="$writers oss"
@@ -1255,6 +1271,7 @@ AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
 	objlist_to_errlist($audioc_errlist_objs), errors used by para_audioc)
 
 AC_SUBST(gui_objs, add_dot_o($gui_objs))
+AC_SUBST(gui_ldflags, $gui_ldflags)
 AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS,
 	objlist_to_errlist($gui_errlist_objs), errors used by para_gui)
 
@@ -1263,8 +1280,6 @@ AC_SUBST(play_ldflags, $play_ldflags)
 AC_DEFINE_UNQUOTED(INIT_PLAY_ERRLISTS,
 	objlist_to_errlist($play_errlist_objs), errors used by para_play)
 
-AC_MSG_NOTICE(play objs: $play_objs)
-
 enum="$(for i in $filters; do printf "${i}_FILTER, " | tr '[a-z]' '[A-Z]'; done)"
 AC_DEFINE_UNQUOTED(FILTER_ENUM, $enum NUM_SUPPORTED_FILTERS,
 	enum of supported filters)