X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=279022dff64da1b0d9a4bb4dff4a7da101cfd4a6;hp=c6797cbfb09067c8937e519a4af346fc24c5a069;hb=d36f1dae4e1ee0756fdd885c1596fa8df8990491;hpb=00f1ce3f3871c3148c74358e3bc9ae6f089c916a

diff --git a/configure.ac b/configure.ac
index c6797cbf..279022df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,16 +7,27 @@ AC_PREREQ(2.60)
 AC_INIT(paraslash, [git], maan@systemlinux.org)
 AC_CONFIG_HEADER([config.h])
 
-########################################################################### generic
+AC_PATH_PROG(UNAMEPATH, uname, no)
+if test "$UNAMEPATH" = "no"; then
+	AC_MSG_ERROR(unable to determine system type)
+fi
+AC_MSG_CHECKING(os type)
+OSTYPE="`$UNAMEPATH -s`"
+AC_MSG_RESULT("$OSTYPE")
+
+AC_C_BIGENDIAN()
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 
+
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([arpa/inet.h ctype.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h \
-	string.h sys/socket.h sys/time.h sys/timeb.h sys/un.h sys/ipc.h unistd.h utime.h], \
+AC_CHECK_HEADERS([arpa/inet.h ctype.h fcntl.h limits.h netdb.h netinet/in.h \
+	stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h sys/un.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"], 
@@ -24,11 +35,19 @@ AC_CHECK_HEADER(linux/soundcard.h, [extras="$extras para_fade"],
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
+AC_C_INLINE
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_STRUCT_TM
+AC_TYPE_INT16_T
+AC_TYPE_MODE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UID_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT8_T
 
 # Checks for library functions.
 AC_FUNC_FORK
@@ -43,8 +62,13 @@ AC_TYPE_SIGNAL
 AC_FUNC_STAT
 AC_FUNC_STRFTIME
 AC_FUNC_VPRINTF
+AC_FUNC_CLOSEDIR_VOID
+AC_FUNC_LSTAT
+
 AC_CHECK_FUNCS([atexit dup2 gethostbyname inet_ntoa memchr memmove memset \
-	regcomp select socket strchr strdup strerror strstr strtol uname], [], 
+	regcomp select socket strchr strdup strerror strstr strtol uname \
+	fchdir gettimeofday localtime_r munmap strcasecmp strcspn \
+	strncasecmp strrchr strspn], [],
 	[AC_MSG_ERROR([function not found, cannot live without it])])
 ########################################################################### curses
 AC_CHECK_LIB([ncurses], [initscr], [], 
@@ -72,7 +96,8 @@ audioc_cmdline_objs="audioc.cmdline"
 audioc_errlist_objs="audioc string net fd"
 
 audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
-	http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline"
+	http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline
+	audiod_command_list"
 audiod_errlist_objs="audiod signal string daemon stat net
 	time grab_client filter_chain wav compress http_recv dccp dccp_recv
 	recv_common fd sched write_common file_write audiod_command crypt
@@ -80,9 +105,10 @@ 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"
+server_cmdline_objs="server.cmdline server_command_list random_selector_command_list
+	playlist_selector_command_list"
 server_errlist_objs="server mp3_afh vss command net string signal random_selector
-	time daemon stat crypt http_send db close_on_fork playlist_selector
+	time daemon stat crypt http_send afs close_on_fork playlist_selector
 	ipc dccp dccp_send fd user_list"
 server_ldflags=""
 server_audio_formats=" mp3"
@@ -91,6 +117,7 @@ write_cmdline_objs="write.cmdline file_write.cmdline"
 write_errlist_objs="write write_common file_write time fd string sched stdin"
 write_ldflags=""
 writers=" file"
+default_writer="FILE_WRITE"
 
 client_cmdline_objs="client.cmdline"
 client_errlist_objs="client net string crypt fd sched stdin stdout client_common"
@@ -182,6 +209,7 @@ if test ${have_core_audio} = yes; then
 	write_cmdline_objs="$write_cmdline_objs osx_write.cmdline"
 	write_ldflags="$write_ldflags $f"
 	writers="$writers osx"
+	default_writer="OSX_WRITE"
 	AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)
 fi
 ########################################################################### gtk2
@@ -274,6 +302,9 @@ AC_CHECK_HEADERS([ogg/ogg.h vorbis/codec.h], [], [ have_ogg="no" ])
 if test "$have_ogg" = "yes"; then
 	AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg vorbis support)
 	filters="$filters oggdec"
+	if test "$OSTYPE" = "Darwin"; then
+		oggvorbis_libs="-Wl,-bind_at_load  $oggvorbis_libs"
+	fi
 	server_ldflags="$server_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
 	filter_ldflags="$filter_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
 	audiod_ldflags="$audiod_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
@@ -403,6 +434,7 @@ if test "$have_alsa" = "yes"; then
 	write_cmdline_objs="$write_cmdline_objs alsa_write.cmdline"
 	write_ldflags="$write_ldflags -lasound"
 	writers="$writers alsa"
+	default_writer="ALSA_WRITE"
 fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
@@ -530,6 +562,7 @@ AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
 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)
+AC_DEFINE_UNQUOTED(DEFAULT_WRITER, $default_writer, use this writer if none was specified)
 names="$(for i in $writers; do printf \"$i\",' ' ; done)"
 AC_DEFINE_UNQUOTED(WRITER_NAMES, $names, supported writer names)
 inits="$(for i in $writers; do printf 'extern void '$i'_write_init(struct writer *); '; done)"