X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=0ecc297fa8423116d7b80e925f11e9cba496c4af;hp=bc08e74032c9063e78e44357ec0124cf8a082e66;hb=192417698d9dab017ef6108fa6e9fd5ea1dc5633;hpb=f561ba2a444fa5ad161e5c415ee0f2f83527bda7

diff --git a/configure.ac b/configure.ac
index bc08e740..0ecc297f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_CHECK_HEADERS([arpa/inet.h ctype.h fcntl.h limits.h netdb.h netinet/in.h \
 	sys/ipc.h unistd.h utime.h stddef.h],
 	[], [AC_MSG_ERROR([$ac_header not found])])
 
-AC_CHECK_HEADER(linux/soundcard.h, [extras="$extras para_fade"], 
+AC_CHECK_HEADER(linux/soundcard.h, [extras="$extras para_fade"],
 	[AC_MSG_WARN([linux/soundcard.h not found, cannot build para_fade])])
 
 # Checks for typedefs, structures, and compiler characteristics.
@@ -71,6 +71,15 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 	strncasecmp strrchr strspn alarm], [],
 	[AC_MSG_ERROR([function not found, cannot live without it])])
 
+all_errlist_objs="server mp3_afh afh_common vss command net string signal time
+daemon stat crypt http_send close_on_fork ipc dccp
+dccp_send fd user_list chunk_queue afs osl aft mood score attribute blob ringbuffer
+playlist sha1 rbtree sched audiod grab_client filter_chain wav compress
+http_recv dccp_recv recv_common write_common file_write audiod_command
+client_common recv stdout filter stdin audioc write client fsck exec"
+all_executables="server audiod recv filter audioc write client fsck"
+
+
 recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline"
 recv_errlist_objs="http_recv recv_common recv time string net dccp_recv
 	dccp fd sched stdout"
@@ -78,7 +87,6 @@ recv_ldflags=""
 
 receivers=" http dccp"
 senders=" http dccp"
-selectors=" random playlist"
 
 filter_cmdline_objs="filter.cmdline compress_filter.cmdline"
 filter_errlist_objs="filter_chain wav compress filter string stdin stdout sched fd"
@@ -99,10 +107,9 @@ audiod_errlist_objs="audiod signal string daemon stat net
 audiod_ldflags=""
 audiod_audio_formats=""
 
-server_cmdline_objs="server.cmdline server_command_list random_selector_command_list
-	playlist_selector_command_list afs_command_list"
-server_errlist_objs="server mp3_afh vss command net string signal random_selector
-	time daemon stat crypt http_send afs_common close_on_fork playlist_selector
+server_cmdline_objs="server.cmdline server_command_list afs_command_list"
+server_errlist_objs="server afh_common mp3_afh vss command net string signal
+	time daemon stat crypt http_send close_on_fork
 	ipc dccp dccp_send fd user_list chunk_queue afs osl aft mood score attribute
 	blob playlist sha1 rbtree sched"
 server_ldflags=""
@@ -121,6 +128,10 @@ client_ldflags=""
 fsck_cmdline_objs="fsck.cmdline"
 fsck_errlist_objs="osl rbtree fsck string sha1 fd"
 
+gui_cmdline_objs="gui.cmdline"
+gui_errlist_objs="exec close_on_fork signal string stat ringbuffer fd"
+gui_other_objs="gui gui_common gui_theme"
+gui_objs="$gui_cmdline_objs $gui_errlist_objs $gui_other_objs"
 
 ########################################################################### ssl
 dnl @synopsis CHECK_SSL
@@ -225,6 +236,7 @@ if test "$have_ncurses" = "yes"; then
 	AC_SUBST(ncurses_libs)
 	AC_DEFINE(HAVE_NCURSES, 1, [define to 1 to turn on ncurses support])
 	extras="$extras para_gui"
+	all_executables="$all_executables gui"
 else
 	AC_MSG_WARN([cannot build para_gui])
 fi
@@ -246,6 +258,8 @@ if test ${have_core_audio} = yes; then
 	f3="-framework AudioUnit"
 	f4="-framework CoreServices"
 	f="$f1 $f2 $f3 $f4"
+
+	all_errlist_objs="$all_errlist_objs osx_write"
 	audiod_errlist_objs="$audiod_errlist_objs osx_write"
 	audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline"
 	audiod_ldflags="$audiod_ldflags $f"
