nss-pam-ldapd commit: r1238 - in nss-pam-ldapd-solaris: . pam

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

Author: arthur
Date: Mon Oct  4 21:26:34 2010
New Revision: 1238
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1238

Log:
switch to the same mechanims for pam_ldap.so that was already in use for 
nss_ldap.so

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

Modified: nss-pam-ldapd-solaris/configure.ac
==============================================================================
--- nss-pam-ldapd-solaris/configure.ac  Mon Oct  4 19:16:15 2010        (r1237)
+++ nss-pam-ldapd-solaris/configure.ac  Mon Oct  4 21:26:34 2010        (r1238)
@@ -234,6 +234,23 @@
 AC_DEFINE_UNQUOTED(NSS_LDAP_SONAME,"$NSS_LDAP_SONAME",[The SONAME of the NSS 
library module.])
 AC_SUBST(NSS_LDAP_SONAME)
 
+# the SONAME to use for the PAM module
+AC_MSG_CHECKING([name of PAM module])
+AC_ARG_WITH(pam-ldap-soname,
+            AS_HELP_STRING([--with-pam-ldap-soname=SONAME],
+                           [name of PAM module @<:@auto@:>@]),
+            [ PAM_LDAP_SONAME="$with_pam_ldap_soname" ],
+            [ PAM_LDAP_SONAME="auto" ])
+if test "x$PAM_LDAP_SONAME" = "xauto"
+then
+  case "$target_os" in
+    solaris*) PAM_LDAP_SONAME="pam_ldap.so.1" ;;
+    *)        PAM_LDAP_SONAME="pam_ldap.so" ;;
+  esac
+fi
+AC_MSG_RESULT($PAM_LDAP_SONAME)
+AC_SUBST(PAM_LDAP_SONAME)
+
 # check which modules should be build
 AC_ARG_WITH(nss-ldap-maps,
             AS_HELP_STRING([--with-nss-ldap-maps=MAP LIST],
@@ -672,15 +689,12 @@
   fi
   nss_ldap_so_LDFLAGS="-Bdirect -z nodelete -Bdynamic -M 
\$(srcdir)/exports.solaris -G"
   pam_ldap_so_LDFLAGS="-Bdirect -z nodelete -Bdynamic -M 
\$(srcdir)/exports.solaris -G"
-  pam_ldap_so_VERSIONED="pam_ldap.so.1"
   TARGET_OS="SUNOS" ;;
 linux*) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic 
-Wl,--version-script,\$(srcdir)/exports.linux"
   pam_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic 
-Wl,--version-script,\$(srcdir)/exports.linux"
-  pam_ldap_so_VERSIONED="pam_ldap.so"
   TARGET_OS="LINUX" ;;
 *) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic"
    pam_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic"
-  pam_ldap_so_VERSIONED="pam_ldap.so" ;;
 esac
 
 AC_SUBST(nss_ldap_so_LD)
@@ -688,7 +702,6 @@
 
 AC_SUBST(pam_ldap_so_LD)
 AC_SUBST(pam_ldap_so_LDFLAGS)
-AC_SUBST(pam_ldap_so_VERSIONED)
 
 AC_SUBST(AIX64SUFFIX)
 AM_CONDITIONAL(GCC, test "$GCC" = "yes")

Modified: nss-pam-ldapd-solaris/pam/Makefile.am
==============================================================================
--- nss-pam-ldapd-solaris/pam/Makefile.am       Mon Oct  4 19:16:15 2010        
(r1237)
+++ nss-pam-ldapd-solaris/pam/Makefile.am       Mon Oct  4 21:26:34 2010        
(r1238)
@@ -38,10 +38,10 @@
 install-exec-local: install-pam_ldap_so
 uninstall-local: uninstall-pam_ldap_so
 
-# install pam_ldap.so
 install-pam_ldap_so: pam_ldap.so
+       -rm -f $(DESTDIR)/$(PAM_SECLIB_DIR)/$(PAM_LDAP_SONAME)
        $(mkinstalldirs) $(DESTDIR)/$(PAM_SECLIB_DIR)
-       $(INSTALL_PROGRAM) pam_ldap.so 
$(DESTDIR)$(PAM_SECLIB_DIR)/$(pam_ldap_soVERSIONED)
+       $(INSTALL_PROGRAM) pam_ldap.so $(DESTDIR)$(libdir)/$(PAM_LDAP_SONAME)
 
 uninstall-pam_ldap_so:
-       -rm -f $(DESTDIR)$(PAM_SECLIB_DIR)/$(pam_ldap_so_VERSIONED)
+       -rm -f $(DESTDIR)/$(PAM_SECLIB_DIR)/$(PAM_LDAP_SONAME)
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits