From 11428fdf252a18551d64fb6a119e44eab2d2c5d9 Mon Sep 17 00:00:00 2001 From: Arthur de Jong Date: Mon, 11 Oct 2010 19:37:38 +0000 Subject: 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 git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd-solaris@1261 ef36b2f9-881f-0410-afb5-c4e39611909c --- configure.ac | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 04bd05b..b0108e6 100644 --- a/configure.ac +++ b/configure.ac @@ -418,10 +418,11 @@ then 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 @@ then 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" -- cgit v1.2.3