X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=721c5c0c16b982af7d4f01257968fb192a9fd6d8;hp=b50665aa389b4bf2cefed09f4c7adcec00d130f5;hb=4c80bf4a2082c4922094f7e8ce75193edb6be80f;hpb=1e2990131a4c26662aa89df52f1ffeba922bf46d diff --git a/configure.ac b/configure.ac index b50665aa..721c5c0c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.53) +AC_PREREQ(2.60) AC_INIT(paraslash, [git], maan@systemlinux.org) @@ -16,7 +16,7 @@ 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 malloc.h], \ + string.h sys/socket.h sys/time.h sys/timeb.h sys/un.h sys/ipc.h unistd.h utime.h], \ [], [AC_MSG_ERROR([$ac_header not found])]) AC_CHECK_HEADER(linux/soundcard.h, [extras="$extras para_fade"], @@ -64,11 +64,15 @@ filter_cmdline_objs="filter.cmdline compress_filter.cmdline" filter_errlist_objs="filter_chain wav compress filter string stdin stdout sched fd" filter_ldflags="" +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" -audiod_errlist_objs="audiod exec close_on_fork signal string daemon stat net + http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline" +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_writer audiod_command" + recv_common fd sched write_common file_writer audiod_command crypt + client_common" audiod_ldflags="" server_cmdline_objs="server.cmdline" @@ -83,7 +87,7 @@ write_ldflags="" write_writers="file" client_cmdline_objs="client.cmdline" -client_errlist_objs="client net string crypt" +client_errlist_objs="client net string crypt fd sched stdin stdout client_common" client_ldflags="" ########################################################################### ssl @@ -134,6 +138,7 @@ if test "$enable_ssldir" = "yes"; then enable_ssldir=""; fi CHECK_SSL($enable_ssldir) server_ldflags="$srver_ldflags $SSL_LDFLAGS $SSL_LIBS" client_ldflags="$client_ldflags $SSL_LDFLAGS $SSL_LIBS" +audiod_ldflags="$audiod_ldflags $SSL_LDFLAGS $SSL_LIBS" ########################################################################### ucred @@ -177,11 +182,16 @@ fi ########################################################################### gtk2 pkg_modules="gtk+-2.0 >= 2.0.0" -PKG_CHECK_MODULES(GTK, [$pkg_modules], [extras="$extras para_krell.so"], [ - AC_MSG_WARN([gtk+-2 not found, can not build para_krell]) -]) -AC_SUBST(GTK_CFLAGS) -AC_SUBST(GTK_LIBS) +build_para_krell="yes" +PKG_CHECK_MODULES(GTK, [$pkg_modules], [], [build_para_krell="no"]) +AC_CHECK_HEADER(gkrellm2/gkrellm.h, [], [build_para_krell="no"]) +if test build_para_krell = "yes"; then + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + extras="$extras para_krell.so" +else + AC_MSG_WARN([can not build para_krell]) +fi ########################################################################### sdl AC_CHECK_LIB([SDL_image], [SDL_Init], [extras="$extras para_sdl_gui"], [ @@ -253,7 +263,7 @@ if test -n "$enable_faad_headers"; then faad_cppflags="-I$enable_faad_headers" CPPFLAGS="$CPPFLAGS $faad_cppflags" fi -AC_ARG_ENABLE(faad_libs, [AC_HELP_STRING(--enable-fadd-libs=dir, +AC_ARG_ENABLE(faad_libs, [AC_HELP_STRING(--enable-faad-libs=dir, [look for libfaad also in dir])]) if test -n "$enable_faad_libs"; then faad_libs="-L$enable_faad_libs" @@ -276,6 +286,18 @@ else fi ########################################################################### mad have_mad="yes" +AC_ARG_ENABLE(mad_headers, [AC_HELP_STRING(--enable-mad-headers=dir, + [look for mad.h also in dir])]) +if test -n "$enable_mad_headers"; then + mad_cppflags="-I$enable_mad_headers" + CPPFLAGS="$CPPFLAGS $mad_cppflags" +fi +AC_ARG_ENABLE(mad_libs, [AC_HELP_STRING(--enable-mad-libs=dir, + [look for libmad also in dir])]) +if test -n "$enable_mad_libs"; then + mad_libs="-L$enable_mad_libs" + LDFLAGS="$LDFLAGS $mad_libs" +fi AC_CHECK_HEADERS([mad.h], [], [ have_mad="no" ]) @@ -286,8 +308,10 @@ if test "$have_mad" = "yes"; then AC_DEFINE(HAVE_MAD, 1, define to 1 if you want to build the mp3dec filter) filter_errlist_objs="$filter_errlist_objs mp3dec" audiod_errlist_objs="$audiod_errlist_objs mp3dec" - filter_ldflags="$filter_ldflags -lmad" - audiod_ldflags="$audiod_ldflags -lmad" + filter_ldflags="$filter_ldflags $mad_libs -lmad" + audiod_ldflags="$audiod_ldflags $mad_libs -lmad" + AC_SUBST(mad_cppflags) + AC_SUBST(mad_libs) else AC_MSG_WARN([no mp3dec support in para_audiod/para_filter]) fi @@ -383,6 +407,7 @@ audiod_objs="$audiod_cmdline_objs $audiod_errlist_objs" server_objs="$server_cmdline_objs $server_errlist_objs" write_objs="$write_cmdline_objs $write_errlist_objs" client_objs="$client_cmdline_objs $client_errlist_objs" +audioc_objs="$audioc_cmdline_objs $audioc_errlist_objs" AC_SUBST(recv_objs, add_dot_o($recv_objs)) AC_SUBST(recv_ldflags, $recv_ldflags) @@ -414,6 +439,10 @@ AC_SUBST(client_ldflags, $client_ldflags) AC_DEFINE_UNQUOTED(INIT_CLIENT_ERRLISTS, objlist_to_errlist($client_errlist_objs), errors used by para_client) +AC_SUBST(audioc_objs, add_dot_o($audioc_objs)) +AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS, + objlist_to_errlist($audioc_errlist_objs), errors used by para_audioc) + enum="$(for i in $write_writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)" AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS, enum of supported writers) @@ -434,7 +463,7 @@ AC_SUBST(gui_objs, add_dot_o($gui_objs)) AC_OUTPUT AC_MSG_NOTICE([creating Makefile.deps]) -gcc -MM -MG $mysql_cppflags $faad_cppflags *.c > Makefile.deps +gcc -MM -MG $mysql_cppflags $faad_cppflags $mad_cppflags *.c > Makefile.deps AC_MSG_NOTICE([ paraslash configuration: ~~~~~~~~~~~~~~~~~~~~~~~~