X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=170289379cb0bdb319f0ee31ef501e3ad5982624;hp=bfd659f18dbc8ae534b732269f3a3b982e350b42;hb=39ef1da5509461b18beb5b8f16ff6118c20c0ac6;hpb=773bdfd137b4d4bb350903a1cb6b25ef304b3e0a

diff --git a/configure.ac b/configure.ac
index bfd659f1..17028937 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ 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"
@@ -71,14 +71,14 @@ audiod_errlist_objs="audiod exec close_on_fork signal string daemon stat net
 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=""
 
-play_cmdline_objs="play.cmdline"
-play_errlist_objs="play time fd string"
-play_ldflags=""
+write_cmdline_objs="write.cmdline"
+write_errlist_objs="write write_common file_writer time fd string sched stdin"
+write_ldflags=""
 write_writers="file"
 
 
@@ -162,6 +162,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 +181,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 +209,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 +263,7 @@ else
 fi
 ########################################################################### alsa
 have_alsa="yes"
-msg="=> no para_play"
+msg="=> no alsa support for para_write"
 AC_CHECK_HEADERS([alsa/asoundlib.h], [], [
 	AC_MSG_WARN([no alsa/asoundlib $msg])
 	have_alsa="no"
@@ -230,18 +273,25 @@ AC_CHECK_LIB([asound], [snd_pcm_open], [], [
 	have_alsa="no"
 ])
 if test "$have_alsa" = "yes"; then
-	extras="$extras para_play"
-	play_ldflags="$play_ldflags -lasound"
+	write_errlist_objs="$write_errlist_objs alsa_writer"
+	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 +307,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)
@@ -296,7 +346,7 @@ recv_objs="$recv_cmdline_objs $recv_errlist_objs"
 filter_objs="$filter_cmdline_objs $filter_errlist_objs"
 audiod_objs="$audiod_cmdline_objs $audiod_errlist_objs"
 server_objs="$server_cmdline_objs $server_errlist_objs"
-play_objs="$play_cmdline_objs $play_errlist_objs"
+write_objs="$write_cmdline_objs $write_errlist_objs"
 
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 AC_SUBST(recv_ldflags, $recv_ldflags)
@@ -318,15 +368,15 @@ AC_SUBST(server_ldflags, $server_ldflags)
 AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS,
 	objlist_to_errlist($server_errlist_objs), errors used by para_server)
 
-AC_SUBST(play_objs, add_dot_o($play_objs))
-AC_SUBST(play_ldflags, $play_ldflags)
-AC_DEFINE_UNQUOTED(INIT_PLAY_ERRLISTS,
-	objlist_to_errlist($play_errlist_objs), errors used by para_play)
+AC_SUBST(write_objs, add_dot_o($write_objs))
+AC_SUBST(write_ldflags, $write_ldflags)
+AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS,
+	objlist_to_errlist($write_errlist_objs), errors used by para_write)
 
 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)
-names="$(for i in $write_writers; do printf '\"'$i'\", ' ; done)"
+names="$(for i in $write_writers; do printf \"$i\",' ' ; done)"
 AC_DEFINE_UNQUOTED(WRITER_NAMES, $names, supported writer names)
 inits="$(for i in $write_writers; do printf 'extern void '$i'_writer_init(struct writer *); '; done)"
 AC_DEFINE_UNQUOTED(DECLARE_WRITER_INITS, $inits, init functions of the supported writers)
@@ -343,14 +393,15 @@ 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
-alsa support (para_play): $have_alsa
+supported writers for para_write: $write_writers
 ])