From 48e92d75911bf6a1c969cfae980437adbd735ed7 Mon Sep 17 00:00:00 2001 From: Moe Jette <jette1@llnl.gov> Date: Mon, 10 Aug 2009 20:30:34 +0000 Subject: [PATCH] add -avoid-version to PAM build logic --- contribs/pam/Makefile.am | 6 +++--- contribs/pam/Makefile.in | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/contribs/pam/Makefile.am b/contribs/pam/Makefile.am index 22bf372b9cf..13353d2519f 100644 --- a/contribs/pam/Makefile.am +++ b/contribs/pam/Makefile.am @@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign CPPFLAGS = -fPIC INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common -PLUGIN_FLAGS = -module --export-dynamic +PLUGIN_FLAGS = -module --export-dynamic -avoid-version pkglibdir = $(libdir)/security @@ -29,8 +29,8 @@ pam_slurm_la_SOURCES = \ $(top_builddir)/src/common/hostlist.c \ $(top_builddir)/src/common/hostlist.h -pam_slurm_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(LIB_LDFLAGS) \ - -version-info $(current):$(rev):$(age) +pam_slurm_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(LIB_LDFLAGS) + else EXTRA_pam_slurm_la_SOURCES = pam_slurm.c endif diff --git a/contribs/pam/Makefile.in b/contribs/pam/Makefile.in index b1f5dc8784f..551d4012dba 100644 --- a/contribs/pam/Makefile.in +++ b/contribs/pam/Makefile.in @@ -299,7 +299,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common -PLUGIN_FLAGS = -module --export-dynamic +PLUGIN_FLAGS = -module --export-dynamic -avoid-version @HAVE_PAM_FALSE@pam_lib = @HAVE_PAM_TRUE@pam_lib = pam_slurm.la pkglib_LTLIBRARIES = $(pam_lib) @@ -311,9 +311,7 @@ pkglib_LTLIBRARIES = $(pam_lib) @HAVE_PAM_TRUE@ $(top_builddir)/src/common/hostlist.c \ @HAVE_PAM_TRUE@ $(top_builddir)/src/common/hostlist.h -@HAVE_PAM_TRUE@pam_slurm_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(LIB_LDFLAGS) \ -@HAVE_PAM_TRUE@ -version-info $(current):$(rev):$(age) - +@HAVE_PAM_TRUE@pam_slurm_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(LIB_LDFLAGS) @HAVE_PAM_FALSE@EXTRA_pam_slurm_la_SOURCES = pam_slurm.c all: all-am -- GitLab