Relevant BUGIDs: Debian bug #582362

Purpose of commit: bugfix

Commit summary:
---------------
Don't pass --version-script options when linking executables, only when
linking libraries
Patch from Julien Cristau <jcristau@debian.org>

diff --git a/ChangeLog b/ChangeLog
index f35cd72d5c678ef3b503ff5de0d0a855f2c4c3bc..419e63e11acaa0e230afa29b667b068e4e32ce2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-02  Steve Langasek  <vorlon@debian.org>
+
+       * modules/pam_mkhomedir/Makefile.am: don't pass --version-script
+       options when linking executables, only when linking libraries
+       Patch from Julien Cristau <jcristau@debian.org>
+
 2010-07-12  Thorsten Kukuk  <kukuk@thkukuk.de>
 
        * modules/pam_succeed_if/pam_succeed_if.c (pam_sm_authenticate): Add

diff --git a/modules/pam_mkhomedir/Makefile.am b/modules/pam_mkhomedir/Makefile.am
index 7fe660563df0427213a27348130f47707b9743a7..6e93ba983117045d9b8c2a783dcee29b43309869 100644 (file)
--- a/modules/pam_mkhomedir/Makefile.am
+++ b/modules/pam_mkhomedir/Makefile.am
@@ -19,14 +19,14 @@ secureconfdir = $(SCONFIGDIR)
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
            -DMKHOMEDIR_HELPER=\"$(sbindir)/mkhomedir_helper\"
-AM_LDFLAGS = -no-undefined -avoid-version -module
-if HAVE_VERSIONING
-  AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
-endif
 
 securelib_LTLIBRARIES = pam_mkhomedir.la
 pam_mkhomedir_la_SOURCES = pam_mkhomedir.c
 pam_mkhomedir_la_LIBADD = -L$(top_builddir)/libpam -lpam
+pam_mkhomedir_la_LDFLAGS = -no-undefined -avoid-version -module
+if HAVE_VERSIONING
+  pam_mkhomedir_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
+endif
 
 sbin_PROGRAMS = mkhomedir_helper
 mkhomedir_helper_SOURCES = mkhomedir_helper.c