X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=4dcf0f2b795161e5ee3e00f2a27e02948fed1a40;hp=5e2d2b9aafb98ed7365acb55c0847015e330a1cb;hb=e7a40750746aa95f665629e0453e962d55897e36;hpb=bebec43faf068f44fcd5eb2c67bbdb2c1db23534

diff --git a/configure.ac b/configure.ac
index 5e2d2b9a..4dcf0f2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,30 +57,37 @@ AC_CHECK_LIB([menu], [new_menu], [extras="$extras para_dbadm"],
 
 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"
+	dccp fd sched stdout"
 recv_ldflags=""
 
 filter_cmdline_objs="filter.cmdline compress_filter.cmdline"
-filter_errlist_objs="filter_chain wav compress filter string"
+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"
+	http_recv.cmdline dccp_recv.cmdline file_write.cmdline"
 audiod_errlist_objs="audiod exec close_on_fork signal string daemon stat net
-	time grab_client filter_chain wav compress http_recv dccp dccp_recv recv_common fd"
+	time grab_client filter_chain wav compress http_recv dccp dccp_recv
+	recv_common fd sched write_common file_writer audiod_command"
 audiod_ldflags=""
 
 server_cmdline_objs="server.cmdline"
-server_errlist_objs="server mp3 afs command net string signal random_selector
+server_errlist_objs="server mp3_afh afs command net string signal random_selector
 	time daemon stat crypt http_send db close_on_fork playlist_selector
 	ipc dccp dccp_send fd"
 server_ldflags=""
 
-write_cmdline_objs="write.cmdline"
-write_errlist_objs="write write_common file_writer time fd string"
+write_cmdline_objs="write.cmdline file_write.cmdline"
+write_errlist_objs="write write_common file_writer time fd string sched stdin"
 write_ldflags=""
 write_writers="file"
 
+client_cmdline_objs="client.cmdline"
+client_errlist_objs="client net string crypt"
+client_ldflags=""
 
 ########################################################################### ssl
 dnl @synopsis CHECK_SSL
@@ -125,10 +132,11 @@ AC_DEFUN([CHECK_SSL],
 ])dnl
 
 AC_ARG_ENABLE(ssldir, [AS_HELP_STRING(--enable-ssldir=path,
-                [Search for openssl also in path.])])
+	[Search for openssl also in path.])])
 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"
 
 ########################################################################### ucred
 
@@ -144,6 +152,31 @@ if test ${have_ucred} = yes; then
 	AC_DEFINE(HAVE_UCRED, 1, define to 1 you have struct ucred)
 fi
 
+########################################################################### osx
+
+AC_MSG_CHECKING(for CoreAudio (MacOs))
+AC_TRY_LINK([
+	#include <CoreAudio/CoreAudio.h>
+],[
+	AudioDeviceID id;
+],[have_core_audio=yes],[have_core_audio=no])
+AC_MSG_RESULT($have_core_audio)
+if test ${have_core_audio} = yes; then
+	f1="-framework CoreAudio"
+	f2="-framework AudioToolbox"
+	f3="-framework AudioUnit"
+	f4="-framework CoreServices"
+	f="$f1 $f2 $f3 $f4"
+	audiod_errlist_objs="$audiod_errlist_objs osx_writer"
+	audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline"
+	audiod_ldflags="$audiod_ldflags $f"
+
+	write_errlist_objs="$write_errlist_objs osx_writer"
+	write_cmdline_objs="$write_cmdline_objs osx_write.cmdline"
+	write_ldflags="$write_ldflags $f"
+	write_writers="$write_writers osx"
+	AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on MacOs)
+fi
 ########################################################################### gtk2
 
 pkg_modules="gtk+-2.0 >= 2.0.0"
