Merge branch 'master' of github.com:fmorgner/umurmur

[umurmur.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index d8f476f521ae40ebe79d0364b3ec03d7e2999091..e508d80c63a180b5f67345745649876965b98ae0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@
 #  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 #  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 bin_PROGRAMS=umurmurd
-umurmurd_SOURCES=client.c main.c messages.c pds.c server.c log.c conf.c crypt.c timer.c messagehandler.c channel.c Mumble.pb-c.c voicetarget.c ban.c util.c
+umurmurd_SOURCES=client.c main.c messages.c pds.c server.c log.c conf.c crypt.c timer.c messagehandler.c channel.c Mumble.pb-c.c voicetarget.c ban.c util.c memory.c
 
 if USE_OPENSSL
 umurmurd_SOURCES+=ssli_openssl.c
@@ -35,9 +35,13 @@ else
 if USE_GNUTLS
 umurmurd_SOURCES+=ssli_gnutls.c
 else
+if USE_MBEDTLS
+umurmurd_SOURCES+=ssli_mbedtls.c
+else
 umurmurd_SOURCES+=ssli_polarssl.c
 endif
 endif
+endif
 
 if USE_SHAREDMEMORY_API
 umurmurd_SOURCES+=sharedmemory.c