Relevant BUGIDs:

Purpose of commit: bugfix

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

Fix compiling of libpammodutil and linking against it.

36 files changed, 38 insertions, 38 deletions

diff --git a/modules/pam_access/Makefile.am b/modules/pam_access/Makefile.am
index f4c86be1..36d060a4 100644
--- 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 e512927e..8229a068 100644
--- 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 2fffe11e..e1fb3951 100644
--- 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 27af916c..62ae29af 100644
--- 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 264d2c96..d2c6faed 100644
--- 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 f5af98c1..9d455781 100644
--- 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 88f7c2e2..4341bcea 100644
--- 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 c31b98db..e89f8a70 100644
--- 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 85d0e5ad..1dd5e7a1 100644
--- 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 08ad17d1..c96f9b1b 100644
--- 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 6c73191e..8d7934c5 100644
--- 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 facfa374..46e03dea 100644
--- 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 fe383e78..ad38ccb7 100644
--- 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 595fb5ce..10316a83 100644
--- 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 a584644a..4151c042 100644
--- 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 4a35b183..c955404e 100644
--- 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 859e4419..7a1c66d6 100644
--- 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 4fe59239..0a6181c2 100644
--- 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 b1acac72..ef8ce215 100644
--- 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 4eb7a8d0..559b2120 100644
--- 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 a27e3608..5b2bb210 100644
--- 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 97432956..b09c8881 100644
--- 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 17dbf691..8ea6b662 100644
--- 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 dd62255e..154dbf42 100644
--- 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 a639c21c..ad504a0f 100644
--- 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 5daf06ee..da019f89 100644
--- 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 483d3dbe..4ed10b72 100644
--- 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 a95a5bb6..a900612b 100644
--- 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 40389b76..d0a09f75 100644
--- 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 768c1123..c887cd47 100644
--- 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 67520613..9997603b 100644
--- 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 5d7e8017..8a68533a 100644
--- 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 1b78f7a0..a3916205 100644
--- 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 42121d05..e1b115a2 100644
--- 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 31a9d3eb..2e7f0e0f 100644
--- 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 b194fb3b..a55ff394 100644
--- 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