X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=3b524f5216e33953c95ca09e0687e9381d2785be;hp=721c5c0c16b982af7d4f01257968fb192a9fd6d8;hb=14fb4f851fef5772ecdd1bd5b55aec1ec29ae68b;hpb=062821cd9198ee19aa0b14395d93d1fa5c0048d1

diff --git a/configure.ac b/configure.ac
index 721c5c0c..3b524f52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
 	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 crypt
+	recv_common fd sched write_common file_write audiod_command crypt
 	client_common"
 audiod_ldflags=""
 
@@ -82,7 +82,7 @@ server_errlist_objs="server mp3_afh afs command net string signal random_selecto
 server_ldflags=""
 
 write_cmdline_objs="write.cmdline file_write.cmdline"
-write_errlist_objs="write write_common file_writer time fd string sched stdin"
+write_errlist_objs="write write_common file_write time fd string sched stdin"
 write_ldflags=""
 write_writers="file"
 
@@ -169,11 +169,11 @@ if test ${have_core_audio} = yes; then
 	f3="-framework AudioUnit"
 	f4="-framework CoreServices"
 	f="$f1 $f2 $f3 $f4"
-	audiod_errlist_objs="$audiod_errlist_objs osx_writer"
+	audiod_errlist_objs="$audiod_errlist_objs osx_write"
 	audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline"
 	audiod_ldflags="$audiod_ldflags $f"
 
-	write_errlist_objs="$write_errlist_objs osx_writer"
+	write_errlist_objs="$write_errlist_objs osx_write"
 	write_cmdline_objs="$write_cmdline_objs osx_write.cmdline"
 	write_ldflags="$write_ldflags $f"
 	write_writers="$write_writers osx"
@@ -202,16 +202,16 @@ AC_CHECK_HEADER(SDL/SDL.h, [],
 
 ########################################################################### mysql
 have_mysql="yes"
-AC_ARG_ENABLE(mysql_headers, [AC_HELP_STRING(--enable-mysql-headers=dir,
+AC_ARG_WITH(mysql_headers, [AC_HELP_STRING(--with-mysql-headers=dir,
 	[look for mysql.h also in dir])])
-if test -n "$enable_mysql_headers"; then
-	mysql_cppflags="-I$enable_mysql_headers"
+if test -n "$with_mysql_headers"; then
+	mysql_cppflags="-I$with_mysql_headers"
 	CPPFLAGS="$CPPFLAGS $mysql_cppflags"
 fi
-AC_ARG_ENABLE(mysql_libs, [AC_HELP_STRING(--enable-mysql-libs=dir,
+AC_ARG_WITH(mysql_libs, [AC_HELP_STRING(--with-mysql-libs=dir,
 	[look for libmysqlclient also in dir])])
-if test -n "$enable_mysql_libs"; then
-	mysql_libs="-L$enable_mysql_libs"
+if test -n "$with_mysql_libs"; then
+	mysql_libs="-L$with_mysql_libs"
 	LDFLAGS="$LDFLAGS $mysql_libs"
 fi
 AC_CHECK_HEADER(mysql/mysql.h, [], [
@@ -257,16 +257,16 @@ else
 fi
 ########################################################################### faad
 have_faad=yes
-AC_ARG_ENABLE(faad_headers, [AC_HELP_STRING(--enable-faad-headers=dir,
+AC_ARG_WITH(faad_headers, [AC_HELP_STRING(--with-faad-headers=dir,
 	[look for neaacdec.h also in dir])])
-if test -n "$enable_faad_headers"; then
-	faad_cppflags="-I$enable_faad_headers"
+if test -n "$with_faad_headers"; then
+	faad_cppflags="-I$with_faad_headers"
 	CPPFLAGS="$CPPFLAGS $faad_cppflags"
 fi
-AC_ARG_ENABLE(faad_libs, [AC_HELP_STRING(--enable-faad-libs=dir,
+AC_ARG_WITH(faad_libs, [AC_HELP_STRING(--with-faad-libs=dir,
 	[look for libfaad also in dir])])
-if test -n "$enable_faad_libs"; then
-	faad_libs="-L$enable_faad_libs"
+if test -n "$with_faad_libs"; then
+	faad_libs="-L$with_faad_libs"
 	LDFLAGS="$LDFLAGS $faad_libs"
 fi
 AC_CHECK_HEADER(neaacdec.h, [], have_faad=no)
@@ -286,16 +286,16 @@ else
 fi
 ########################################################################### mad
 have_mad="yes"
-AC_ARG_ENABLE(mad_headers, [AC_HELP_STRING(--enable-mad-headers=dir,
+AC_ARG_WITH(mad_headers, [AC_HELP_STRING(--with-mad-headers=dir,
 	[look for mad.h also in dir])])
-if test -n "$enable_mad_headers"; then
-	mad_cppflags="-I$enable_mad_headers"
+if test -n "$with_mad_headers"; then
+	mad_cppflags="-I$with_mad_headers"
 	CPPFLAGS="$CPPFLAGS $mad_cppflags"
 fi
-AC_ARG_ENABLE(mad_libs, [AC_HELP_STRING(--enable-mad-libs=dir,
+AC_ARG_WITH(mad_libs, [AC_HELP_STRING(--with-mad-libs=dir,
 	[look for libmad also in dir])])
-if test -n "$enable_mad_libs"; then
-	mad_libs="-L$enable_mad_libs"
+if test -n "$with_mad_libs"; then
+	mad_libs="-L$with_mad_libs"
 	LDFLAGS="$LDFLAGS $mad_libs"
 fi
 AC_CHECK_HEADERS([mad.h], [], [
@@ -327,11 +327,11 @@ 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_errlist_objs="$audiod_errlist_objs alsa_write"
 	audiod_cmdline_objs="$audiod_cmdline_objs alsa_write.cmdline"
 	audiod_ldflags="$audiod_ldflags -lasound"
 
-	write_errlist_objs="$write_errlist_objs alsa_writer"
+	write_errlist_objs="$write_errlist_objs alsa_write"
 	write_cmdline_objs="$write_cmdline_objs alsa_write.cmdline"
 	write_ldflags="$write_ldflags -lasound"
 	write_writers="$write_writers alsa"
@@ -448,9 +448,9 @@ AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
 	enum of supported writers)
 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)"
+inits="$(for i in $write_writers; do printf 'extern void '$i'_write_init(struct writer *); '; done)"
 AC_DEFINE_UNQUOTED(DECLARE_WRITER_INITS, $inits, init functions of the supported writers)
-array="$(for i in $write_writers; do printf '{.init = '$i'_writer_init},'; done)"
+array="$(for i in $write_writers; do printf '{.init = '$i'_write_init},'; done)"
 AC_DEFINE_UNQUOTED(WRITER_ARRAY, $array, array of supported writers)
 
 gui_cmdline_objs="gui.cmdline"