Fix make test_pam_modules

In Samba3 there is a very handy Makefile target 'test_pam_modules'. It let
quickly veryfy, that obtained PAM module actually is loadable and doesn't
miss any dependency libs. the only problem that on FreeBSD it doesn't work
OOTB, as it unconditionally adds -ldl to the list of libraries when FreeBSD
doesn't have it and doesn't need it.

This small patch fixes the problem for FreeBSD and, I hope, still valid
for othe systems, where -ldl is required. Has to be tested there though.

With regards,
Timur Bakeyev.

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/Makefile.in b/source3/Makefile.in
index f54fa6bd91724556d04cf38b5cbbc6feee071ff4..c6acb537a4e28b06625206eda984e2e4f3ee75f1 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -53,6 +53,7 @@ AWK=@AWK@
 PICFLAG=@PICFLAG@
 DYNEXP=@DYNEXP@
 PERL=@PERL@
+LIBDL=@LIBDL@
 
 PIDL_ARGS=@PIDL_ARGS@
 
@@ -3164,7 +3165,7 @@ test_pam_modules:: pam_modules
        @$(LIB_PATH_VAR)=./bin && \
        export $(LIB_PATH_VAR) && \
        for module in $(PAM_MODULES); do \
-               ./script/tests/dlopen.sh -lpam -ldl bin/$${module}.@SHLIBEXT@ \
+               ./script/tests/dlopen.sh -lpam ${LIBDL} bin/$${module}.@SHLIBEXT@ \
                        || exit 1; \
        done
 

diff --git a/source3/script/tests/dlopen.sh b/source3/script/tests/dlopen.sh
index edf44719d3b4e3c7fb3ca33c2ae314302139817f..6412bc5fcd42968e7509d8938ce2be0470a74654 100755 (executable)
--- a/source3/script/tests/dlopen.sh
+++ b/source3/script/tests/dlopen.sh
@@ -67,7 +67,7 @@ for arg in $@ ; do
        esac
 done
 
-${CC:-gcc} $RPM_OPT_FLAGS $CFLAGS -o $tempdir/dlopen $cflags $tempdir/dlopen.c $ldflags -ldl
+${CC:-gcc} $RPM_OPT_FLAGS $CFLAGS -o $tempdir/dlopen $cflags $tempdir/dlopen.c $ldflags
 
 retval=0
 for module in $modules ; do