@@ -257,72 +271,6 @@ 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
-########################################################################### gtk2
-build_para_krell="yes"
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-pkg_modules="gtk+-2.0 >= 2.0.0"
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.0.4], [], [build_para_krell="no"])
-PKG_CHECK_MODULES(GTK, [$pkg_modules], [], [build_para_krell="no"])
-CPPFLAGS="$GTK_CFLAGS $GLIB_CFLAGS"
-LDFLAGS="$LDFLAGS $GTK_LIBS"
-AC_CHECK_HEADER(gkrellm2/gkrellm.h, [], [build_para_krell="no"])
-if test "$build_para_krell" = "yes"; then
-	AC_SUBST(GTK_CFLAGS)
-	AC_SUBST(GTK_LIBS)
-	extras="$extras para_krell.so"
-else
-	AC_MSG_WARN([can not build para_krell])
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
-########################################################################### sdl
-# FIXME
-AC_CHECK_LIB([SDL_image], [SDL_Init], [extras="$extras para_sdl_gui"], [
-	AC_MSG_WARN([libSDL_image not found, cannot build para_sdl_gui])
-])
-AC_CHECK_HEADER(SDL/SDL.h, [], 
-	[AC_MSG_WARN([SDL/SDL.h not found])])
-
-########################################################################### mysql
-have_mysql="yes"
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-AC_ARG_WITH(mysql_headers, [AC_HELP_STRING(--with-mysql-headers=dir,
-	[look for mysql.h also in dir])])
-if test -n "$with_mysql_headers"; then
-	mysql_cppflags="-I$with_mysql_headers"
-	CPPFLAGS="$CPPFLAGS $mysql_cppflags"
-fi
-AC_ARG_WITH(mysql_libs, [AC_HELP_STRING(--with-mysql-libs=dir,
-	[look for libmysqlclient also in dir])])
-if test -n "$with_mysql_libs"; then
-	mysql_libs="-L$with_mysql_libs"
-	LDFLAGS="$LDFLAGS $mysql_libs"
-fi
-AC_CHECK_HEADER(mysql/mysql.h, [], [
-	have_mysql="no"
-])
-AC_CHECK_LIB([mysqlclient], [mysql_init], [], [
-	have_mysql="no"
-])
-if test "$have_mysql" = "yes"; then
-	selectors="$selectors mysql"
-	server_ldflags="$server_ldflags $mysql_libs -lmysqlclient"
-	server_errlist_objs="$server_errlist_objs mysql_selector"
-	server_cmdline_objs="$server_cmdline_objs mysql_selector_command_list"
-	AC_SUBST(mysql_cppflags)
-	AC_SUBST(mysql_libs)
-	AC_DEFINE(HAVE_MYSQL, 1, [define to 1 to turn on mysql support])
-else
-	AC_MSG_WARN([cannot build mysql-based audio file selector])
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
 ########################################################################### ogg
 have_ogg="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
@@ -345,6 +293,7 @@ AC_CHECK_LIB([ogg], [ogg_stream_init], [], [ have_ogg="no" ])
 AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [ have_ogg="no" ])
 AC_CHECK_HEADERS([ogg/ogg.h vorbis/codec.h], [], [ have_ogg="no" ])
 if test "$have_ogg" = "yes"; then
+	all_errlist_objs="$all_errlist_objs oggdec ogg_afh"
 	AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg vorbis support)
 	filters="$filters oggdec"
 	if test "$OSTYPE" = "Darwin"; then
@@ -393,6 +342,7 @@ AC_CHECK_HEADER(neaacdec.h, [], have_faad=no)
 AC_CHECK_LIB([faad], [NeAACDecOpen], [], have_faad=no)
 if test "$have_faad" = "yes"; then
 	AC_DEFINE(HAVE_FAAD, 1, define to 1 if you want to build the aacdec filter)
+	all_errlist_objs="$all_errlist_objs aac_common aacdec aac_afh"
 	filter_errlist_objs="$filter_errlist_objs aacdec aac_common"
 	filter_filters="$filter_filters aacdec"
 	audiod_errlist_objs="$audiod_errlist_objs aacdec aac_common"
@@ -437,6 +387,7 @@ AC_CHECK_LIB([mad], [mad_stream_init], [], [
 ])
 if test "$have_mad" = "yes"; then
 	AC_DEFINE(HAVE_MAD, 1, define to 1 if you want to build the mp3dec filter)
+	all_errlist_objs="$all_errlist_objs mp3dec"
 	filter_errlist_objs="$filter_errlist_objs mp3dec"
 	audiod_errlist_objs="$audiod_errlist_objs mp3dec"
 	filter_ldflags="$filter_ldflags $mad_libs -lmad"
@@ -471,6 +422,7 @@ AC_CHECK_LIB([asound], [snd_pcm_open], [], [
 	have_alsa="no"
 ])
 if test "$have_alsa" = "yes"; then
+	all_errlist_objs="$all_errlist_objs alsa_write"
 	audiod_errlist_objs="$audiod_errlist_objs alsa_write"
 	audiod_cmdline_objs="$audiod_cmdline_objs alsa_write.cmdline"
 	audiod_ldflags="$audiod_ldflags -lasound"
@@ -504,6 +456,8 @@ fi
 AC_CHECK_HEADERS([ortp/ortp.h], [], [have_ortp="no"])
 AC_CHECK_LIB([ortp], [ortp_init], [], [have_ortp="no"])
 if test "$have_ortp" = "yes"; then
+	all_errlist_objs="$all_errlist_objs ortp_recv ortp_send"
+
 	recv_cmdline_objs="$recv_cmdline_objs ortp_recv.cmdline"
 	recv_errlist_objs="$recv_errlist_objs ortp_recv"
 
