From f46d1474b7b249eda690e78b02adea981fbb058c Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: May 25 2017 11:50:42 +0000 Subject: BUILD: Fix build without ssh autoreconf -if ./configure --without-ssh make check src/tests/cmocka/test_utils-test_sss_ssh.o: In function `test_textual_public_key': src/tests/cmocka/test_sss_ssh.c:78: undefined reference to `sss_ssh_format_pubkey' src/tests/cmocka/test_sss_ssh.c:82: undefined reference to `sss_ssh_format_pubkey' src/tests/cmocka/test_sss_ssh.c:86: undefined reference to `sss_ssh_format_pubkey' src/tests/cmocka/test_sss_ssh.c:89: undefined reference to `sss_ssh_format_pubkey' src/tests/cmocka/test_sss_ssh.c:92: undefined reference to `sss_ssh_format_pubkey' src/tests/cmocka/test_utils-test_sss_ssh.o:src/tests/cmocka/test_sss_ssh.c:95: more undefined references to `sss_ssh_format_pubkey' follow collect2: error: ld returned 1 exit status Reviewed-by: Fabiano Fidêncio (cherry picked from commit d82ffa52dd4c3bb11115b1687edc189284797329) --- diff --git a/Makefile.am b/Makefile.am index 101b715..d642809 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2374,9 +2374,11 @@ test_ipa_idmap_LDADD = \ test_utils_SOURCES = \ src/tests/cmocka/test_utils.c \ - src/tests/cmocka/test_sss_ssh.c \ src/tests/cmocka/test_string_utils.c \ $(NULL) +if BUILD_SSH +test_utils_SOURCES += src/tests/cmocka/test_sss_ssh.c +endif test_utils_CFLAGS = \ $(AM_CFLAGS) test_utils_LDADD = \ diff --git a/src/tests/cmocka/test_utils.c b/src/tests/cmocka/test_utils.c index 0927369..d81a212 100644 --- a/src/tests/cmocka/test_utils.c +++ b/src/tests/cmocka/test_utils.c @@ -1916,7 +1916,9 @@ int main(int argc, const char *argv[]) cmocka_unit_test_setup_teardown(test_expand_homedir_template, setup_homedir_ctx, teardown_homedir_ctx), +#ifdef BUILD_SSH cmocka_unit_test(test_textual_public_key), +#endif cmocka_unit_test(test_replace_whitespaces), cmocka_unit_test(test_reverse_replace_whitespaces), cmocka_unit_test(test_guid_blob_to_string_buf),