From: Steve Langasek Date: Mon, 2 Aug 2010 13:59:02 +0000 (+0000) Subject: Relevant BUGIDs: Debian bug #582362 X-Git-Tag: Linux-PAM-1_1_2~11 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9dd97e696e70900869af7f50f647c2517aab405;p=linux-pam 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 --- diff --git a/ChangeLog b/ChangeLog index f35cd72d..419e63e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-08-02 Steve Langasek + + * modules/pam_mkhomedir/Makefile.am: don't pass --version-script + options when linking executables, only when linking libraries + Patch from Julien Cristau + 2010-07-12 Thorsten Kukuk * 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 7fe66056..6e93ba98 100644 --- 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