@@ -527,28 +481,6 @@ fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
-########################################################################### zmw
-build_slider="yes"
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-PKG_CHECK_MODULES(GTK, [$pkg_modules], [], [build_para_slider="no"])
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.0.4], [], [build_slider="no"])
-CPPFLAGS="$GTK_CFLAGS $GLIB_CFLAGS"
-LDFLAGS="$LDFLAGS $GTK_LIBS"
-AC_CHECK_HEADERS([zmw/zmw.h], [], [build_slider="no"])
-AC_CHECK_LIB([zmw], [zmw_init], [], [build_slider="no"])
-if test "$build_slider" = "no"; then
-	AC_MSG_WARN([will not build para_slider])
-else
-	extras="$extras para_slider"
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
-
-
-
 
 
 AC_SUBST(extra_binaries, [$extras])
@@ -558,10 +490,61 @@ AC_SUBST(install_sh, [$INSTALL])
 AC_CONFIG_FILES([Makefile])
 
 
-
 AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)])
 AC_DEFUN([objlist_to_errlist],[$(for i in $@; do printf "DEFINE_ERRLIST($(echo $i| tr 'a-z' 'A-Z'));"; done) [const char **para_errlist[[]]] = {$(for i in $@; do printf "PARA_ERRLIST($(echo $i | tr 'a-z' 'A-Z')), "; done) }])
 
+AC_DEFUN([define_safe_error_enums],
+[
+	exe=""
+	for i in $all_executables; do
+#		eval echo checking if $1 is linked into $i
+		for j in $(eval echo \$${i}_errlist_objs); do
+			if test $j = $1; then
+				exe="$exe $i"
+				break;
+			fi
+		done
+	done
+	#echo "$1 gets linked into $exe"
+	safe_errlists=""
+	for i in $all_errlist_objs; do
+		for j in $exe; do
+			found=0
+			for k in $(eval echo \$${j}_errlist_objs); do
+				if test $k = $i; then
+					found=1
+					break;
+				fi
+			done
+			if test $found -eq 0; then
+				break;
+			fi
+		done
+		if test $found -eq 1; then
+			safe_errlists="$safe_errlists $i"
+		fi
+	done
+	#echo "safe errlists for $1: $safe_errlists"
+	ss_defs=""
+	for i in $safe_errlists; do
+		echo "SS_ENUM($(echo $i | tr 'a-z' 'A-Z'));"
+	done
+]
+)
+
+AC_MSG_NOTICE(creating error2.h)
+for obj in $all_errlist_objs; do
+	SS="$SS SS_$(echo $obj | tr 'a-z' 'A-Z'),"
+	echo "#ifdef MAIN_INPUT_FILE_IS_$obj"
+	define_safe_error_enums($obj)
+	echo "#endif"
+done > error2.h
+AC_DEFINE_UNQUOTED(DEFINE_ERRLIST_OBJECT_ENUM,
+	[enum {$SS NUM_SS}],
+	[list of all objects that use paraslash's error facility]
+)
+
+
 recv_objs="$recv_cmdline_objs $recv_errlist_objs"
 filter_objs="$filter_cmdline_objs $filter_errlist_objs"
 audiod_objs="$audiod_cmdline_objs $audiod_errlist_objs"
@@ -611,6 +594,10 @@ AC_SUBST(audioc_ldflags, $audioc_ldflags)
 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_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS,
+	objlist_to_errlist($gui_errlist_objs), errors used by para_gui)
+
 enum="$(for i in $writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
 AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
 	enum of supported writers)
@@ -627,22 +614,13 @@ AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMATS_ENUM, $enum NUM_AUDIO_FORMATS,
 names="$(for i in $audiod_audio_formats; do printf \"$i\",' ' ; done)"
 AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMAT_ARRAY, $names, array of audio formats supported by audiod)
 
-gui_cmdline_objs="gui.cmdline"
-gui_errlist_objs="exec close_on_fork signal string stat ringbuffer fd"
-gui_other_objs="gui gui_common gui_theme"
-gui_objs="$gui_cmdline_objs $gui_errlist_objs $gui_other_objs"
-AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS,
-	objlist_to_errlist($gui_errlist_objs), errors used by para_gui)
-AC_SUBST(gui_objs, add_dot_o($gui_objs))
-
 AC_OUTPUT
 AC_MSG_NOTICE([creating Makefile.deps])
-gcc -MM -MG $mysql_cppflags $faad_cppflags $mad_cppflags $ortp_cppflags $oggvorbis_cppflags *.c > Makefile.deps
+gcc -MM -MG $faad_cppflags $mad_cppflags $ortp_cppflags $oggvorbis_cppflags *.c > Makefile.deps
 AC_MSG_NOTICE([
 paraslash configuration:
 ~~~~~~~~~~~~~~~~~~~~~~~~
 unix socket credentials: $have_ucred
-audio file selectors supported by para_server: $selectors
 audio formats supported by para_server: $server_audio_formats
 senders supported by para_server/para_send: $senders
 receivers supported by para_audiod/para_recv: $receivers