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

diff --git a/configure.ac b/configure.ac
index 5e2d2b9a..89720902 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
@@ -201,6 +215,35 @@ if test "$have_ogg" = "yes"; then
 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], [], [
@@ -236,12 +279,19 @@ if test "$have_alsa" = "yes"; then
 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)
@@ -343,13 +393,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