From 8c1de23bb1ffc739340931a02452af55fa1af516 Mon Sep 17 00:00:00 2001 From: Sumit Bose Date: Wed, 27 Aug 2014 18:27:07 +0200 Subject: [PATCH] libwbclient: make build optional --- Makefile.am | 8 +++++++- configure.ac | 1 + src/conf_macros.m4 | 16 ++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 1b183d0..cf46135 100644 --- a/Makefile.am +++ b/Makefile.am @@ -733,9 +733,12 @@ endif # BUILD_IFP lib_LTLIBRARIES = libipa_hbac.la \ libsss_idmap.la \ libsss_nss_idmap.la \ - libwbclient.la \ $(NULL) +if BUILD_LIBWBCLIENT +lib_LTLIBRARIES += libwbclient.la +endif #BUILD_LIBWBCLIENT + pkgconfig_DATA += src/providers/ipa/ipa_hbac.pc libipa_hbac_la_DEPENDENCIES = src/providers/ipa/ipa_hbac.exports libipa_hbac_la_SOURCES = \ @@ -775,7 +778,10 @@ libsss_nss_idmap_la_LDFLAGS = \ dist_noinst_DATA += src/sss_client/idmap/sss_nss_idmap.exports +if BUILD_LIBWBCLIENT pkgconfig_DATA += src/sss_client/libwbclient/wbclient.pc +endif #BUILD_LIBWBCLIENT + EXTRA_libwbclient_la_DEPENDENCIES = src/sss_client/libwbclient/wbclient.exports libwbclient_la_SOURCES = \ src/sss_client/libwbclient/wbc_guid.c \ diff --git a/configure.ac b/configure.ac index d20cb9c..7a94272 100644 --- a/configure.ac +++ b/configure.ac @@ -123,6 +123,7 @@ WITH_IFP WITH_CRYPTO WITH_SYSLOG WITH_SAMBA +WITH_LIBWBCLIENT m4_include([src/external/pkg.m4]) m4_include([src/external/libpopt.m4]) diff --git a/src/conf_macros.m4 b/src/conf_macros.m4 index 3c9827b..0bc94f9 100644 --- a/src/conf_macros.m4 +++ b/src/conf_macros.m4 @@ -669,6 +669,22 @@ AC_DEFUN([WITH_IFP], AM_CONDITIONAL([BUILD_IFP], [test x"$with_infopipe" = xyes]) ]) +AC_DEFUN([WITH_LIBWBCLIENT], + [ AC_ARG_WITH([libwbclient], + [AC_HELP_STRING([--with-libwbclient], + [Whether to build SSSD implementation of libwbclient [yes]] + ) + ], + [with_libwbclient=$withval], + with_libwbclient=yes + ) + + if test x"$with_libwbclient" = xyes; then + AC_DEFINE(BUILD_LIBWBCLIENT, 1, [whether to build SSSD implementation of libwbclient]) + fi + AM_CONDITIONAL([BUILD_LIBWBCLIENT], [test x"$with_libwbclient" = xyes]) + ]) + AC_DEFUN([WITH_SAMBA], [ AC_ARG_WITH([samba], [AC_HELP_STRING([--with-samba], -- 1.8.3.1