From 0e1dcef53d9d8465ce97d31ad11be4445a6e7eb8 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Sat, 24 May 2014 17:03:17 +0200 Subject: AUTOCONF: Move detection of samba libraries to one file Reviewed-by: Jakub Hrozek --- configure.ac | 3 +-- src/external/libndr_nbt.m4 | 12 ------------ src/external/libsmbclient.m4 | 5 ----- src/external/samba.m4 | 22 ++++++++++++++++++++++ 4 files changed, 23 insertions(+), 19 deletions(-) delete mode 100644 src/external/libndr_nbt.m4 delete mode 100644 src/external/libsmbclient.m4 create mode 100644 src/external/samba.m4 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/libndr_nbt.m4 b/src/external/libndr_nbt.m4 deleted file mode 100644 index bb4f89f13..000000000 --- a/src/external/libndr_nbt.m4 +++ /dev/null @@ -1,12 +0,0 @@ -AC_SUBST(NDR_NBT_CFLAGS) -AC_SUBST(NDR_NBT_LIBS) - -if test x"$with_samba" = xyes; then - PKG_CHECK_MODULES(NDR_NBT, ndr_nbt, , - AC_MSG_ERROR([[Please install Samba 4 development libraries. -Samba 4 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 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/samba.m4 b/src/external/samba.m4 new file mode 100644 index 000000000..735cc5a18 --- /dev/null +++ b/src/external/samba.m4 @@ -0,0 +1,22 @@ +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, , + AC_MSG_ERROR([[Please install Samba 4 development libraries. +Samba 4 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 + ]])) + + 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 -- cgit