X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=ff27cb41d4d1314c0f0edc6eaf3df5cd0902a075;hp=5b46c170185abd4143d36356b21c7f7bd95391b1;hb=94fa6ad6ec3068227d322cb83186ff8780100107;hpb=858cf06b1b89dfa8b561ba270045e8fd5112a808

diff --git a/configure.ac b/configure.ac
index 5b46c170..ff27cb41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_C_BIGENDIAN()
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
-
+AC_REPLACE_FNMATCH
 
 AC_HEADER_DIRENT
 AC_HEADER_STDC
@@ -36,8 +36,6 @@ 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_MSG_WARN([linux/soundcard.h not found, cannot build para_fade])])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -48,12 +46,15 @@ AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_STRUCT_TM
 AC_TYPE_INT16_T
+AC_TYPE_INT32_T
+AC_TYPE_INT64_T
 AC_TYPE_MODE_T
 AC_TYPE_SSIZE_T
 AC_TYPE_UID_T
+AC_TYPE_UINT8_T
 AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
-AC_TYPE_UINT8_T
+AC_TYPE_UINT64_T
 
 # Checks for library functions.
 AC_FUNC_FORK
@@ -74,15 +75,15 @@ AC_FUNC_LSTAT
 AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 	regcomp select strchr strdup strerror strstr strtol uname \
 	fchdir gettimeofday localtime_r munmap strcasecmp strcspn \
-	strncasecmp strrchr strspn alarm], [],
+	strncasecmp strrchr strspn alarm mkdir rmdir], [],
 	[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
+daemon stat crypt http_send close_on_fork ipc acl
 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"
+client_common recv stdout filter stdin audioc write client fsck exec send_common"
 all_executables="server audiod recv filter audioc write client fsck"
 
 recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline"
@@ -116,7 +117,7 @@ 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_send fd user_list chunk_queue afs osl aft mood score attribute
-	blob playlist sha1 rbtree sched"
+	blob playlist sha1 rbtree sched acl send_common"
 server_ldflags=""
 server_audio_formats=" mp3"
 
@@ -135,7 +136,7 @@ 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_other_objs="gui gui_theme"
 gui_objs="$gui_cmdline_objs $gui_errlist_objs $gui_other_objs"
 
 ########################################################################### ssl
@@ -190,7 +191,11 @@ AC_CHECK_LIB([c], [socket],
 server_ldflags="$server_ldflags $socket_lib"
 client_ldflags="$client_ldflags $socket_lib"
 audioc_ldflags="$audioc_ldflags $socket_lib"
+audiod_ldflags="$audiod_ldflags $socket_lib"
 recv_ldflags="$recv_ldflags $socket_lib"
+AC_SEARCH_LIBS([connect],[socket],[],[
+	AC_MSG_ERROR([Fatal: Did not find connect().])
+],[])
 ########################################################################### libnsl
 AC_CHECK_LIB([c], [gethostbyname],
 	[nsl_lib=],
@@ -200,6 +205,9 @@ server_ldflags="$server_ldflags $nsl_lib"
 client_ldflags="$client_ldflags $nsl_lib"
 audioc_ldflags="$audioc_ldflags $nsl_lib"
 recv_ldflags="$recv_ldflags $nsl_lib"
+AC_SEARCH_LIBS([inet_ntoa],[nsl],[],[
+	AC_MSG_ERROR([Fatal: Did not find inet_ntoa().])
+],[])
 ########################################################################### ucred
 AC_MSG_CHECKING(for struct ucred)
 AC_TRY_LINK([
@@ -417,15 +425,34 @@ have_alsa="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
-msg="=> no alsa support for para_audiod/para_write"
-AC_CHECK_HEADERS([alsa/asoundlib.h], [], [
-	AC_MSG_WARN([no alsa/asoundlib $msg])
-	have_alsa="no"
-])
-AC_CHECK_LIB([asound], [snd_pcm_open], [], [
-	AC_MSG_WARN([no libasound $msg])
+if test "$OSTYPE" != "Linux"; then
 	have_alsa="no"
-])
+fi
+msg="=> can not build para_fade, and no alsa support for para_audiod/para_write"
+if test "$have_alsa" = "yes"; then
+	AC_CHECK_HEADER(linux/soundcard.h,
+		[extras="$extras para_fade"],
+		[
+			have_alsa="no"
+			AC_MSG_WARN([no linux/soundcard.h $msg])
+		]
+	)
+fi
+
+if test "$have_alsa" = "yes"; then
+	AC_CHECK_HEADERS([alsa/asoundlib.h], [], [
+		have_alsa="no"
+		AC_MSG_WARN([no alsa/asoundlib $msg])
+	])
+fi
+
+if test "$have_alsa" = "yes"; then
+	AC_CHECK_LIB([asound], [snd_pcm_open], [], [
+		have_alsa="no"
+		AC_MSG_WARN([no libasound $msg])
+	])
+fi
+
 if test "$have_alsa" = "yes"; then
 	all_errlist_objs="$all_errlist_objs alsa_write"
 	audiod_errlist_objs="$audiod_errlist_objs alsa_write"