* modified alock.c to build correctly with gmake
* cosmetics to src/Makefile --HG-- extra : convert_revision : svn%3Aeebe1cee-a9af-4fe4-bd26-ad572b19c5ab/trunk%4044
This commit is contained in:
parent
c1e2ccd901
commit
3857559d82
2 changed files with 16 additions and 18 deletions
12
src/Makefile
12
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
|
||||
|
||||
|
||||
#######################
|
||||
#######################
|
||||
|
||||
|
|
22
src/alock.c
22
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,
|
||||
|
|
Reference in a new issue