I am almost certain we don't need crypt or rt now, and it builds fine on

Linux without.
This commit is contained in:
Nicholas Marriott 2010-10-27 21:40:03 +00:00
parent 58684ea998
commit ae7a7be819
2 changed files with 5 additions and 11 deletions

View File

@ -1,4 +1,4 @@
/* $Id: compat.h,v 1.29 2010-10-27 21:34:59 nicm Exp $ */ /* $Id: compat.h,v 1.30 2010-10-27 21:40:03 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -63,10 +63,6 @@ typedef uint64_t u_int64_t;
#include "compat/bitstring.h" #include "compat/bitstring.h"
#endif #endif
#ifdef HAVE_CRYPT_H
#include <crypt.h>
#endif
#ifdef HAVE_PATHS_H #ifdef HAVE_PATHS_H
#include <paths.h> #include <paths.h>
#endif #endif

10
configure vendored
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# $Id: configure,v 1.55 2010-10-27 20:21:00 nicm Exp $ # $Id: configure,v 1.56 2010-10-27 21:40:03 nicm Exp $
# #
# Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> # Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
# #
@ -34,7 +34,6 @@ cat <<EOF >>$CONFIG_H
#undef HAVE_BROKEN_POLL #undef HAVE_BROKEN_POLL
#undef HAVE_BZERO #undef HAVE_BZERO
#undef HAVE_CLOSEFROM #undef HAVE_CLOSEFROM
#undef HAVE_CRYPT_H
#undef HAVE_DAEMON #undef HAVE_DAEMON
#undef HAVE_DIRFD #undef HAVE_DIRFD
#undef HAVE_FCNTL_CLOSEM #undef HAVE_FCNTL_CLOSEM
@ -115,7 +114,7 @@ EOF
EOF EOF
cat <<EOF >>$CONFIG_MK cat <<EOF >>$CONFIG_MK
CFLAGS+= -std=c99 -D_GNU_SOURCE -D_POSIX_SOURCE CFLAGS+= -std=c99 -D_GNU_SOURCE -D_POSIX_SOURCE
LIBS+= -lncurses -lcrypt -lutil -levent -lrt LIBS+= -lncurses -lutil -levent
SRCS+= osdep-linux.c \ SRCS+= osdep-linux.c \
compat/closefrom.c \ compat/closefrom.c \
compat/fgetln.c \ compat/fgetln.c \
@ -161,7 +160,6 @@ EOF
SunOS) SunOS)
cat <<EOF >>$CONFIG_H cat <<EOF >>$CONFIG_H
#define HAVE_CLOSEFROM #define HAVE_CLOSEFROM
#define HAVE_CRYPT_H
#define HAVE_STRLCAT #define HAVE_STRLCAT
#define HAVE_STRLCPY #define HAVE_STRLCPY
EOF EOF
@ -247,7 +245,7 @@ EOF
#define HAVE_U_INT #define HAVE_U_INT
EOF EOF
cat <<EOF >>$CONFIG_MK cat <<EOF >>$CONFIG_MK
LIBS+= -lcurses -lcrypt -lutil -levent LIBS+= -lcurses -lutil -levent
SRCS+= osdep-freebsd.c \ SRCS+= osdep-freebsd.c \
compat/vis.c \ compat/vis.c \
compat/unvis.c \ compat/unvis.c \
@ -293,7 +291,7 @@ EOF
EOF EOF
fi fi
cat <<EOF >>$CONFIG_MK cat <<EOF >>$CONFIG_MK
LIBS+= -lcrypt -lutil -levent LIBS+= -lutil -levent
SRCS+= osdep-netbsd.c \ SRCS+= osdep-netbsd.c \
compat/strtonum.c \ compat/strtonum.c \
compat/vis.c \ compat/vis.c \