From a9c287bda3fc2a1e12cef2135ade96945f11ad01 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Wed, 27 Aug 2014 18:27:07 +0200
Subject: libwbclient: make build optional
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
---
 Makefile.am        | 19 +++++++++++--------
 configure.ac       |  1 +
 src/conf_macros.m4 | 16 ++++++++++++++++
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 01d1ff600..ce9063ea6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -745,7 +745,6 @@ endif # BUILD_IFP
 lib_LTLIBRARIES = libipa_hbac.la \
                   libsss_idmap.la \
                   libsss_nss_idmap.la \
-                  libwbclient.la \
                   $(NULL)
 
 pkgconfig_DATA += src/providers/ipa/ipa_hbac.pc
@@ -787,7 +786,16 @@ libsss_nss_idmap_la_LDFLAGS = \
 
 dist_noinst_DATA += src/sss_client/idmap/sss_nss_idmap.exports
 
+include_HEADERS = \
+    src/providers/ipa/ipa_hbac.h \
+    src/lib/idmap/sss_idmap.h \
+    src/sss_client/idmap/sss_nss_idmap.h \
+    $(NULL)
+
+if BUILD_LIBWBCLIENT
+lib_LTLIBRARIES += libwbclient.la
 pkgconfig_DATA += src/sss_client/libwbclient/wbclient.pc
+
 EXTRA_libwbclient_la_DEPENDENCIES = src/sss_client/libwbclient/wbclient.exports
 libwbclient_la_SOURCES = \
     src/sss_client/libwbclient/wbc_guid.c \
@@ -811,13 +819,8 @@ libwbclient_la_LDFLAGS = \
 
 dist_noinst_DATA += src/sss_client/libwbclient/wbclient.exports
 
-
-include_HEADERS = \
-    src/providers/ipa/ipa_hbac.h \
-    src/lib/idmap/sss_idmap.h \
-    src/sss_client/idmap/sss_nss_idmap.h \
-    src/sss_client/libwbclient/wbclient.h \
-    $(NULL)
+include_HEADERS += src/sss_client/libwbclient/wbclient.h
+endif #BUILD_LIBWBCLIENT
 
 if BUILD_IFP
 lib_LTLIBRARIES += libsss_simpleifp.la
diff --git a/configure.ac b/configure.ac
index 42d8e5a07..8f3465e1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,6 +132,7 @@ WITH_SYSLOG
 WITH_SAMBA
 WITH_NFS
 WITH_NFS_LIB_PATH
+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 8f8479459..c8fadd2ed 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],
-- 
cgit