diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-20 15:22:36 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-20 15:22:36 +0000 |
| commit | 80959e30ce7c57b5865f5358c42a7bcffe450d4d (patch) | |
| tree | b740c16852fea65d00f8acfc751765ae7aafbbb4 /src/external/samba.m4 | |
| parent | Releasing progress-linux version 2.9.4-2~progress7.99u2. (diff) | |
| download | sssd-80959e30ce7c57b5865f5358c42a7bcffe450d4d.tar.xz sssd-80959e30ce7c57b5865f5358c42a7bcffe450d4d.zip | |
Merging upstream version 2.9.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/external/samba.m4')
| -rw-r--r-- | src/external/samba.m4 | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/external/samba.m4 b/src/external/samba.m4 index 23e5291..f54e8c1 100644 --- a/src/external/samba.m4 +++ b/src/external/samba.m4 @@ -4,6 +4,7 @@ AC_SUBST(SMBCLIENT_CFLAGS) AC_SUBST(SMBCLIENT_LIBS) AC_SUBST(NDR_KRB5PAC_CFLAGS) AC_SUBST(NDR_KRB5PAC_LIBS) +AC_SUBST(IDMAP_SAMBA_LIBS) if test x"$with_samba" = xyes; then PKG_CHECK_MODULES(NDR_NBT, ndr_nbt, , @@ -62,13 +63,21 @@ them. In this case, you will need to execute configure script with argument AC_MSG_ERROR([Illegal value -$with_smb_idmap_interface_version- for option --with-smb-idmap-interface-version]) fi else - - AC_MSG_CHECKING([Samba's idmap plugin interface version]) sambalibdir="`$PKG_CONFIG --variable=libdir smbclient`"/samba + AC_MSG_CHECKING([Samba's idmap library]) + if test -f "${sambalibdir}/libidmap-private-samba.so"; then + IDMAP_SAMBA_LIBS=idmap-private-samba + elif test -f "${sambalibdir}/libidmap-samba4.so"; then + IDMAP_SAMBA_LIBS=idmap-samba4 + else + AC_MSG_ERROR([Cannot find private idmap-samba library]) + fi + AC_MSG_RESULT([found: $IDMAP_SAMBA_LIBS]) + AC_MSG_CHECKING([Samba's idmap plugin interface version]) SAVE_CFLAGS=$CFLAGS SAVE_LIBS=$LIBS CFLAGS="$CFLAGS $SMBCLIENT_CFLAGS $NDR_NBT_CFLAGS $NDR_KRB5PAC_CFLAGS" - LIBS="$LIBS -L${sambalibdir} -lidmap-samba4 -Wl,-rpath ${sambalibdir}" + LIBS="$LIBS -L${sambalibdir} -l${IDMAP_SAMBA_LIBS} -Wl,-rpath ${sambalibdir}" AC_RUN_IFELSE( [AC_LANG_SOURCE([ #include <stdlib.h> |