nss-pam-ldapd commit: r1143 - in nss-pam-ldapd: . nss pam

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

Author: arthur
Date: Tue Jun 15 21:53:06 2010
New Revision: 1143
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1143

Log:
rename symbol maps and check for way linker should be passed the file

Added:
   nss-pam-ldapd/nss/nss_ldap.map
      - copied unchanged from r1141, nss-pam-ldapd/nss/exports.linux
   nss-pam-ldapd/pam/pam_ldap.map
      - copied unchanged from r1140, nss-pam-ldapd/pam/exports.linux
Deleted:
   nss-pam-ldapd/nss/exports.linux
   nss-pam-ldapd/pam/exports.linux
Modified:
   nss-pam-ldapd/configure.ac
   nss-pam-ldapd/nss/Makefile.am
   nss-pam-ldapd/pam/Makefile.am

Modified: nss-pam-ldapd/configure.ac
==============================================================================
--- nss-pam-ldapd/configure.ac  Tue Jun 15 21:10:43 2010        (r1142)
+++ nss-pam-ldapd/configure.ac  Tue Jun 15 21:53:06 2010        (r1143)
@@ -238,6 +238,23 @@
   AC_DEFINE(__thread,,[Define to empty if compiler does not support `__thread' 
keyword.])
 fi
 
+# check how to pass a symbol map to the linker
+AC_MSG_CHECKING([how linker wants the symbol map])
+if $CC -Wl,--help 2>&1 | grep -- --version-script >/dev/null
+then
+  VERSION_SCRIPT_FLAG="-Wl,--version-script,"
+  AC_SUBST(VERSION_SCRIPT_FLAG)
+  AC_MSG_RESULT([--version-script])
+elif $CC -Wl,--help 2>&1 | grep -- '-M mapfile' >/dev/null
+then
+  VERSION_SCRIPT_FLAG="-Wl,-M,"
+  AC_SUBST(VERSION_SCRIPT_FLAG)
+  AC_MSG_RESULT([-M])
+else
+  AC_MSG_RESULT([unknown, not passing symbol map])
+fi
+AM_CONDITIONAL([HAVE_VERSION_SCRIPT_FLAG], [test "x${VERSION_SCRIPT_FLAG}" != 
x])
+
 # check for support for the struct ether_addr structure
 AC_CHECK_TYPE(struct ether_addr,
     AC_DEFINE(HAVE_STRUCT_ETHER_ADDR,1,[Define to 1 if you have a `struct 
ether_addr' definition.]),,[

Modified: nss-pam-ldapd/nss/Makefile.am
==============================================================================
--- nss-pam-ldapd/nss/Makefile.am       Tue Jun 15 21:10:43 2010        (r1142)
+++ nss-pam-ldapd/nss/Makefile.am       Tue Jun 15 21:53:06 2010        (r1143)
@@ -34,11 +34,13 @@
                       aliases.c ethers.c group.c hosts.c netgroup.c \
                       networks.c passwd.c protocols.c rpc.c services.c \
                       shadow.c
-nss_ldap_so_LDFLAGS = -shared -Wl,-soname,$(NSS_LDAP_NSS_VERSIONED) \
-                      -Wl,--version-script,\$(srcdir)/exports.linux
+nss_ldap_so_LDFLAGS = -shared -Wl,-soname,$(NSS_LDAP_NSS_VERSIONED)
+if HAVE_VERSION_SCRIPT_FLAG
+nss_ldap_so_LDFLAGS += $(VERSION_SCRIPT_FLAG)\$(srcdir)/nss_ldap.map
+endif
 nss_ldap_so_LDADD = ../common/libtio.a ../common/libprot.a
 
-EXTRA_DIST = exports.linux
+EXTRA_DIST = nss_ldap.map
 
 install-exec-local: install-nss_ldap_so
 uninstall-local: uninstall-nss_ldap_so

Modified: nss-pam-ldapd/pam/Makefile.am
==============================================================================
--- nss-pam-ldapd/pam/Makefile.am       Tue Jun 15 21:10:43 2010        (r1142)
+++ nss-pam-ldapd/pam/Makefile.am       Tue Jun 15 21:53:06 2010        (r1143)
@@ -1,6 +1,6 @@
 # Makefile.am - use automake to generate Makefile.in
 #
-# Copyright (C) 2009 Arthur de Jong
+# Copyright (C) 2009, 2010 Arthur de Jong
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -24,11 +24,14 @@
 
 pam_ldap_so_SOURCES = ../nslcd.h ../common/nslcd-prot.h \
                       ../compat/attrs.h pam.c common.h
-pam_ldap_so_LDFLAGS = -shared -Wl,--version-script,\$(srcdir)/exports.linux
+pam_ldap_so_LDFLAGS = -shared
+if HAVE_VERSION_SCRIPT_FLAG
+pam_ldap_so_LDFLAGS += $(VERSION_SCRIPT_FLAG)\$(srcdir)/pam_ldap.map
+endif
 pam_ldap_so_LDADD = ../common/libtio.a ../common/libprot.a -lpam \
                     ../compat/libcompat.a
 
-EXTRA_DIST = exports.linux
+EXTRA_DIST = pam_ldap.map
 
 install-exec-local: install-pam_ldap_so
 uninstall-local: uninstall-pam_ldap_so
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits