nss-pam-ldapd commit: r1261 - nss-pam-ldapd-solaris

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

Author: arthur
Date: Mon Oct 11 21:37:38 2010
New Revision: 1261
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1261

Log:
use {nss,pam}_ldap_so_LINK to set custom linker invocation instead of 
{nss,pam}_ldap_so_LD+{nss,pam}_ldap_so_LDFLAGS because the _LD one wasn't 
automatically picked up

Modified:
   nss-pam-ldapd-solaris/configure.ac

Modified: nss-pam-ldapd-solaris/configure.ac
==============================================================================
--- nss-pam-ldapd-solaris/configure.ac  Mon Oct 11 21:35:18 2010        (r1260)
+++ nss-pam-ldapd-solaris/configure.ac  Mon Oct 11 21:37:38 2010        (r1261)
@@ -418,10 +418,11 @@
   case "$target_os" in
   solaris*)
     if test "$ac_cv_prog_gcc" = yes; then
-      nss_ldap_so_LD="/usr/ccs/bin/ld"
-      AC_SUBST(nss_ldap_so_LD)
+      nss_ldap_so_LINK="/usr/ccs/bin/ld -Bdirect -z nodelete -Bdynamic -M 
\$(srcdir)/exports.solaris -G -o \$@"
+      AC_SUBST(nss_ldap_so_LINK)
+    else
+      nss_ldap_so_LDFLAGS="-Wl,-Bdirect -Wl,-z,nodelete -Wl,-Bdynamic 
-Wl,-M,\$(srcdir)/exports.solaris -Wl,-G"
     fi
-    nss_ldap_so_LDFLAGS="-Bdirect -z nodelete -Bdynamic -M 
\$(srcdir)/exports.solaris -G"
     ;;
   *)
     nss_ldap_so_LDFLAGS="-shared -Wl,-h,\$(NSS_LDAP_SONAME) 
-Wl,--version-script,\$(srcdir)/exports.glibc"
@@ -470,10 +471,11 @@
   case "$target_os" in
   solaris*)
     if test "$ac_cv_prog_gcc" = yes; then
-      pam_ldap_so_LD="/usr/ccs/bin/ld"
-      AC_SUBST(pam_ldap_so_LD)
+      pam_ldap_so_LINK="/usr/ccs/bin/ld -Bdirect -z nodelete -Bdynamic -M 
\$(srcdir)/pam_ldap.map -G -o \$@"
+      AC_SUBST(pam_ldap_so_LINK)
+    else
+      pam_ldap_so_LDFLAGS="-shared -Wl,-Bdirect -Wl,-z,nodelete -Wl,-Bdynamic 
-Wl,-M,\$(srcdir)/pam_ldap.map -Wl,-G"
     fi
-    pam_ldap_so_LDFLAGS="-Bdirect -z nodelete -Bdynamic -M 
\$(srcdir)/pam_ldap.map -G"
     ;;
   *)
     pam_ldap_so_LDFLAGS="-shared -Wl,--version-script,\$(srcdir)/pam_ldap.map"
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits