Relevant BUGIDs:

Purpose of commit: bugfix

Commit summary:
---------------

Fix compiling of libpammodutil and linking against it.

diff --git a/modules/pam_access/Makefile.am b/modules/pam_access/Makefile.am
index f4c86be16253d7ec34c38f8ee07a2248d4b76c5b..36d060a4ef58ff0ab833e90f578ce8cfcfb622f0 100644 (file)
--- a/modules/pam_access/Makefile.am
+++ b/modules/pam_access/Makefile.am
@@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/ \
        -DPAM_ACCESS_CONFIG=\"$(SCONFIGDIR)/access.conf\"
 AM_LDFLAGS =  -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam @LIBNSL@
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_cracklib/Makefile.am b/modules/pam_cracklib/Makefile.am
index e512927e10d229bb76e09551f501adfbdfe707d3..8229a068a4148233d74b8726cb701aed0947a2a1 100644 (file)
--- a/modules/pam_cracklib/Makefile.am
+++ b/modules/pam_cracklib/Makefile.am
@@ -12,7 +12,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_debug/Makefile.am b/modules/pam_debug/Makefile.am
index 2fffe11e88d3234d23e91c6f41a6a740cd6c7304..e1fb39510ff7fa4257fd715ce08003063bbd31c9 100644 (file)
--- a/modules/pam_debug/Makefile.am
+++ b/modules/pam_debug/Makefile.am
@@ -12,7 +12,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS =  -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_deny/Makefile.am b/modules/pam_deny/Makefile.am
index 27af916ca6ffd0e6ec10b0d3f9da34e569f56df4..62ae29af4bef95659398db49bf5d1b9396575812 100644 (file)
--- a/modules/pam_deny/Makefile.am
+++ b/modules/pam_deny/Makefile.am
@@ -12,7 +12,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_env/Makefile.am b/modules/pam_env/Makefile.am
index 264d2c96f7e05e04d0a8a4684b099afe24df4c41..d2c6faeddd6502d8b82378f7960352c49bc39e82 100644 (file)
--- a/modules/pam_env/Makefile.am
+++ b/modules/pam_env/Makefile.am
@@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/ \
        -DDEFAULT_CONF_FILE=\"$(SCONFIGDIR)/pam_env.conf\"
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_filter/Makefile.am b/modules/pam_filter/Makefile.am
index f5af98c1aaf6f7cbcea64cde202c5f91a260e8d8..9d455781d2d9ca653b8ca90076f6e2ffa794004a 100644 (file)
--- a/modules/pam_filter/Makefile.am
+++ b/modules/pam_filter/Makefile.am
@@ -14,7 +14,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_filter/upperLOWER/Makefile.am b/modules/pam_filter/upperLOWER/Makefile.am
index 88f7c2e20bc07893c58f711c019b456dfb6225d0..4341bcea80a7906ce938c800771a74d18aa2d8f9 100644 (file)
--- a/modules/pam_filter/upperLOWER/Makefile.am
+++ b/modules/pam_filter/upperLOWER/Makefile.am
@@ -9,6 +9,6 @@ securelibfilterdir = $(SECUREDIR)/pam_filter
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/ -I..
-AM_LDFLAGS = -L$(top_builddir)/modules/pammodutil -lpammodutil
+AM_LDFLAGS = $(top_builddir)/modules/pammodutil/libpammodutil.la
 
 securelibfilter_PROGRAMS = upperLOWER

diff --git a/modules/pam_ftp/Makefile.am b/modules/pam_ftp/Makefile.am
index c31b98dbde241dcac9ed7fc9a4aaf25745547f8c..e89f8a702361a31ba72b7ce2be743508fd5a1bbc 100644 (file)
--- a/modules/pam_ftp/Makefile.am
+++ b/modules/pam_ftp/Makefile.am
@@ -12,7 +12,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_group/Makefile.am b/modules/pam_group/Makefile.am
index 85d0e5ad5dfea7133ae12c79c0702394a76af724..1dd5e7a13e5aaccd9e78b66b4dabce51ac7c55f3 100644 (file)
--- a/modules/pam_group/Makefile.am
+++ b/modules/pam_group/Makefile.am
@@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/ \
        -DPAM_GROUP_CONF=\"$(SCONFIGDIR)/group.conf\"
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_issue/Makefile.am b/modules/pam_issue/Makefile.am
index 08ad17d1c2b6d80d393056cfe1f169033c225b7a..c96f9b1b6a2424bb2a14acfa11db8511d818f02a 100644 (file)
--- a/modules/pam_issue/Makefile.am
+++ b/modules/pam_issue/Makefile.am
@@ -10,7 +10,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_lastlog/Makefile.am b/modules/pam_lastlog/Makefile.am
index 6c73191e6108477ae3cb08f641e36b48d1ce6378..8d7934c54401e8be904ab6f1da206ca664712f0e 100644 (file)
--- a/modules/pam_lastlog/Makefile.am
+++ b/modules/pam_lastlog/Makefile.am
@@ -10,7 +10,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_limits/Makefile.am b/modules/pam_limits/Makefile.am
index facfa374c48421b0f262c110c42c86d6d03157b5..46e03dea2c21abf5b178209a59a5a1a67996f5e8 100644 (file)
--- a/modules/pam_limits/Makefile.am
+++ b/modules/pam_limits/Makefile.am
@@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/ \
        -DLIMITS_FILE=\"$(SCONFIGDIR)/limits.conf\"
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_listfile/Makefile.am b/modules/pam_listfile/Makefile.am
index fe383e7810d1f2e1a110665f39a50805b3debafb..ad38ccb7e03b852e9928f1b306563d71228de07d 100644 (file)
--- a/modules/pam_listfile/Makefile.am
+++ b/modules/pam_listfile/Makefile.am
@@ -12,7 +12,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_localuser/Makefile.am b/modules/pam_localuser/Makefile.am
index 595fb5ce13a73d1df518c9e173d31f528404c34b..10316a8362a91b62c42559fe88aa810c3bbc470f 100644 (file)
--- a/modules/pam_localuser/Makefile.am
+++ b/modules/pam_localuser/Makefile.am
@@ -14,7 +14,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_mail/Makefile.am b/modules/pam_mail/Makefile.am
index a584644af0a59bf1cda59d09bd02254406f95528..4151c042511dd79717127bdec82055d644958f5f 100644 (file)
--- a/modules/pam_mail/Makefile.am
+++ b/modules/pam_mail/Makefile.am
@@ -12,7 +12,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_mkhomedir/Makefile.am b/modules/pam_mkhomedir/Makefile.am
index 4a35b183481e09d7b485f74e033e148c24f81d4f..c955404ea470642744a731beff9b51e1ec72e274 100644 (file)
--- a/modules/pam_mkhomedir/Makefile.am
+++ b/modules/pam_mkhomedir/Makefile.am
@@ -12,7 +12,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_motd/Makefile.am b/modules/pam_motd/Makefile.am
index 859e441915675b1776902075dcc2e8953597282d..7a1c66d609459b7ac25e871a37384fa38f31df84 100644 (file)
--- a/modules/pam_motd/Makefile.am
+++ b/modules/pam_motd/Makefile.am
@@ -10,7 +10,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_nologin/Makefile.am b/modules/pam_nologin/Makefile.am
index 4fe592397248d58c175638e2ac123e698289f857..0a6181c2fb0f7214ad49c563d5ed65416b5323ed 100644 (file)
--- a/modules/pam_nologin/Makefile.am
+++ b/modules/pam_nologin/Makefile.am
@@ -14,7 +14,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_permit/Makefile.am b/modules/pam_permit/Makefile.am
index b1acac729b7875fa5c58f3aff9125915ece24f92..ef8ce215bdcee628f4ec48d7fbcdb3663db187f0 100644 (file)
--- a/modules/pam_permit/Makefile.am
+++ b/modules/pam_permit/Makefile.am
@@ -12,7 +12,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_pwdb/Makefile.am b/modules/pam_pwdb/Makefile.am
index 4eb7a8d0e635f69ee8ae0df3e8e3708f2017eead..559b21209843bdf6fe338b4a4879fbe7e4ecfd00 100644 (file)
--- a/modules/pam_pwdb/Makefile.am
+++ b/modules/pam_pwdb/Makefile.am
@@ -17,7 +17,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/ \
        -DCHKPWD_HELPER=\"$(sbindir)/$(CHKPWD)\"
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam @LIBCRYPT@ @LIBPWDB@
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_rhosts/Makefile.am b/modules/pam_rhosts/Makefile.am
index a27e36083c45fea91eb57dd7e8284ab342fb280b..5b2bb2101c2798e87e2aef786c7028a9e29c50e1 100644 (file)
--- a/modules/pam_rhosts/Makefile.am
+++ b/modules/pam_rhosts/Makefile.am
@@ -12,7 +12,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_rootok/Makefile.am b/modules/pam_rootok/Makefile.am
index 97432956d7b0f2726aa80a377d2482f8ef7a84c8..b09c888166507c766fc6aa67ee2e1ec2e75c9413 100644 (file)
--- a/modules/pam_rootok/Makefile.am
+++ b/modules/pam_rootok/Makefile.am
@@ -15,7 +15,7 @@ if HAVE_LIBSELINUX
 AM_CFLAGS += -DWITH_SELINUX
 endif
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam @LIBSELINUX@
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_securetty/Makefile.am b/modules/pam_securetty/Makefile.am
index 17dbf691d8bf928cdb7bcd3ec45592105c663b2c..8ea6b6624d549c5ff1c6ac99e3cd315d13de885d 100644 (file)
--- a/modules/pam_securetty/Makefile.am
+++ b/modules/pam_securetty/Makefile.am
@@ -14,7 +14,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_selinux/Makefile.am b/modules/pam_selinux/Makefile.am
index dd62255e6354490d0320edcc6ed4732d44834b98..154dbf42464f58cef543c232d19ed8e8808d3188 100644 (file)
--- a/modules/pam_selinux/Makefile.am
+++ b/modules/pam_selinux/Makefile.am
@@ -15,7 +15,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/libpam_misc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam @LIBSELINUX@
 
 pam_selinux_check_LDFLAGS = -L$(top_builddir)/libpam_misc -lpam_misc

diff --git a/modules/pam_shells/Makefile.am b/modules/pam_shells/Makefile.am
index a639c21c67bda62887bcf2412070a77677e5eb8e..ad504a0f6945b3a37a0624d13085108c4ea4a6cf 100644 (file)
--- a/modules/pam_shells/Makefile.am
+++ b/modules/pam_shells/Makefile.am
@@ -12,7 +12,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_stress/Makefile.am b/modules/pam_stress/Makefile.am
index 5daf06ee0dc65cef3c8ed0bf1a9ef994a510385c..da019f8938e98f1597366a4908362c6403a3d6ab 100644 (file)
--- a/modules/pam_stress/Makefile.am
+++ b/modules/pam_stress/Makefile.am
@@ -12,7 +12,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_succeed_if/Makefile.am b/modules/pam_succeed_if/Makefile.am
index 483d3dbeaa9e87649840fbdf2697b9b48ebe9861..4ed10b72f07698f9d928f5d3bf2ea31c3639e55a 100644 (file)
--- a/modules/pam_succeed_if/Makefile.am
+++ b/modules/pam_succeed_if/Makefile.am
@@ -14,7 +14,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_tally/Makefile.am b/modules/pam_tally/Makefile.am
index a95a5bb6d84dca661015e3da17308001691f8152..a900612b3c292ac83b9013e3b5cac77773c193ac 100644 (file)
--- a/modules/pam_tally/Makefile.am
+++ b/modules/pam_tally/Makefile.am
@@ -13,7 +13,7 @@ noinst_HEADERS = faillog.h
 
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
-AM_LDFLAGS = -L$(top_builddir)/modules/pammodutil -lpammodutil \
+AM_LDFLAGS = $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 
 pam_tally_la_LDFLAGS = -no-undefined -avoid-version -module

diff --git a/modules/pam_time/Makefile.am b/modules/pam_time/Makefile.am
index 40389b7611c8b920c7f1796c6f347692fec9523f..d0a09f752594f250958a26373fbb247f49cf1bee 100644 (file)
--- a/modules/pam_time/Makefile.am
+++ b/modules/pam_time/Makefile.am
@@ -13,7 +13,7 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/ \
        -DPAM_TIME_CONF=\"$(SCONFIGDIR)/time.conf\"
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_umask/Makefile.am b/modules/pam_umask/Makefile.am
index 768c112394532fc51af74511c4dd8aa5726954c2..c887cd47f8eb6a336d49550c20f1beab48518e37 100644 (file)
--- a/modules/pam_umask/Makefile.am
+++ b/modules/pam_umask/Makefile.am
@@ -12,7 +12,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am
index 67520613deb554885e1c07ba79830726ed4d5bac..9997603b4280da798f69f839d51f87a6d6609960 100644 (file)
--- a/modules/pam_unix/Makefile.am
+++ b/modules/pam_unix/Makefile.am
@@ -25,7 +25,7 @@ if HAVE_LIBCRACK
 endif
 
 pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        @LIBCRACK@ @LIBNSL@
 if HAVE_VERSIONING
   pam_unix_la_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_userdb/Makefile.am b/modules/pam_userdb/Makefile.am
index 5d7e80175f08be931a19e92201d1ecb9c2a593fe..8a68533ad1d912e906d8de800fc942945048db06 100644 (file)
--- a/modules/pam_userdb/Makefile.am
+++ b/modules/pam_userdb/Makefile.am
@@ -12,7 +12,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam @LIBDB@ @LIBCRYPT@
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_warn/Makefile.am b/modules/pam_warn/Makefile.am
index 1b78f7a04d47c421159f0cbf5018dea52ca09351..a391620509497cc1b03619d4852dafaa612f1261 100644 (file)
--- a/modules/pam_warn/Makefile.am
+++ b/modules/pam_warn/Makefile.am
@@ -12,7 +12,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_wheel/Makefile.am b/modules/pam_wheel/Makefile.am
index 42121d05faf022cf3bf9078e2bd470e9f68fe2af..e1b115a2871f63f4d13f3dfe53708860dee41a11 100644 (file)
--- a/modules/pam_wheel/Makefile.am
+++ b/modules/pam_wheel/Makefile.am
@@ -12,7 +12,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pam_xauth/Makefile.am b/modules/pam_xauth/Makefile.am
index 31a9d3ebfd6b15b62478d31b72f646c7408ea635..2e7f0e0f1d4c0bce58a45e8b42c1e3e23843b916 100644 (file)
--- a/modules/pam_xauth/Makefile.am
+++ b/modules/pam_xauth/Makefile.am
@@ -14,7 +14,7 @@ secureconfdir = $(SCONFIGDIR)
 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
        -I$(top_srcdir)/modules/pammodutil/include/
 AM_LDFLAGS = -no-undefined -avoid-version -module \
-       -L$(top_builddir)/modules/pammodutil -lpammodutil \
+       $(top_builddir)/modules/pammodutil/libpammodutil.la \
        -L$(top_builddir)/libpam -lpam
 if HAVE_VERSIONING
   AM_LDFLAGS += -Wl,--version-script=../modules.map

diff --git a/modules/pammodutil/Makefile.am b/modules/pammodutil/Makefile.am
index b194fb3b47dd35fca97a0c091c09810e97ffb6f6..a55ff394ff1cf3b022ac83bbc671161b01ce9692 100644 (file)
--- a/modules/pammodutil/Makefile.am
+++ b/modules/pammodutil/Makefile.am
@@ -4,13 +4,13 @@
 
 CLEANFILES = *~
 
-AM_CFLAGS = -I$(srcdir)/include -I$(top_srcdir)/libpam/include -fPIC -DPIC
+AM_CFLAGS = -I$(srcdir)/include -I$(top_srcdir)/libpam/include
 
 noinst_HEADERS = pammodutil.h include/security/_pam_modutil.h
 
-noinst_LIBRARIES = libpammodutil.a
+noinst_LTLIBRARIES = libpammodutil.la
 
-libpammodutil_a_SOURCES = modutil_cleanup.c modutil_getgrgid.c \
+libpammodutil_la_SOURCES = modutil_cleanup.c modutil_getgrgid.c \
        modutil_getgrnam.c modutil_getlogin.c modutil_getpwnam.c \
        modutil_getpwuid.c modutil_getspnam.c modutil_ingroup.c \
        modutil_ioloop.c