aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2015-07-13 14:19:50 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2015-07-13 14:19:50 +0100
commit73f9f0334ce639e2f05cb0646af2c81881859a2e (patch)
treeddb7a3e42d0810389db647ff8743f0bf6f7570da
parent28c33f67bc7a93eaf8e6d96a56a88ee023811985 (diff)
downloadrtmux-73f9f0334ce639e2f05cb0646af2c81881859a2e.tar.gz
rtmux-73f9f0334ce639e2f05cb0646af2c81881859a2e.tar.bz2
rtmux-73f9f0334ce639e2f05cb0646af2c81881859a2e.zip
Check for flock in libbsd for AIX, and remove some getopt.h includes. From J
Raynor.
-rw-r--r--arguments.c1
-rw-r--r--configure.ac3
-rw-r--r--tmux.c1
3 files changed, 3 insertions, 2 deletions
diff --git a/arguments.c b/arguments.c
index 05ff97eb..ca6cc760 100644
--- a/arguments.c
+++ b/arguments.c
@@ -18,7 +18,6 @@
#include <sys/types.h>
-#include <getopt.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff --git a/configure.ac b/configure.ac
index 24aded53..de336fef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,6 +96,9 @@ AC_CHECK_HEADERS(
]
)
+# Look for library needed for flock.
+AC_SEARCH_LIBS(flock, bsd)
+
# Check for some functions that are replaced or omitted.
AC_CHECK_FUNCS(
[ \
diff --git a/tmux.c b/tmux.c
index 62f8a808..39f344c0 100644
--- a/tmux.c
+++ b/tmux.c
@@ -22,7 +22,6 @@
#include <errno.h>
#include <event.h>
#include <fcntl.h>
-#include <getopt.h>
#include <locale.h>
#include <pwd.h>
#include <stdlib.h>