summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac3
-rw-r--r--src/external/libsmbclient.m45
-rw-r--r--src/external/samba.m4 (renamed from src/external/libndr_nbt.m4)10
3 files changed, 11 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 184b42718..58d3e9c47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,10 +152,9 @@ m4_include([src/external/pac_responder.m4])
m4_include([src/external/cifsidmap.m4])
m4_include([src/external/signal.m4])
m4_include([src/external/inotify.m4])
-m4_include([src/external/libndr_nbt.m4])
+m4_include([src/external/samba.m4])
m4_include([src/external/sasl.m4])
m4_include([src/external/configlib.m4])
-m4_include([src/external/libsmbclient.m4])
if test x$build_config_lib = xyes; then
m4_include([src/external/libaugeas.m4])
diff --git a/src/external/libsmbclient.m4 b/src/external/libsmbclient.m4
deleted file mode 100644
index 060b5ee14..000000000
--- a/src/external/libsmbclient.m4
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_SUBST(SMBCLIENT_CFLAGS)
-AC_SUBST(SMBCLIENT_LIBS)
-
-PKG_CHECK_MODULES(SMBCLIENT, smbclient, ,
- AC_MSG_ERROR("Please install libsmbclient development libraries"))
diff --git a/src/external/libndr_nbt.m4 b/src/external/samba.m4
index bb4f89f13..735cc5a18 100644
--- a/src/external/libndr_nbt.m4
+++ b/src/external/samba.m4
@@ -1,5 +1,7 @@
AC_SUBST(NDR_NBT_CFLAGS)
AC_SUBST(NDR_NBT_LIBS)
+AC_SUBST(SMBCLIENT_CFLAGS)
+AC_SUBST(SMBCLIENT_LIBS)
if test x"$with_samba" = xyes; then
PKG_CHECK_MODULES(NDR_NBT, ndr_nbt, ,
@@ -9,4 +11,12 @@ 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(SMBCLIENT, smbclient, ,
+ AC_MSG_ERROR([[Please install libsmbclient development libraries.
+libsmbclient 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
+ ]]))
fi