diff options
| author | Timur I. Bakeyev <timur@com.bat.ru> | 2009-06-07 17:05:23 +0000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-06-08 13:20:54 +0200 |
| commit | ef9773c8e77346bd0d52a827b0f9a1b0e3b4ccfd (patch) | |
| tree | dc70a83b45275ed0e263712c096520e7084f5e9d | |
| parent | a7cd66728b4b35dbb7686108bcf8e100d663aad7 (diff) | |
| download | samba-ef9773c8e77346bd0d52a827b0f9a1b0e3b4ccfd.tar.gz samba-ef9773c8e77346bd0d52a827b0f9a1b0e3b4ccfd.tar.bz2 samba-ef9773c8e77346bd0d52a827b0f9a1b0e3b4ccfd.zip | |
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>
| -rw-r--r-- | source3/Makefile.in | 3 | ||||
| -rwxr-xr-x | source3/script/tests/dlopen.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index f54fa6bd91..c6acb537a4 100644 --- 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 edf44719d3..6412bc5fcd 100755 --- 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 |