X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=a16855a0c5fc3ee9e2ee0a391ce6fcf291faedd6;hp=162818e3e97e0052d750b8309083b75030859e6b;hb=9bb2e6ed4206247fdee844c0a1f3326e85a7ab59;hpb=b399d61aff92ec82cb0adc29160a8d44dfab2ab7

diff --git a/configure.ac b/configure.ac
index 162818e3..a16855a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,13 +3,27 @@
 
 AC_PREREQ([2.61])
 
-AC_INIT([paraslash],[git],[maan@systemlinux.org])
+AC_INIT([paraslash],[0.5.1],[maan@systemlinux.org])
 AC_CONFIG_HEADER([config.h])
 
 AC_CONFIG_FILES([Makefile])
 AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)])
 AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${i}.cmdline "; 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([make_errlist_defines], \
+	$(for i in $@; do \
+		printf "DEFINE_ERRLIST($(echo $i | tr 'a-z' 'A-Z'));"; \
+	done) \
+)
+AC_DEFUN([make_para_errlists], \
+	$(for i in $@; do \
+		printf "PARA_ERRLIST($(echo $i | tr 'a-z' 'A-Z')), "; \
+	done) \
+)
+AC_DEFUN([objlist_to_errlist],[ \
+	make_errlist_defines($@) \
+	[const char **para_errlist[[]]] = {make_para_errlists($@)} \
+])
+
 AC_PATH_PROG(UNAMEPATH, uname, no)
 if test "$UNAMEPATH" = "no"; then
 	AC_MSG_ERROR(unable to determine system type)
@@ -90,8 +104,6 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 	[AC_MSG_ERROR([function not found, cannot live without it])])
 
 executables="recv filter audioc write afh play"
-audio_format_handlers="mp3 wma"
-
 ################################################################## clock_gettime
 clock_gettime_lib=
 AC_CHECK_LIB([c], [clock_gettime], [clock_gettime_lib=c], [
@@ -430,14 +442,12 @@ if test "$have_vorbis" = "yes"; then
 	AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg/vorbis support)
 	vorbis_ldflags="$vorbis_libs -lvorbis -lvorbisfile"
 	AC_SUBST(vorbis_ldflags)
-	audio_format_handlers="$audio_format_handlers ogg"
 fi
 if test "$have_speex" = "yes"; then
 	AC_DEFINE(HAVE_SPEEX, 1, define to 1 to turn on ogg/speex support)
 	AC_SUBST(speex_cppflags)
 	speex_ldflags="$speex_libs -lspeex"
 	AC_SUBST(speex_ldflags)
-	audio_format_handlers="$audio_format_handlers spx"
 else
 	AC_MSG_WARN([no ogg/speex $msg])
 fi
@@ -477,8 +487,6 @@ if test "$have_faad" = "yes"; then
 	AC_SUBST(faad_cppflags)
 	faad_ldflags="$faad_libs -lfaad"
 	AC_SUBST(faad_ldflags)
-
-	audio_format_handlers="$audio_format_handlers aac"
 fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
@@ -578,7 +586,6 @@ if test "$have_flac" = "yes"; then
 	AC_SUBST(flac_cppflags)
 	flac_ldflags="$flac_libs -lFLAC"
 	AC_SUBST(flac_ldflags)
-	audio_format_handlers="$audio_format_handlers flac"
 else
 	AC_MSG_WARN([no flac support in para_audiod/para_filter/para_afh/para_server])
 fi
@@ -720,12 +727,6 @@ AC_CHECK_HEADERS([readline/readline.h], [
 	AC_MSG_WARN([readline/readline.h not found, $msg])
 ])
 
-if test "$have_curses" != "yes"; then
-	have_readline="no"
-	AC_MSG_WARN([interactive cli support depends on curses,])
-	AC_MSG_WARN([but no curses lib was detected, $msg])
-fi
-
 if test "$have_readline" = "yes"; then
 	readline_ldflags="$readline_libs -lreadline"
 	AC_SEARCH_LIBS([rl_free_keymap], [readline], [], [have_readline="no"])
@@ -1166,6 +1167,19 @@ if test "$have_samplerate" = "yes"; then
 	filter_cmdline_objs="$filter_cmdline_objs resample_filter"
 	filters="$filters resample"
 fi
+filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs"
+
+AC_SUBST(filter_objs, add_dot_o($filter_objs))
+AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS,
+	objlist_to_errlist($filter_errlist_objs), errors used by para_filter)
+
+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)
+inits="$(for i in $filters; do printf 'extern void '$i'_filter_init(struct filter *f); '; done)"
+AC_DEFINE_UNQUOTED(DECLARE_FILTER_INITS, $inits, init functions of the supported filters)
+array="$(for i in $filters; do printf '{.name = "'$i'", .init = '$i'_filter_init},'; done)"
+AC_DEFINE_UNQUOTED(FILTER_ARRAY, $array, array of supported filters)
 ########################################################################## recv
 recv_cmdline_objs="
 	recv
@@ -1221,6 +1235,7 @@ AC_SUBST(recv_objs, add_dot_o($recv_objs))
 AC_DEFINE_UNQUOTED(INIT_RECV_ERRLISTS, objlist_to_errlist($recv_errlist_objs),
 	errors used by para_recv)
 ########################################################################### afh
+audio_format_handlers="mp3 wma"
 afh_cmdline_objs="afh"
 afh_errlist_objs="
 	afh
@@ -1241,18 +1256,22 @@ if test "$have_vorbis" = "yes" || \
 fi
 if test "$have_vorbis" = "yes"; then
 	afh_errlist_objs="$afh_errlist_objs ogg_afh"
+	audio_format_handlers="$audio_format_handlers ogg"
 fi
 if test "$have_speex" = "yes"; then
 	afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
+	audio_format_handlers="$audio_format_handlers spx"
 fi
 if test "$have_opus" = "yes"; then
 	afh_errlist_objs="$afh_errlist_objs opus_afh opus_common"
 fi
 if test "$have_faad" = "yes"; then
 	afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
+	audio_format_handlers="$audio_format_handlers aac"
 fi
 if test "$have_flac" = "yes"; then
 	afh_errlist_objs="$afh_errlist_objs flac_afh"
+	audio_format_handlers="$audio_format_handlers flac"
 fi
 
 afh_objs="add_cmdline($afh_cmdline_objs) $afh_errlist_objs"
@@ -1512,20 +1531,6 @@ AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers",
 
 AC_SUBST(executables)
 
-filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs"
-
-AC_SUBST(filter_objs, add_dot_o($filter_objs))
-AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS,
-	objlist_to_errlist($filter_errlist_objs), errors used by para_filter)
-
-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)
-inits="$(for i in $filters; do printf 'extern void '$i'_filter_init(struct filter *f); '; done)"
-AC_DEFINE_UNQUOTED(DECLARE_FILTER_INITS, $inits, init functions of the supported filters)
-array="$(for i in $filters; do printf '{.name = "'$i'", .init = '$i'_filter_init},'; done)"
-AC_DEFINE_UNQUOTED(FILTER_ARRAY, $array, array of supported filters)
-
 AC_OUTPUT
 AC_MSG_NOTICE([
 paraslash configuration: