summaryrefslogtreecommitdiffstats
authornicm <nicm>2010-10-27 21:40:03 (GMT)
committer Raghavendra D Prabhu <[email protected]>2011-01-02 18:59:31 (GMT)
commit05e23e2b54bb0971972bacdb8476344e402aaf39 (patch) (side-by-side diff)
treef31851529f32b31185ea66279bf01c364e412b4d
parent086e195623e9dba158800fbf05475576a2a12e06 (diff)
downloadtmux-old-05e23e2b54bb0971972bacdb8476344e402aaf39.zip
tmux-old-05e23e2b54bb0971972bacdb8476344e402aaf39.tar.gz
tmux-old-05e23e2b54bb0971972bacdb8476344e402aaf39.tar.bz2
I am almost certain we don't need crypt or rt now, and it builds fine on
Linux without.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--compat.h6
-rwxr-xr-xconfigure10
2 files changed, 5 insertions, 11 deletions
diff --git a/compat.h b/compat.h
index dc70168..f8e36e6 100644
--- a/compat.h
+++ b/compat.h
@@ -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 <[email protected]>
@@ -63,10 +63,6 @@ typedef uint64_t u_int64_t;
#include "compat/bitstring.h"
#endif
-#ifdef HAVE_CRYPT_H
-#include <crypt.h>
-#endif
-
#ifdef HAVE_PATHS_H
#include <paths.h>
#endif
diff --git a/configure b/configure
index b9f4e19..23fd426 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#!/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 <[email protected]>
#
@@ -34,7 +34,6 @@ cat <<EOF >>$CONFIG_H
#undef HAVE_BROKEN_POLL
#undef HAVE_BZERO
#undef HAVE_CLOSEFROM
-#undef HAVE_CRYPT_H
#undef HAVE_DAEMON
#undef HAVE_DIRFD
#undef HAVE_FCNTL_CLOSEM
@@ -115,7 +114,7 @@ EOF
EOF
cat <<EOF >>$CONFIG_MK
CFLAGS+= -std=c99 -D_GNU_SOURCE -D_POSIX_SOURCE
-LIBS+= -lncurses -lcrypt -lutil -levent -lrt
+LIBS+= -lncurses -lutil -levent
SRCS+= osdep-linux.c \
compat/closefrom.c \
compat/fgetln.c \
@@ -161,7 +160,6 @@ EOF
SunOS)
cat <<EOF >>$CONFIG_H
#define HAVE_CLOSEFROM
-#define HAVE_CRYPT_H
#define HAVE_STRLCAT
#define HAVE_STRLCPY
EOF
@@ -247,7 +245,7 @@ EOF
#define HAVE_U_INT
EOF
cat <<EOF >>$CONFIG_MK
-LIBS+= -lcurses -lcrypt -lutil -levent
+LIBS+= -lcurses -lutil -levent
SRCS+= osdep-freebsd.c \
compat/vis.c \
compat/unvis.c \
@@ -293,7 +291,7 @@ EOF
EOF
fi
cat <<EOF >>$CONFIG_MK
-LIBS+= -lcrypt -lutil -levent
+LIBS+= -lutil -levent
SRCS+= osdep-netbsd.c \
compat/strtonum.c \
compat/vis.c \