@@ -162,6 +195,18 @@ AC_CHECK_HEADER(SDL/SDL.h, [],
 
 ########################################################################### mysql
 have_mysql="yes"
+AC_ARG_ENABLE(mysql_headers, [AC_HELP_STRING(--enable-mysql-headers=dir,
+	[look for mysql.h also in dir])])
+if test -n "$enable_mysql_headers"; then
+	mysql_cppflags="-I$enable_mysql_headers"
+	CPPFLAGS="$CPPFLAGS $mysql_cppflags"
+fi
+AC_ARG_ENABLE(mysql_libs, [AC_HELP_STRING(--enable-mysql-libs=dir,
+	[look for libmysqlclient also in dir])])
+if test -n "$enable_mysql_libs"; then
+	mysql_libs="-L$enable_mysql_libs"
+	LDFLAGS="$LDFLAGS $mysql_libs"
+fi
 AC_CHECK_HEADER(mysql/mysql.h, [], [
 	have_mysql="no"
 ])
@@ -169,8 +214,10 @@ AC_CHECK_LIB([mysqlclient], [mysql_init], [], [
 	have_mysql="no"
 ])
 if test "$have_mysql" = "yes"; then
-	server_ldflags="$server_ldflags -lmysqlclient"
+	server_ldflags="$server_ldflags $mysql_libs -lmysqlclient"
 	server_errlist_objs="$server_errlist_objs mysql_selector"
+	AC_SUBST(mysql_cppflags)
+	AC_SUBST(mysql_libs)
 	AC_DEFINE(HAVE_MYSQL, 1, [define to 1 to turn on mysql support])
 else
 	AC_MSG_WARN([cannot build mysql-based audio file selector])
@@ -195,12 +242,41 @@ if test "$have_ogg" = "yes"; then
 	filter_cmdline_objs="$filter_cmdline_objs oggdec_filter.cmdline"
 	audiod_cmdline_objs="$audiod_cmdline_objs oggdec_filter.cmdline"
 
-	server_errlist_objs="$server_errlist_objs ogg"
+	server_errlist_objs="$server_errlist_objs ogg_afh"
 	filter_errlist_objs="$filter_errlist_objs oggdec"
 	audiod_errlist_objs="$audiod_errlist_objs oggdec"
 else
 	AC_MSG_WARN([no ogg vorbis support in para_server/para_filter])
 fi
+########################################################################### faad
+have_faad=yes
+AC_ARG_ENABLE(faad_headers, [AC_HELP_STRING(--enable-faad-headers=dir,
+	[look for neaacdec.h also in dir])])
+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,
+	[look for libfaad also in dir])])
+if test -n "$enable_faad_libs"; then
+	faad_libs="-L$enable_faad_libs"
+	LDFLAGS="$LDFLAGS $faad_libs"
+fi
+AC_CHECK_HEADER(neaacdec.h, [], have_faad=no)
+AC_CHECK_LIB([faad], [NeAACDecOpen], [], have_faad=no)
+if test "$have_faad" = "yes"; then
+	AC_DEFINE(HAVE_FAAD, 1, define to 1 if you want to build the aacdec filter)
+	filter_errlist_objs="$filter_errlist_objs aacdec aac_common"
+	audiod_errlist_objs="$audiod_errlist_objs aacdec aac_common"
+	server_errlist_objs="$server_errlist_objs aac_afh aac_common"
+	server_ldflags="$server_ldflags $faad_libs -lfaad"
+	filter_ldflags="$filter_ldflags $faad_libs -lfaad"
+	audiod_ldflags="$audiod_ldflags $faad_libs -lfaad"
+	AC_SUBST(faad_cppflags)
+	AC_SUBST(faad_libs)
+else
+	AC_MSG_WARN([no aac support in para_audiod/para_filter])
+fi
 ########################################################################### mad
 have_mad="yes"
 AC_CHECK_HEADERS([mad.h], [], [
@@ -220,7 +296,7 @@ else
 fi
 ########################################################################### alsa
 have_alsa="yes"
-msg="=> no alsa support for para_write"
+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"
@@ -230,18 +306,30 @@ AC_CHECK_LIB([asound], [snd_pcm_open], [], [
 	have_alsa="no"
 ])
 if test "$have_alsa" = "yes"; then
+	audiod_errlist_objs="$audiod_errlist_objs alsa_writer"
+	audiod_cmdline_objs="$audiod_cmdline_objs alsa_write.cmdline"
+	audiod_ldflags="$audiod_ldflags -lasound"
+
 	write_errlist_objs="$write_errlist_objs alsa_writer"
+	write_cmdline_objs="$write_cmdline_objs alsa_write.cmdline"
 	write_ldflags="$write_ldflags -lasound"
 	write_writers="$write_writers alsa"
 fi
 ########################################################################### ortp
 have_ortp="yes"
-AC_CHECK_HEADERS([ortp/ortp.h], [], [
-	have_ortp="no"
-])
-AC_CHECK_LIB([ortp], [ortp_init], [], [
-	have_ortp="no"
-])
+AC_ARG_ENABLE(ortp, AC_HELP_STRING([--disable-ortp], [Disable ortp support]),
+	if test x$enableval = xno; then
+		have_ortp=no
+	fi
+)
+if test "$have_ortp" = "yes"; then
+	AC_CHECK_HEADERS([ortp/ortp.h], [], [
+		have_ortp="no"
+	])
+	AC_CHECK_LIB([ortp], [ortp_init], [], [
+		have_ortp="no"
+	])
+fi
 if test "$have_ortp" = "yes"; then
 	recv_cmdline_objs="$recv_cmdline_objs ortp_recv.cmdline"
 	recv_errlist_objs="$recv_errlist_objs ortp_recv"
@@ -257,7 +345,7 @@ if test "$have_ortp" = "yes"; then
 	AC_DEFINE(HAVE_ORTP, 1, [define to 1 to turn on ortp support])
 
 else
-	AC_MSG_WARN([deactivating ortp support])
+	AC_MSG_NOTICE([deactivating ortp support])
 fi
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
@@ -297,6 +385,8 @@ filter_objs="$filter_cmdline_objs $filter_errlist_objs"
 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)
@@ -323,6 +413,15 @@ AC_SUBST(write_ldflags, $write_ldflags)
 AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS,
 	objlist_to_errlist($write_errlist_objs), errors used by para_write)
 
+AC_SUBST(client_objs, add_dot_o($client_objs))
+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)
@@ -343,13 +442,14 @@ AC_SUBST(gui_objs, add_dot_o($gui_objs))
 
 AC_OUTPUT
 AC_MSG_NOTICE([creating Makefile.deps])
-gcc -MM -MG *.c > Makefile.deps
+gcc -MM -MG $mysql_cppflags $faad_cppflags *.c > Makefile.deps
 AC_MSG_NOTICE([
 paraslash configuration:
 ~~~~~~~~~~~~~~~~~~~~~~~~
 mysql support: $have_mysql
 ogg vorbis support: $have_ogg
 mp3dec support (libmad): $have_mad
+aac support (libfaad): $have_faad
 ortp support: $have_ortp
 unix socket credentials: $have_ucred
 supported writers for para_write: $write_writers