X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=9056002acd7010349939e06c2b3ccc3f8cfc5b5b;hb=d440a71683940a58747de6dc32643db452d9cf54;hp=f518f89af154933ffaa64401ba1086b7e3f369c9;hpb=b3c68fd8519a426d6b6285dcb5a865670285e99a;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index f518f89a..9056002a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -291,12 +291,10 @@ AC_DEFUN([NEED_FLAC_OBJECTS], [{
 }])
 ########################################################################### faad
 STASH_FLAGS
-LIB_ARG_WITH([faad], [-lfaad -lmp4ff])
+LIB_ARG_WITH([faad], [-lfaad])
 HAVE_FAAD=yes
 AC_CHECK_HEADER(neaacdec.h, [], HAVE_FAAD=no)
-AC_CHECK_HEADER(mp4ff.h, [], HAVE_FAAD=no)
 AC_CHECK_LIB([faad], [NeAACDecOpen], [], HAVE_FAAD=no)
-AC_CHECK_LIB([mp4ff], [mp4ff_meta_get_artist], [], HAVE_FAAD=no)
 LIB_SUBST_FLAGS(faad)
 UNSTASH_FLAGS
 ########################################################################### mad
@@ -373,11 +371,16 @@ AC_CHECK_HEADER(samplerate.h, [], HAVE_SAMPLERATE=no)
 AC_CHECK_LIB([samplerate], [src_process], [], HAVE_SAMPLERATE=no)
 LIB_SUBST_FLAGS(samplerate)
 UNSTASH_FLAGS
+######################################################################### ubsan
+AC_ARG_ENABLE([ubsan], [AS_HELP_STRING(--enable-ubsan,
+	[Detect and report undefined behaviour.])],
+	[ENABLE_UBSAN=yes], [ENABLE_UBSAN=no])
+AC_SUBST(ENABLE_UBSAN)
 ######################################################################### server
 if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes && test -n "$BISON" && \
 		test -n "$FLEX"; then
 	build_server="yes"
-	executables="$executables server"
+	executables="$executables server upgrade_db"
 	server_errlist_objs="
 		server
 		afh_common
@@ -391,7 +394,6 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes && test -n "$BISON" && \
 		daemon
 		http_send
 		close_on_fork
-		mm
 		crypt_common
 		base64
 		ipc
@@ -430,13 +432,24 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes && test -n "$BISON" && \
 	NEED_OPUS_OBJECTS() && server_errlist_objs="$server_errlist_objs opus_afh opus_common"
 	NEED_FLAC_OBJECTS && server_errlist_objs="$server_errlist_objs flac_afh"
 	if test $HAVE_FAAD = yes; then
-		server_errlist_objs="$server_errlist_objs aac_afh"
+		server_errlist_objs="$server_errlist_objs aac_afh mp4"
 	fi
 	server_objs="$server_errlist_objs"
 	AC_SUBST(server_objs, add_dot_o($server_objs))
 else
 	build_server="no"
 fi
+############################################################# upgrade_db
+upgrade_db_objs='
+	crypt_common
+	exec
+	fd
+	string
+	upgrade_db
+	version
+	base64
+'
+AC_SUBST(upgrade_db_objs, add_dot_o($upgrade_db_objs))
 ############################################################# client
 if test -n "$CRYPTOLIB"; then
 	build_client="yes"
@@ -678,7 +691,7 @@ NEED_OPUS_OBJECTS && recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
 NEED_FLAC_OBJECTS && recv_errlist_objs="$recv_errlist_objs flac_afh"
 
 if test $HAVE_FAAD = yes; then
-	recv_errlist_objs="$recv_errlist_objs aac_afh"
+	recv_errlist_objs="$recv_errlist_objs aac_afh mp4"
 fi
 recv_objs="$recv_errlist_objs"
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
@@ -713,7 +726,7 @@ NEED_FLAC_OBJECTS && {
 	audio_format_handlers="$audio_format_handlers flac"
 }
 if test $HAVE_FAAD = yes; then
-	afh_errlist_objs="$afh_errlist_objs aac_afh"
+	afh_errlist_objs="$afh_errlist_objs aac_afh mp4"
 	audio_format_handlers="$audio_format_handlers aac"
 fi
 
@@ -771,7 +784,7 @@ NEED_FLAC_OBJECTS && {
 	play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh"
 }
 if test $HAVE_FAAD = yes; then
-	play_errlist_objs="$play_errlist_objs aac_afh aacdec_filter"
+	play_errlist_objs="$play_errlist_objs aac_afh aacdec_filter mp4"
 fi
 if test $HAVE_MAD = yes; then
 	play_errlist_objs="$play_errlist_objs mp3dec_filter"
@@ -855,6 +868,7 @@ id3 version 2 support: $HAVE_ID3TAG
 faad: $HAVE_FAAD
 audio format handlers: $audio_format_handlers
 
+exe: $executables
 para_server: $build_server
 para_gui: $build_gui
 para_mixer: $build_mixer