From 3857559d82979deb37671f9bab551f0f86ddab02 Mon Sep 17 00:00:00 2001
From: mathias <none@none>
Date: Thu, 7 Sep 2006 18:04:42 +0000
Subject: [PATCH] * modified alock.c to build correctly with gmake * cosmetics
 to src/Makefile

--HG--
extra : convert_revision : svn%3Aeebe1cee-a9af-4fe4-bd26-ad572b19c5ab/trunk%4044
---
 src/Makefile | 12 +++++-------
 src/alock.c  | 22 +++++++++++-----------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 8772f39..526fb22 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,13 +1,11 @@
-
-###
-#
-#
+##########################
 $(info check for ../config.mk ...)
 ifeq ($(wildcard ../config.mk),../config.mk)
 $(info ok.)
 include ../config.mk
 endif
 
+##########################
 define funcAddModule
 	ifdef WITH_$(1)
 		SRC += $$(SRC_$(1))
@@ -72,8 +70,7 @@ deps: $(DEPS)
 %.d : %.c
 	$(MAKEDEP) -o $@ $<
 
-
-
+#######################
 
 ifneq ($(MAKECMDGOALS),deps)
 ifneq ($(MAKECMDGOALS),first)
@@ -85,5 +82,6 @@ endif
 endif
 endif
 
-
+#######################
+#######################
 
diff --git a/src/alock.c b/src/alock.c
index d76593a..875a282 100644
--- a/src/alock.c
+++ b/src/alock.c
@@ -34,29 +34,29 @@
     globals
 \*------------------------------------------------------------------*/
 extern struct aAuth alock_auth_none;
-#ifdef HASH_PWD
+#ifdef HAVE_HASH 
 extern struct aAuth alock_auth_md5;
 extern struct aAuth alock_auth_sha1;
 extern struct aAuth alock_auth_sha256;
 extern struct aAuth alock_auth_sha384;
 extern struct aAuth alock_auth_sha512;
-#endif /* HASH_PWD */
-#ifdef PASSWD_PWD
+#endif /* HAVE_HASH */
+#ifdef HAVE_PASSWD
 extern struct aAuth alock_auth_passwd;
-#endif /* PASSWD_PWD */
-#ifdef PAM_PWD
+#endif /* HAVE_PASSWD */
+#ifdef HAVE_PAM
 extern struct aAuth alock_auth_pam;
-#endif /* PAM_PWD */
+#endif /* HAVE_PAM */
 
 static struct aAuth* alock_authmodules[] = {
     &alock_auth_none,
-#ifdef PAM_PWD
+#ifdef HAVE_PAM
     &alock_auth_pam,
-#endif
-#ifdef PASSWD_PWD
+#endif /* HAVE_PAM */
+#ifdef HAVE_PASSWD
     &alock_auth_passwd,
-#endif /* PASSWD_PWD */
-#ifdef HASH_PWD
+#endif /* HAVE_PASSWD */
+#ifdef HAVE_HASH
     &alock_auth_md5,
     &alock_auth_sha1,
     &alock_auth_sha256,