X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=e8b2118cdede3d2a1ebabbe751cbaf2b2b741cec;hp=f47a56df0c96f71d68e19b3655aa017925536a83;hb=38c80b2b03dc357fbc28f8ba04764f1e1741078a;hpb=d5738d17b54186db8c9c7f119a03b58382ae9be4 diff --git a/configure.ac b/configure.ac index f47a56df..e8b2118c 100644 --- a/configure.ac +++ b/configure.ac @@ -31,12 +31,12 @@ AC_REPLACE_FNMATCH AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT +AC_HEADER_STDBOOL 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])]) - # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_C_INLINE @@ -45,6 +45,7 @@ AC_TYPE_PID_T AC_TYPE_SIZE_T AC_HEADER_TIME AC_STRUCT_TM +AC_TYPE_INT8_T AC_TYPE_INT16_T AC_TYPE_INT32_T AC_TYPE_INT64_T @@ -75,7 +76,7 @@ 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 mkdir rmdir], [], + strncasecmp strrchr strspn alarm mkdir inet_ntoa socket], [], [AC_MSG_ERROR([function not found, cannot live without it])]) cmdline_dir="cmdline" @@ -132,7 +133,7 @@ server_errlist_objs="server afh_common mp3_afh vss command net string signal ipc dccp_send fd user_list chunk_queue afs aft mood score attribute blob playlist sha1 sched acl send_common udp_send color fec server_command_list afs_command_list wma_afh wma_common" -server_ldflags="-losl" +server_ldflags="" server_audio_formats="mp3 wma" write_cmdline_objs="add_cmdline(write file_write)" @@ -267,7 +268,7 @@ else extras="$extras server" executables="$executables server" AC_SUBST(osl_cppflags) - server_ldflags="$server_ldflags -L$with_osl_libs" + server_ldflags="$server_ldflags $osl_libs -losl" fi CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" @@ -735,7 +736,6 @@ AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result], AC_DEFINE_UNQUOTED(SERVER_AUDIO_FORMATS, "$server_audio_formats", [formats supported by para_server and para_afh]) - AC_SUBST(executables, add_para($executables)) recv_objs="$recv_cmdline_objs $recv_errlist_objs"