nss-pam-ldapd commit: r1142 - in nss-pam-ldapd: . nslcd

["Commits of the nss-pam-ldapd project." <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Tue Jun 15 21:10:43 2010
New Revision: 1142
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1142

Log:
pass pthread flags correctly to nslcd Makefile and rename save_ vars to not 
conflict with AX_PTHREAD test

Modified:
   nss-pam-ldapd/configure.ac
   nss-pam-ldapd/nslcd/Makefile.am

Modified: nss-pam-ldapd/configure.ac
==============================================================================
--- nss-pam-ldapd/configure.ac  Mon Jun 14 23:17:05 2010        (r1141)
+++ nss-pam-ldapd/configure.ac  Tue Jun 15 21:10:43 2010        (r1142)
@@ -259,8 +259,8 @@
 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 @@
   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 @@
   # 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
 

Modified: nss-pam-ldapd/nslcd/Makefile.am
==============================================================================
--- nss-pam-ldapd/nslcd/Makefile.am     Mon Jun 14 23:17:05 2010        (r1141)
+++ nss-pam-ldapd/nslcd/Makefile.am     Tue Jun 15 21:10:43 2010        (r1142)
@@ -32,5 +32,5 @@
                 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
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits