nss-pam-ldapd commit: r1263 - 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 22:58:05 2010
New Revision: 1263
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1263

Log:
always define {nss,pam}_ldap_so_LINK (defaults to default) because otherwise 
automake gets confused

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

Modified: nss-pam-ldapd-solaris/configure.ac
==============================================================================
--- nss-pam-ldapd-solaris/configure.ac  Mon Oct 11 22:12:59 2010        (r1262)
+++ nss-pam-ldapd-solaris/configure.ac  Mon Oct 11 22:58:05 2010        (r1263)
@@ -415,11 +415,12 @@
   AC_SUBST(NSS_MODULE_OBJS)
 
   # find out how to link the library
+  nss_ldap_so_LINK="\$(CCLD) \$(AM_CFLAGS) \$(CFLAGS) \$(nss_ldap_so_LDFLAGS) 
\$(LDFLAGS) -o \$@"
   case "$target_os" in
   solaris*)
-    if test "$ac_cv_prog_gcc" = yes; then
+    if test "$ac_cv_prog_gcc" = yes
+    then
       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
@@ -429,6 +430,7 @@
     ;;
   esac
   AC_SUBST(nss_ldap_so_LDFLAGS)
+  AC_SUBST(nss_ldap_so_LINK)
 
   # restore CFLAGS and LIBS
   CFLAGS="$nss_save_CFLAGS"
@@ -468,11 +470,12 @@
   AC_CHECK_FUNCS(pam_modutil_getpwnam pam_syslog)
 
   # find out how to link the library
+  pam_ldap_so_LINK="\$(CCLD) \$(AM_CFLAGS) \$(CFLAGS) \$(pam_ldap_so_LDFLAGS) 
\$(LDFLAGS) -o \$@"
   case "$target_os" in
   solaris*)
-    if test "$ac_cv_prog_gcc" = yes; then
+    if test "$ac_cv_prog_gcc" = yes
+    then
       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
@@ -482,6 +485,7 @@
     ;;
   esac
   AC_SUBST(pam_ldap_so_LDFLAGS)
+  AC_SUBST(pam_ldap_so_LINK)
 
   # restore CFLAGS and LIBS
   CFLAGS="$pam_save_CFLAGS"
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits