diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2010-10-04 19:26:34 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2010-10-04 19:26:34 +0000 |
| commit | 877af7f76294580505600e63d56a73367547582e (patch) | |
| tree | c627b7cb91587ff8648a6d0016fc0625aabac90f | |
| parent | 9d172a45a64bbdbdbb31cdc50ae426e9dcf5e470 (diff) | |
switch to the same mechanims for pam_ldap.so that was already in use for nss_ldap.so
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd-solaris@1238 ef36b2f9-881f-0410-afb5-c4e39611909c
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | pam/Makefile.am | 6 |
2 files changed, 20 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 4954d55..569e9a7 100644 --- a/configure.ac +++ b/configure.ac @@ -234,6 +234,23 @@ AC_MSG_RESULT($NSS_LDAP_SONAME) 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 @@ solaris*) if test "$ac_cv_prog_gcc" = yes; then 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(nss_ldap_so_LDFLAGS) 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") diff --git a/pam/Makefile.am b/pam/Makefile.am index ba07a1f..5e7efed 100644 --- a/pam/Makefile.am +++ b/pam/Makefile.am @@ -38,10 +38,10 @@ endif 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) |