Rename acl functions.

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2343053eba770383da02b2fb28bf3c198d25e795..a8efcc15496ae5d3bf39fda2b016fa119b017ed8 100644 (file)
--- 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,11 +75,11 @@ 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 dccp
+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
@@ -87,7 +88,7 @@ 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"
+       fd sched stdout"
 recv_ldflags=""
 
 receivers=" http dccp"
@@ -106,7 +107,7 @@ audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.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
+       time grab_client filter_chain wav compress http_recv dccp_recv
        recv_common fd sched write_common file_write audiod_command crypt
        client_common"
 audiod_ldflags=""
@@ -115,8 +116,8 @@ audiod_audio_formats=""
 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"
+       ipc dccp_send fd user_list chunk_queue afs osl aft mood score attribute
+       blob playlist sha1 rbtree sched acl"
 server_ldflags=""
 server_audio_formats=" mp3"
 
@@ -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"
@@ -559,7 +586,7 @@ status_flags format score audio_file_info taginfo1 taginfo2 afs_mode
 attributes_txt decoder_flags audiod_status play_time attributes_bitmap
 offset seconds_total stream_start current_time audiod_uptime image_id
 lyrics_id duration directory lyrics_name image_name path hash channels
-last_played"
+last_played num_chunks chunk_time"
 
 # $1: prefix, $2: items
 AC_DEFUN([make_enum_items], [$(