aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharl Botha <cpbotha@cpbotha.net>2002-06-09 21:01:46 +0000
committerCharl Botha <cpbotha@cpbotha.net>2002-06-09 21:01:46 +0000
commitc9c8e613239793819913fc9f9e7fa73db0ea346a (patch)
tree44f05bbef490ea6fa88dc953e5e6e4835a1df751
parentbfe9eeea11251c883259fafc80f1bab7505a43a7 (diff)
downloadlibpam-pwdfile-c9c8e613239793819913fc9f9e7fa73db0ea346a.tar.gz
Added -lcrypt again.
-rw-r--r--Makefile11
-rw-r--r--changelog6
2 files changed, 12 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 2e8b433..da956d3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2002-05-11 14:42:35 cpbotha Exp $
+# $Id: Makefile,v 1.5 2002-06-09 21:01:46 cpbotha Exp $
#
# This Makefile controls a build process of $(TITLE) module for
# Linux-PAM. You should not modify this Makefile (unless you know
@@ -7,6 +7,10 @@
include ../../Make.Rules
+ifeq ($(HAVE_LIBCRYPT),yes)
+ EXTRALS += -lcrypt
+endif
+
TITLE=pam_pwdfile
CFLAGS += -D_BSD_SOURCE
@@ -72,8 +76,7 @@ endif
ifdef DYNAMIC
$(LIBSHARED): $(LIBOBJD)
- $(LD_D) -o $@ $(LIBOBJD) $(MODULE_SIMPLE_EXTRALIBS) $(NEED_LINK_LIB_C)
-
+ $(LD_D) -o $@ $(LIBOBJD) $(EXTRALS) $(NEED_LINK_LIB_C)
endif
ifdef STATIC
@@ -82,7 +85,7 @@ endif
ifdef STATIC
$(LIBSTATIC): $(LIBOBJS)
- $(LD) -r -o $@ $(LIBOBJS) $(MODULE_SIMPLE_EXTRALIBS)
+ $(LD) -r -o $@ $(LIBOBJS) $(EXTRALS)
endif
install: all
diff --git a/changelog b/changelog
index 8309811..1deab0f 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,13 @@
changelog for pam_pwdfile PAM module - Charl P. Botha <cpbotha@ieee.org>
-$Id: changelog,v 1.14 2002-05-14 15:58:51 cpbotha Exp $
+$Id: changelog,v 1.15 2002-06-09 21:01:46 cpbotha Exp $
---------------------------------------------------------------------------
+0.98 : Not released yet.
+
* added contrib directory with spec file and Makefile by Jason F. McBrayer
<jason@xeran.com>.
+* -lcrypt is now used again (because it does seem to be necessary in some
+ cases)
0.97 : Sat May 11 16:40:19 CEST 2002