From 479a74d45d8e15a34f83d17625db7e6c5417cd41 Mon Sep 17 00:00:00 2001 From: Sumit Bose Date: Fri, 15 Apr 2016 12:41:35 +0200 Subject: [PATCH] build: move ndr_krb5pac check to the other Samba checks --- Makefile.am | 7 ++++--- src/external/pac_responder.m4 | 14 ++++++-------- src/external/samba.m4 | 12 +++++++++++- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index 85c1256684b96406cabcf4c0f10f25ce9c7aa82b..35031f95035e8dcc323b1d81236a9a91e94cbd4e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -220,7 +220,6 @@ if HAVE_CMOCKA test_sss_idmap \ test_ipa_idmap \ test_utils \ - ad_common_tests \ dp_opt_tests \ responder-get-domains-tests \ sbus-internal-tests \ @@ -241,7 +240,6 @@ if HAVE_CMOCKA test_fo_srv \ pam-srv-tests \ test_ipa_subdom_util \ - test_ipa_subdom_server \ test_tools_colondb \ test_krb5_wait_queue \ test_cert_utils \ @@ -261,7 +259,10 @@ endif # BUILD_IFP if BUILD_SAMBA non_interactive_cmocka_based_tests += \ ad_access_filter_tests \ - ad_gpo_tests + ad_gpo_tests \ + ad_common_tests \ + test_ipa_subdom_server \ + $(NULL) endif endif # HAVE_CMOCKA diff --git a/src/external/pac_responder.m4 b/src/external/pac_responder.m4 index a9e142dc945e157d87ab8478fa63b261415a7e8d..928b1d2954cee56393e42eef86174b5af9906ef2 100644 --- a/src/external/pac_responder.m4 +++ b/src/external/pac_responder.m4 @@ -1,19 +1,12 @@ -AC_SUBST(NDR_KRB5PAC_CFLAGS) -AC_SUBST(NDR_KRB5PAC_LIBS) - AC_ARG_ENABLE([pac-responder], [AS_HELP_STRING([--enable-pac-responder], [build pac responder])], [build_pac_responder=$enableval], [build_pac_responder=yes]) -ndr_krb5pac_ok=no krb5_version_ok=no if test x$build_pac_responder = xyes then - PKG_CHECK_MODULES(NDR_KRB5PAC, ndr_krb5pac, ndr_krb5pac_ok=yes, - AC_MSG_WARN([Cannot build pac responder without libndr_krb5pac])) - AC_PATH_PROG(KRB5_CONFIG, krb5-config) AC_MSG_CHECKING(for supported MIT krb5 version) KRB5_VERSION="`$KRB5_CONFIG --version`" @@ -34,6 +27,11 @@ then esac fi -AM_CONDITIONAL([BUILD_PAC_RESPONDER], [test x$build_pac_responder = xyes -a x$ndr_krb5pac_ok = xyes -a x$krb5_version_ok = xyes ]) +if test x$with_samba != xyes +then + AC_MSG_WARN([Cannot build PAC responder without Samba]) +fi + +AM_CONDITIONAL([BUILD_PAC_RESPONDER], [test x$build_pac_responder = xyes -a x$with_samba = xyes -a x$krb5_version_ok = xyes ]) AM_COND_IF([BUILD_PAC_RESPONDER], [AC_DEFINE_UNQUOTED(HAVE_PAC_RESPONDER, 1, [Build with the PAC responder])]) diff --git a/src/external/samba.m4 b/src/external/samba.m4 index 10a553b8377280a55ba232d8f93ab2e4311c08fc..91a583a0d0f514dab40d4f65cc32b17d0368f540 100644 --- a/src/external/samba.m4 +++ b/src/external/samba.m4 @@ -2,10 +2,20 @@ AC_SUBST(NDR_NBT_CFLAGS) AC_SUBST(NDR_NBT_LIBS) AC_SUBST(SMBCLIENT_CFLAGS) AC_SUBST(SMBCLIENT_LIBS) +AC_SUBST(NDR_KRB5PAC_CFLAGS) +AC_SUBST(NDR_KRB5PAC_LIBS) if test x"$with_samba" = xyes; then PKG_CHECK_MODULES(NDR_NBT, ndr_nbt, , - AC_MSG_ERROR([[Please install Samba 4 development libraries. + AC_MSG_ERROR([[Please install Samba 4 NDR NBT development libraries. +Samba 4 libraries are necessary for building ad and ipa provider. +If you do not want to build these providers it is possible to build SSSD +without them. In this case, you will need to execute configure script +with argument --without-samba + ]])) + + PKG_CHECK_MODULES(NDR_KRB5PAC, ndr_krb5pac, , + AC_MSG_ERROR([[Please install Samba 4 NDR KRB5PAC development libraries. Samba 4 libraries are necessary for building ad and ipa provider. If you do not want to build these providers it is possible to build SSSD without them. In this case, you will need to execute configure script -- 2.1.0