summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Mraz <tm@t8m.info>2007-01-23 09:41:17 +0000
committerTomas Mraz <tm@t8m.info>2007-01-23 09:41:17 +0000
commit6cd17d661ccddf250640032a8eaa5c79633c2600 (patch)
tree30e3c16505a8c261517d73654aeb8a31a094bae2
parentc075ba196389d2e05770fe5cb6d66695d29a56fa (diff)
Relevant BUGIDs:
Purpose of commit: bugfix Commit summary: --------------- 2007-01-23 Tomas Mraz <t8m@centrum.cz> * modules/pam_loginuid/Makefile.am (AM_LDFLAGS): Add LIBAUDIT. * modules/pam_selinux/Makefile.am (pam_selinux_check_LDFLAGS): Add AM_LDFLAGS. (pam_selinux_la_LDFLAGS): Likewise.
-rw-r--r--ChangeLog8
-rw-r--r--modules/pam_loginuid/Makefile.am2
-rw-r--r--modules/pam_selinux/Makefile.am5
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b54008b3..d48d6e7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-23 Tomas Mraz <t8m@centrum.cz>
+
+ * modules/pam_loginuid/Makefile.am (AM_LDFLAGS): Add LIBAUDIT.
+
+ * modules/pam_selinux/Makefile.am (pam_selinux_check_LDFLAGS): Add
+ AM_LDFLAGS.
+ (pam_selinux_la_LDFLAGS): Likewise.
+
2007-01-17 Thorsten Kukuk <kukuk@thkukuk.de>
* release 0.99.7.0
diff --git a/modules/pam_loginuid/Makefile.am b/modules/pam_loginuid/Makefile.am
index d4fd3263..6f2d84b0 100644
--- a/modules/pam_loginuid/Makefile.am
+++ b/modules/pam_loginuid/Makefile.am
@@ -15,7 +15,7 @@ secureconfdir = $(SCONFIGDIR)
AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
AM_LDFLAGS = -no-undefined -avoid-version -module \
- -L$(top_builddir)/libpam -lpam
+ -L$(top_builddir)/libpam -lpam @LIBAUDIT@
if HAVE_VERSIONING
AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
endif
diff --git a/modules/pam_selinux/Makefile.am b/modules/pam_selinux/Makefile.am
index b28ded35..ee2773e9 100644
--- a/modules/pam_selinux/Makefile.am
+++ b/modules/pam_selinux/Makefile.am
@@ -22,10 +22,11 @@ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
AM_LDFLAGS = -no-undefined \
-L$(top_builddir)/libpam -lpam @LIBSELINUX@
-pam_selinux_check_LDFLAGS = -L$(top_builddir)/libpam_misc -lpam_misc
+pam_selinux_check_LDFLAGS = $(AM_LDFLAGS) -L$(top_builddir)/libpam_misc -lpam_misc
+pam_selinux_la_LDFLAGS = $(AM_LDFLAGS)
if HAVE_VERSIONING
- pam_selinux_la_LDFLAGS = -avoid-version -module \
+ pam_selinux_la_LDFLAGS += -avoid-version -module \
-Wl,--version-script=$(srcdir)/../modules.map
endif