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

diff --git a/configure.ac b/configure.ac
index a83d39eb..3b524f52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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"