diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2010-06-15 19:10:43 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2010-06-15 19:10:43 +0000 |
| commit | ca72ff2dcd29f8573ee44b77e66994c880481ba5 (patch) | |
| tree | 368835e3bd0c9e48f528152784f14a0cbeda2318 | |
| parent | 9b65ad7e014d3198ab0995572fc2f7adf9b35a0f (diff) | |
pass pthread flags correctly to nslcd Makefile and rename save_ vars to not conflict with AX_PTHREAD test
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1142 ef36b2f9-881f-0410-afb5-c4e39611909c
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | nslcd/Makefile.am | 2 |
2 files changed, 12 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index f2bda9b..28d3a3f 100644 --- a/configure.ac +++ b/configure.ac @@ -259,8 +259,8 @@ AC_CHECK_TYPE(socklen_t,, if test "x$enable_pam" = "xyes" then # save CFLAGS and LIBS to restore later - save_CFLAGS="$CFLAGS" - save_LIBS="$LIBS" + pam_save_CFLAGS="$CFLAGS" + pam_save_LIBS="$LIBS" # check for headers AC_CHECK_HEADERS(security/pam_appl.h) @@ -288,18 +288,18 @@ then AC_CHECK_FUNCS(pam_modutil_getpwnam pam_syslog) # restore CFLAGS and LIBS - CFLAGS="$save_CFLAGS" - LIBS="$save_LIBS" + CFLAGS="$pam_save_CFLAGS" + LIBS="$pam_save_LIBS" fi # nslcd daemon-specific tests if test "x$enable_nslcd" = "xyes" then # save CFLAGS and LIBS to restore later - save_CFLAGS="$CFLAGS" - save_LIBS="$LIBS" - CFLAGS="$PTHREAD_CFLAGS $CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" + nslcd_save_CFLAGS="$CFLAGS" + nslcd_save_LIBS="$LIBS" + CFLAGS="$CFLAGS" + LIBS="$LIBS" # check header files AC_CHECK_HEADERS(lber.h) @@ -484,8 +484,9 @@ then # save nslcd LIBS and CFLAGS and restore originals nslcd_CFLAGS="$CFLAGS" nslcd_LIBS="$LIBS" - CFLAGS="$save_CFLAGS" - LIBS="$save_LIBS" + CFLAGS="$nslcd_save_CFLAGS" + LIBS="$nslcd_save_LIBS" + AC_SUBST(nslcd_LIBS) fi diff --git a/nslcd/Makefile.am b/nslcd/Makefile.am index 3989c4a..0e2abe2 100644 --- a/nslcd/Makefile.am +++ b/nslcd/Makefile.am @@ -32,5 +32,5 @@ nslcd_SOURCES = nslcd.c ../nslcd.h ../common/nslcd-prot.h \ attmap.c attmap.h \ alias.c ether.c group.c host.c netgroup.c network.c \ passwd.c protocol.c rpc.c service.c shadow.c pam.c -nslcd_LDADD = @nslcd_LIBS@ ../common/libtio.a ../common/libdict.a \ +nslcd_LDADD = @nslcd_LIBS@ @PTHREAD_LIBS@ ../common/libtio.a ../common/libdict.a \ ../common/libexpr.a ../compat/libcompat.a |