X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=b817979f39ec79c141cd67eaaef6f49f559b5d21;hb=2bad70d84e763b4d866d7b97dbc1cdc8e030bd45;hp=54f9fe1cfec169fa544d49a673860e2b9c207ca3;hpb=ddecac81e92694005c8577ea7246caeeefe8361b;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index 54f9fe1c..b817979f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,6 +104,25 @@ if test $HAVE_OPENSSL = yes; then
 	fi
 	test "$ac_cv_have_decl_RSA_set0_key" = yes &&
 		AC_DEFINE([HAVE_RSA_SET0_KEY], [1], [openssl >= 1.1])
+
+	HAVE_CRYPTO_CLEANUP_ALL_EX_DATA=yes
+	AC_CHECK_DECL([CRYPTO_cleanup_all_ex_data], [],
+		[HAVE_CRYPTO_CLEANUP_ALL_EX_DATA=no],
+		[#include <openssl/rsa.h>])
+	AC_CHECK_LIB([crypto], [CRYPTO_cleanup_all_ex_data], [],
+		[HAVE_CRYPTO_CLEANUP_ALL_EX_DATA=no])
+	test $HAVE_CRYPTO_CLEANUP_ALL_EX_DATA = yes &&
+		AC_DEFINE([HAVE_CRYPTO_CLEANUP_ALL_EX_DATA], [1],
+			[not available on FreeBSD 12])
+	HAVE_OPENSSL_THREAD_STOP=yes
+	AC_CHECK_DECL([OPENSSL_thread_stop], [],
+		[HAVE_OPENSSL_THREAD_STOP=no],
+		[#include <openssl/crypto.h>])
+	AC_CHECK_LIB([crypto], [OPENSSL_thread_stop], [],
+		[HAVE_OPENSSL_THREAD_STOP=no])
+	test $HAVE_OPENSSL_THREAD_STOP = yes &&
+		AC_DEFINE([HAVE_OPENSSL_THREAD_STOP], [1],
+			[not available on openssl-1.0])
 fi
 UNSTASH_FLAGS
 ######################################################################### gcrypt
@@ -354,11 +373,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
@@ -372,7 +396,6 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes && test -n "$BISON" && \
 		daemon
 		http_send
 		close_on_fork
-		mm
 		crypt_common
 		base64
 		ipc
@@ -418,6 +441,17 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes && test -n "$BISON" && \
 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"
@@ -836,6 +870,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