>From 048222fac22c43283a4586f8301de2783cf45f34 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Sat, 24 May 2014 17:03:17 +0200 Subject: [PATCH 1/6] AUTOCONF: Move detection of samba libraries to one file --- configure.ac | 3 +-- src/external/libsmbclient.m4 | 5 ----- src/external/{libndr_nbt.m4 => samba.m4} | 10 ++++++++++ 3 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 src/external/libsmbclient.m4 rename src/external/{libndr_nbt.m4 => samba.m4} (51%) diff --git a/configure.ac b/configure.ac index 184b427188d36e399c0425f486b532c9efe6ab9e..58d3e9c474a06c7ae1ebb45385e3b8443a7f79ac 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 060b5ee149ee6a4c74e545ac9253f058ad9eb4bb..0000000000000000000000000000000000000000 --- 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 similarity index 51% rename from src/external/libndr_nbt.m4 rename to src/external/samba.m4 index bb4f89f13b119a0eeb95d9304386d1d2f65e6bfa..735cc5a187dba7514a9c7436a6d3ba948ad522b0 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 -- 1.9.3