From 4036d33fd2f87ef5cd8963742438753ef19551da Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Sun, 25 Sep 2016 15:14:06 +0300 Subject: [PATCH] ntlm: fix linker error in test Replace core library with individual objects to reduce the list of dependencies. --- src/core/Makefile.am | 5 +++++ src/core/sip-sec-ntlm-tests.c | 10 +++++++++- src/purple/Makefile.am | 1 - 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/core/Makefile.am b/src/core/Makefile.am index bae60e37..b7d35b0d 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -122,6 +122,11 @@ noinst_LTLIBRARIES += \ libsipe_core_tests_la_SOURCES = \ sip-sec-ntlm-tests.c +libsipe_core_tests_la_LIBADD = \ + libsipe_core_la-sipmsg.lo \ + libsipe_core_la-sipe-sign.lo \ + libsipe_core_la-sipe-utils.lo \ + libsipe_core_la-uuid.lo endif endif diff --git a/src/core/sip-sec-ntlm-tests.c b/src/core/sip-sec-ntlm-tests.c index 15bead37..2922bc0a 100644 --- a/src/core/sip-sec-ntlm-tests.c +++ b/src/core/sip-sec-ntlm-tests.c @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2011-12 SIPE Project + * Copyright (C) 2011-2016 SIPE Project * Copyright (C) 2010 pier11 * Copyright (C) 2008 Novell, Inc. * @@ -39,12 +39,20 @@ #include #include "sipmsg.h" +#include "sip-transport.h" +#include "sipe-common.h" #include "sipe-sign.h" #define _SIPE_COMPILING_TESTS #include "sip-sec-ntlm.c" #include "uuid.h" +/* stub for sipe-utils.c */ +const gchar *sip_transport_epid(SIPE_UNUSED_PARAMETER struct sipe_core_private *sipe_private) +{ + return(NULL); +} + static int successes = 0; static int failures = 0; diff --git a/src/purple/Makefile.am b/src/purple/Makefile.am index 89e5e7b3..79c84d0e 100644 --- a/src/purple/Makefile.am +++ b/src/purple/Makefile.am @@ -91,7 +91,6 @@ tests_SOURCES = tests.c tests_CFLAGS = $(libsipe_la_CFLAGS) tests_LDADD = \ ../core/libsipe_core_tests.la \ - ../core/libsipe_core.la \ ../core/libsipe_core_crypto.la \ libsipe_backend.la \ $(NSS_LIBS) \ -- 2.11.4.GIT