diff options
author | Lukas Slebodnik <lslebodn@redhat.com> | 2014-05-24 17:03:17 +0200 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-05-26 16:34:26 +0200 |
commit | 0e1dcef53d9d8465ce97d31ad11be4445a6e7eb8 (patch) | |
tree | 60db68a33af3811d6c1e115ac91b1627b580f3ef | |
parent | db2ee5c24be0228cc73816ffaaa3252ed6359385 (diff) | |
download | sssd-0e1dcef53d9d8465ce97d31ad11be4445a6e7eb8.tar.gz sssd-0e1dcef53d9d8465ce97d31ad11be4445a6e7eb8.tar.xz sssd-0e1dcef53d9d8465ce97d31ad11be4445a6e7eb8.zip |
AUTOCONF: Move detection of samba libraries to one file
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | src/external/libsmbclient.m4 | 5 | ||||
-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 |