X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=135a0bd9affc6c74c404d8a2c1ce38fe4bd80479;hp=f3e8fb070a2aa03254e2147c1c7392c32ad2ae24;hb=2f07d34b5d4c37606be5849b6ee51e0443707898;hpb=ff12b505b227585daf5aecc822d6b2e8841c2be7

diff --git a/configure.ac b/configure.ac
index f3e8fb07..135a0bd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,6 @@ AC_PREREQ([2.61])
 AC_INIT([paraslash],[git],[maan@systemlinux.org])
 AC_CONFIG_HEADER([config.h])
 
-AC_SUBST(install_sh, [$INSTALL])
 AC_CONFIG_FILES([Makefile])
 AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)])
 AC_DEFUN([add_para],[$(for i in $@; do printf "para_$i "; done)])
@@ -39,6 +38,7 @@ test -z "$help2man" && AC_MSG_ERROR(
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
+AC_SUBST(install_sh, [$INSTALL])
 AC_REPLACE_FNMATCH
 
 AC_HEADER_DIRENT
@@ -247,6 +247,18 @@ if test x$ac_cv_have_working_snprintf$ac_cv_have_working_vsnprintf != "xyesyes";
 AC_MSG_ERROR([fatal: buggy snprintf() detected])
 fi])
 AX_FUNC_SNPRINTF()
+################################################################## clock_gettime
+clock_gettime_lib=
+AC_CHECK_LIB([c], [clock_gettime], [clock_gettime_lib=c], [
+	AC_CHECK_LIB([rt], [clock_gettime], [clock_gettime_lib=rt], [], [])
+])
+if test -n "$clock_gettime_lib"; then
+	AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [
+		define to 1 if clock_gettime() is supported])
+fi
+if test "$clock_gettime_lib" = "rt"; then
+	AC_SUBST(clock_gettime_ldflags, -lrt)
+fi
 ########################################################################### osl
 have_osl=yes
 OLD_CPPFLAGS="$CPPFLAGS"
@@ -289,7 +301,7 @@ else
 		acl udp_send"
 
 	server_ldflags=""
-	server_audio_formats="mp3 wma"
+	audio_format_handlers="mp3 wma"
 	AC_SUBST(osl_cppflags)
 	server_ldflags="$server_ldflags $osl_libs -losl"
 fi
@@ -471,12 +483,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
@@ -637,7 +654,7 @@ if test "$have_vorbis" = "yes"; then
 	recv_errlist_objs="$recv_errlist_objs ogg_afh"
 
 	audiod_audio_formats="$audiod_audio_formats ogg"
-	server_audio_formats="$server_audio_formats ogg"
+	audio_format_handlers="$audio_format_handlers ogg"
 else
 	AC_MSG_WARN([no ogg/vorbis $msg])
 fi
@@ -661,7 +678,7 @@ if test "$have_speex" = "yes"; then
 	recv_errlist_objs="$recv_errlist_objs spx_afh spx_common"
 
 	audiod_audio_formats="$audiod_audio_formats spx"
-	server_audio_formats="$server_audio_formats spx"
+	audio_format_handlers="$audio_format_handlers spx"
 else
 	AC_MSG_WARN([no ogg/speex $msg])
 fi
@@ -705,7 +722,7 @@ if test "$have_faad" = "yes"; then
 	recv_ldflags="$afh_ldflags $faad_libs -lfaad"
 
 	audiod_audio_formats="$audiod_audio_formats aac"
-	server_audio_formats="$server_audio_formats aac"
+	audio_format_handlers="$audio_format_handlers aac"
 	filters="$filters aacdec"
 	AC_SUBST(faad_cppflags)
 else
@@ -836,7 +853,7 @@ if test "$have_flac" = "yes"; then
 	afh_ldflags="$afh_ldflags $flac_libs -lFLAC"
 	recv_ldflags="$afh_ldflags $flac_libs -lFLAC"
 	filters="$filters flacdec"
-	server_audio_formats="$server_audio_formats flac"
+	audio_format_handlers="$audio_format_handlers flac"
 	audiod_audio_formats="$audiod_audio_formats flac"
 	AC_SUBST(flac_cppflags)
 else
@@ -1186,7 +1203,7 @@ done
 AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result],
 	[char * array of all status items])
 
-AC_DEFINE_UNQUOTED(SERVER_AUDIO_FORMATS, "$server_audio_formats",
+AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers",
 	[formats supported by para_server and para_afh])
 
 AC_SUBST(executables, add_para($executables))
@@ -1243,6 +1260,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)
 
@@ -1251,8 +1269,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)
@@ -1284,10 +1300,10 @@ paraslash configuration:
 ~~~~~~~~~~~~~~~~~~~~~~~~
 unix socket credentials: $have_ucred
 readline (interactive CLIs): $have_readline
-audio formats supported by para_server/para_afh: $server_audio_formats
+audio formats handlers: $audio_format_handlers
 id3 version2 support: $have_libid3tag
-filters supported by para_audiod/para_filter: $filters
-writers supported by para_audiod/para_write: $writers
+filters: $filters
+writers: $writers
 optional executables: $extras
 $mixer_summary
 ])